From fedora-extras-commits at redhat.com Sat Jan 1 11:09:11 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 1 Jan 2005 06:09:11 -0500 Subject: rpms/perl-XML-RSS - New directory Message-ID: <200501011109.j01B9BkW021532@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/perl-XML-RSS In directory cvs.fedora.redhat.com:/tmp/cvs-serv21525/perl-XML-RSS Log Message: Directory /cvs/extras/rpms/perl-XML-RSS added to the repository From fedora-extras-commits at redhat.com Sat Jan 1 11:09:11 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 1 Jan 2005 06:09:11 -0500 Subject: rpms/perl-XML-RSS/devel - New directory Message-ID: <200501011109.j01B9BCB021535@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/perl-XML-RSS/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv21525/perl-XML-RSS/devel Log Message: Directory /cvs/extras/rpms/perl-XML-RSS/devel added to the repository From fedora-extras-commits at redhat.com Sat Jan 1 11:09:34 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 1 Jan 2005 06:09:34 -0500 Subject: rpms/perl-XML-RSS Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501011109.j01B9YLG021596@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/perl-XML-RSS In directory cvs.fedora.redhat.com:/tmp/cvs-serv21587 Added Files: Makefile import.log Log Message: Setup of module perl-XML-RSS --- NEW FILE Makefile --- # Top level Makefile for module perl-XML-RSS all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sat Jan 1 11:09:34 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 1 Jan 2005 06:09:34 -0500 Subject: rpms/perl-XML-RSS/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501011109.j01B9Y35021599@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/perl-XML-RSS/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv21587/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-XML-RSS --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Jan 1 11:10:19 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 1 Jan 2005 06:10:19 -0500 Subject: rpms/perl-XML-RSS import.log,1.1,1.2 Message-ID: <200501011110.j01BAJ7J021692@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/perl-XML-RSS In directory cvs.fedora.redhat.com:/tmp/cvs-serv21683 Modified Files: import.log Log Message: auto-import perl-XML-RSS-1.05-1 on branch devel from perl-XML-RSS-1.05-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-XML-RSS/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Jan 2005 11:09:32 -0000 1.1 +++ import.log 1 Jan 2005 11:10:17 -0000 1.2 @@ -0,0 +1 @@ +perl-XML-RSS-1_05-1:HEAD:perl-XML-RSS-1.05-1.src.rpm:1104577827 From fedora-extras-commits at redhat.com Sat Jan 1 11:10:19 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 1 Jan 2005 06:10:19 -0500 Subject: rpms/perl-XML-RSS/devel perl-XML-RSS.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501011110.j01BAJks021696@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/perl-XML-RSS/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv21683/devel Modified Files: .cvsignore sources Added Files: perl-XML-RSS.spec Log Message: auto-import perl-XML-RSS-1.05-1 on branch devel from perl-XML-RSS-1.05-1.src.rpm --- NEW FILE perl-XML-RSS.spec --- %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-XML-RSS Version: 1.05 Release: 1 Epoch: 0 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1, perl(Test::Manifest), perl(XML::Parser) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. %prep %setup -q -n XML-RSS-%{version} chmod 644 Changes README TODO find examples -type f -exec chmod 644 {} ';' find examples -type d -exec chmod 755 {} ';' %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check || : make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README TODO examples %{perl_vendorlib}/XML %{_mandir}/man3/*.3* %changelog * Sat Aug 14 2004 Ville Skytt?? - 0:1.05-0.fdr.1 - Update to 1.05, patches applied upstream. * Sun Jul 11 2004 Ville Skytt?? - 0:1.04-0.fdr.2 - Bring up to date with current fedora.us Perl spec template. * Sun Mar 14 2004 Ville Skytt?? - 0:1.04-0.fdr.1 - Update to 1.04. - Reduce directory ownership bloat. * Fri Nov 21 2003 Ville Skytt?? - 0:1.02-0.fdr.2 - Eliminate some spurious test warnings. * Sun Oct 12 2003 Ville Skytt?? - 0:1.02-0.fdr.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-XML-RSS/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jan 2005 11:09:32 -0000 1.1 +++ .cvsignore 1 Jan 2005 11:10:17 -0000 1.2 @@ -0,0 +1 @@ +XML-RSS-1.05.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-XML-RSS/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jan 2005 11:09:32 -0000 1.1 +++ sources 1 Jan 2005 11:10:17 -0000 1.2 @@ -0,0 +1 @@ +3eaa65ec6316edec3194b6a2f384a65c XML-RSS-1.05.tar.gz From fedora-extras-commits at redhat.com Sat Jan 1 12:15:09 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 07:15:09 -0500 Subject: rpms/bonnie++/devel bonnie++.spec,1.5,1.6 Message-ID: <200501011215.j01CF9oa022543@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/bonnie++/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22537 Modified Files: bonnie++.spec Log Message: Produce sane debuginfo package, #143422. Index: bonnie++.spec =================================================================== RCS file: /cvs/extras/rpms/bonnie++/devel/bonnie++.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- bonnie++.spec 10 Dec 2004 22:03:01 -0000 1.5 +++ bonnie++.spec 1 Jan 2005 12:15:07 -0000 1.6 @@ -1,6 +1,6 @@ Name: bonnie++ -Version: 1.03 -Release: 2.a +Version: 1.03a +Release: 3 Epoch: 0 Summary: Bonnie++ filesystem and disk benchmark & burn-in suite @@ -26,6 +26,7 @@ %prep %setup -q -n bonnie++-1.03a %patch -p0 +sed -i 's|${INSTALL}\s\+-s\b|${INSTALL}|' Makefile %build @@ -55,7 +56,11 @@ %changelog +* Mon Dec 20 2004 Ville Skytt?? - 0:1.03a-3 +- Let rpmbuild take care of stripping binaries. + * Sun May 18 2003 Warren Togami - 0:1.03-0.fdr.2.a - #267 Ville's docs, optflags and mandir patch + * Fri May 06 2003 Warren Togami - 0:1.03-0.fdr.1.a - Initial RPM release From fedora-extras-commits at redhat.com Sat Jan 1 12:31:30 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 07:31:30 -0500 Subject: rpms/icu - New directory Message-ID: <200501011231.j01CVUS5022668@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/icu In directory cvs.fedora.redhat.com:/tmp/cvs-serv22661/icu Log Message: Directory /cvs/extras/rpms/icu added to the repository From fedora-extras-commits at redhat.com Sat Jan 1 12:31:30 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 07:31:30 -0500 Subject: rpms/icu/devel - New directory Message-ID: <200501011231.j01CVUBe022671@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/icu/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22661/icu/devel Log Message: Directory /cvs/extras/rpms/icu/devel added to the repository From fedora-extras-commits at redhat.com Sat Jan 1 12:31:49 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 07:31:49 -0500 Subject: rpms/icu Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501011231.j01CVnuk022738@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/icu In directory cvs.fedora.redhat.com:/tmp/cvs-serv22729 Added Files: Makefile import.log Log Message: Setup of module icu --- NEW FILE Makefile --- # Top level Makefile for module icu all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 1 12:31:49 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 07:31:49 -0500 Subject: rpms/icu/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501011231.j01CVngY022741@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/icu/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22729/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module icu --- NEW 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 Jan 1 12:37:37 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 07:37:37 -0500 Subject: rpms/icu import.log,1.1,1.2 Message-ID: <200501011237.j01CbbJ2022857@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/icu In directory cvs.fedora.redhat.com:/tmp/cvs-serv22848 Modified Files: import.log Log Message: auto-import icu-3.2-1 on branch devel from icu-3.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/icu/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Jan 2005 12:31:47 -0000 1.1 +++ import.log 1 Jan 2005 12:37:35 -0000 1.2 @@ -0,0 +1 @@ +icu-3_2-1:HEAD:icu-3.2-1.src.rpm:1104583048 From fedora-extras-commits at redhat.com Sat Jan 1 12:37:37 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 07:37:37 -0500 Subject: rpms/icu/devel icu.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501011237.j01CbbME022861@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/icu/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22848/devel Modified Files: .cvsignore sources Added Files: icu.spec Log Message: auto-import icu-3.2-1 on branch devel from icu-3.2-1.src.rpm --- NEW FILE icu.spec --- # Notes: # - According to upstream, icu may trigger a gcc bug with -O2 which manifests # itself as failure in data/locales/ja.txt. This does not seem to occur # any more with icu 3.0 and gcc 3.3.[23], but in case it resurfaces, see # source/runConfigureICU for the upstream recommended C(XX)FLAGS # (-O3 and -O as of 3.0) and force use of them in the build section. Name: icu Version: 3.2 Release: 1 Summary: International Components for Unicode Group: Applications/Text License: X License URL: http://oss.software.ibm.com/icu/ Source: ftp://www-126.ibm.com/pub/icu/3.2/icu-3.2.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen graphviz %description The International Components for Unicode (ICU) libraries provide robust and full-featured Unicode services on a wide variety of platforms. ICU supports the most current version of the Unicode standard, and they provide support for supplementary Unicode characters (needed for GB 18030 repertoire support). As computing environments become more heterogeneous, software portability becomes more important. ICU lets you produce the same results across all the various platforms you support, without sacrificing performance. It offers great flexibility to extend and customize the supplied services. %package -n lib%{name} Summary: International Components for Unicode - libraries Group: System Environment/Libraries %description -n lib%{name} %{summary}. %package -n lib%{name}-devel Summary: Development files for International Components for Unicode Group: Development/Libraries Requires: lib%{name} = %{version}-%{release} %description -n lib%{name}-devel %{summary}. %package -n lib%{name}-doc Summary: Documentation for International Components for Unicode Group: Documentation %description -n lib%{name}-doc %{summary}. %prep %setup -q -n %{name} find . -name CVS -o -name .cvsignore | xargs -r rm -rf %{__perl} -pi -e 's/^(HAVE_DOT\b.*=).*$/$1 YES/' source/Doxyfile.in %build cd source %configure --enable-static --with-data-packaging=library --disable-samples make # %{?_smp_mflags} # -j(X>1) may "break" man pages as of 3.2, b.f.u #2357 make doc %install rm -rf $RPM_BUILD_ROOT source/__docs make -C source install DESTDIR=$RPM_BUILD_ROOT make -C source install-doc docdir=__docs chmod +x $RPM_BUILD_ROOT%{_libdir}/*.so.* %check || : make -C source check %clean rm -rf $RPM_BUILD_ROOT %post -n lib%{name} -p /sbin/ldconfig %postun -n lib%{name} -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc license.html readme.html %{_bindir}/derb %{_bindir}/genbrk %{_bindir}/gencnval %{_bindir}/genrb %{_bindir}/makeconv %{_bindir}/pkgdata %{_bindir}/uconv %{_sbindir}/* %{_mandir}/man1/derb.1* %{_mandir}/man1/gencnval.1* %{_mandir}/man1/genrb.1* %{_mandir}/man1/makeconv.1* %{_mandir}/man1/pkgdata.1* %{_mandir}/man1/uconv.1* %{_mandir}/man8/*.8* %files -n lib%{name} %defattr(-,root,root,-) %{_libdir}/*.so.* %files -n lib%{name}-devel %defattr(-,root,root,-) %{_bindir}/%{name}-config %{_mandir}/man1/%{name}-config.1* %{_includedir}/layout %{_includedir}/unicode %{_libdir}/*.a %{_libdir}/*.so %{_libdir}/%{name} %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/%{version} %{_datadir}/%{name}/%{version}/mkinstalldirs %{_datadir}/%{name}/%{version}/config %doc %{_datadir}/%{name}/%{version}/license.html %files -n lib%{name}-doc %defattr(-,root,root,-) %doc source/__docs/%{name}/html/* %changelog * Sat Jan 1 2005 Ville Skytt?? - 3.2-1 - Don't use %%{_smp_mflags} (b.f.u #2357). - Remove unnecessary Epochs. * Sat Dec 4 2004 Ville Skytt?? - 0:3.2-0.fdr.1 - Update to 3.2. * Sun Jul 18 2004 Ville Skytt?? - 0:3.0-0.fdr.1 - Update to 3.0, datadirs patch no longer needed. - Package data in shared libs, drop -locales subpackage. - Rename -docs subpackage to libicu-doc, and generate graphs with graphviz. * Sat Dec 13 2003 Ville Skytt?? - 0:2.6.1-0.fdr.3 - Partial fix for bad datadirs returned by icu-config (works as long as data packaging mode is not "common" or "dll"). * Sun Nov 23 2003 Ville Skytt?? - 0:2.6.1-0.fdr.2 - First complete version. * Sun Sep 28 2003 Ville Skytt?? - 0:2.6.1-0.fdr.1 - Update to 2.6.1. * Wed Aug 27 2003 Ville Skytt?? - 0:2.6-0.fdr.1 - First build, based on upstream and SuSE 8.2 packages. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/icu/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jan 2005 12:31:47 -0000 1.1 +++ .cvsignore 1 Jan 2005 12:37:35 -0000 1.2 @@ -0,0 +1 @@ +icu-3.2.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/icu/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jan 2005 12:31:47 -0000 1.1 +++ sources 1 Jan 2005 12:37:35 -0000 1.2 @@ -0,0 +1 @@ +55a85d2365338ece483d275119fd990c icu-3.2.tgz From fedora-extras-commits at redhat.com Sat Jan 1 12:57:17 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 07:57:17 -0500 Subject: rpms/perl-ExtUtils-CBuilder import.log,1.7,1.8 Message-ID: <200501011257.j01CvHoF023044@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder In directory cvs.fedora.redhat.com:/tmp/cvs-serv23034 Modified Files: import.log Log Message: auto-import perl-ExtUtils-CBuilder-0.06-0.fdr.1.rh90 on branch RHL-9 from perl-ExtUtils-CBuilder-0.06-0.fdr.1.rh90.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 8 Nov 2004 05:00:02 -0000 1.7 +++ import.log 1 Jan 2005 12:57:15 -0000 1.8 @@ -4,3 +4,4 @@ perl-ExtUtils-CBuilder-0_05-0_fdr_1_rh90:RHL-9:perl-ExtUtils-CBuilder-0.05-0.fdr.1.rh90.src.rpm:1099889984 perl-ExtUtils-CBuilder-0_05-0_fdr_1_1:FC-1:perl-ExtUtils-CBuilder-0.05-0.fdr.1.1.src.rpm:1099889993 perl-ExtUtils-CBuilder-0_05-0_fdr_1_2:HEAD:perl-ExtUtils-CBuilder-0.05-0.fdr.1.2.src.rpm:1099890002 +perl-ExtUtils-CBuilder-0_06-0_fdr_1_rh90:RHL-9:perl-ExtUtils-CBuilder-0.06-0.fdr.1.rh90.src.rpm:1104584228 From fedora-extras-commits at redhat.com Sat Jan 1 12:57:17 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 07:57:17 -0500 Subject: rpms/perl-ExtUtils-CBuilder/RHL-9 .cvsignore, 1.3, 1.4 perl-ExtUtils-CBuilder.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200501011257.j01CvH9M023047@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/RHL-9 In directory cvs.fedora.redhat.com:/tmp/cvs-serv23034/RHL-9 Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Log Message: auto-import perl-ExtUtils-CBuilder-0.06-0.fdr.1.rh90 on branch RHL-9 from perl-ExtUtils-CBuilder-0.06-0.fdr.1.rh90.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/RHL-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:59:44 -0000 1.3 +++ .cvsignore 1 Jan 2005 12:57:15 -0000 1.4 @@ -1 +1 @@ -ExtUtils-CBuilder-0.05.tar.gz +ExtUtils-CBuilder-0.06.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/RHL-9/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-ExtUtils-CBuilder.spec 8 Nov 2004 04:59:44 -0000 1.2 +++ perl-ExtUtils-CBuilder.spec 1 Jan 2005 12:57:15 -0000 1.3 @@ -1,7 +1,7 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-ExtUtils-CBuilder -Version: 0.05 +Version: 0.06 Release: 0.fdr.1.rh90 Epoch: 0 Summary: Compile and link C code for Perl modules @@ -9,12 +9,11 @@ Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/ExtUtils-CBuilder/ -Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.05.tar.gz +Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.06.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 -BuildRequires: perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -29,18 +28,20 @@ %build -%{__perl} Build.PL installdirs=vendor -./Build +%{__perl} Makefile.PL INSTALLDIRS=vendor +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -./Build install destdir=$RPM_BUILD_ROOT +make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check || : -./Build test +make test %clean @@ -55,6 +56,13 @@ %changelog +* Tue Dec 28 2004 Jose Pedro Oliveira - 0:0.06-0.fdr.1 +- Update to 0.06. + +* Mon Nov 29 2004 Ville Skytt?? - 0:0.05-1 +- Revert to building with ExtUtils::MakeMaker to eliminate a build + dependency loop with Module::Build. + * Fri Oct 15 2004 Jose Pedro Oliveira - 0:0.05-0.fdr.1 - Update to 0.05. - Building procedure: Makefile.PL -> Build.PL. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/RHL-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:59:44 -0000 1.3 +++ sources 1 Jan 2005 12:57:15 -0000 1.4 @@ -1 +1 @@ -5a2131578972da0b4914c92a39e6051d ExtUtils-CBuilder-0.05.tar.gz +3aef9536908deb4194583c3cfd5281b1 ExtUtils-CBuilder-0.06.tar.gz From fedora-extras-commits at redhat.com Sat Jan 1 12:58:08 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 07:58:08 -0500 Subject: rpms/perl-Test-MockObject import.log,1.4,1.5 Message-ID: <200501011258.j01Cw8u9023156@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Test-MockObject In directory cvs.fedora.redhat.com:/tmp/cvs-serv23145 Modified Files: import.log Log Message: auto-import perl-Test-MockObject-0.15-0.fdr.2.rh90 on branch RHL-9 from perl-Test-MockObject-0.15-0.fdr.2.rh90.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 8 Nov 2004 05:09:14 -0000 1.4 +++ import.log 1 Jan 2005 12:58:06 -0000 1.5 @@ -1,3 +1,4 @@ perl-Test-MockObject-0_14-0_fdr_1_rh90:HEAD:perl-Test-MockObject-0.14-0.fdr.1.rh90.src.rpm:1099890542 perl-Test-MockObject-0_14-0_fdr_1_1:HEAD:perl-Test-MockObject-0.14-0.fdr.1.1.src.rpm:1099890548 perl-Test-MockObject-0_14-0_fdr_1_2:HEAD:perl-Test-MockObject-0.14-0.fdr.1.2.src.rpm:1099890554 +perl-Test-MockObject-0_15-0_fdr_2_rh90:RHL-9:perl-Test-MockObject-0.15-0.fdr.2.rh90.src.rpm:1104584280 From fedora-extras-commits at redhat.com Sat Jan 1 12:58:08 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 07:58:08 -0500 Subject: rpms/perl-Test-MockObject/RHL-9 .cvsignore, 1.2, 1.3 perl-Test-MockObject.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200501011258.j01Cw8o0023160@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Test-MockObject/RHL-9 In directory cvs.fedora.redhat.com:/tmp/cvs-serv23145/RHL-9 Modified Files: .cvsignore perl-Test-MockObject.spec sources Log Message: auto-import perl-Test-MockObject-0.15-0.fdr.2.rh90 on branch RHL-9 from perl-Test-MockObject-0.15-0.fdr.2.rh90.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/RHL-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:09:02 -0000 1.2 +++ .cvsignore 1 Jan 2005 12:58:06 -0000 1.3 @@ -1 +1 @@ -Test-MockObject-0.14.tar.gz +Test-MockObject-0.15.tar.gz Index: perl-Test-MockObject.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/RHL-9/perl-Test-MockObject.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Test-MockObject.spec 8 Nov 2004 05:09:02 -0000 1.1 +++ perl-Test-MockObject.spec 1 Jan 2005 12:58:06 -0000 1.2 @@ -1,20 +1,20 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-Test-MockObject -Version: 0.14 -Release: 0.fdr.1.rh90 +Version: 0.15 +Release: 0.fdr.2.rh90 Epoch: 0 Summary: Perl extension for emulating troublesome interfaces Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Test-MockObject/ -Source: http://www.cpan.org/authors/id/C/CH/CHROMATIC/Test-MockObject-0.14.tar.gz +Source: http://www.cpan.org/authors/id/C/CH/CHROMATIC/Test-MockObject-0.15.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 -BuildRequires: perl(Scalar::Util), perl(Test::Builder), perl(Test::More) +BuildRequires: perl(Scalar::Util), perl(Test::Simple) >= 0.44 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -54,16 +54,22 @@ %files %defattr(-,root,root,-) %doc Changes README -%{perl_vendorlib}/* +%{perl_vendorlib}/Test/ %{_mandir}/man3/*.3* %changelog +* Tue Dec 28 2004 Jose Pedro Oliveira - 0:0.15-0.fdr.2 +- Build requires Test::Simple >= 0.44 (bug 2324). + +* Wed Dec 01 2004 Jose Pedro Oliveira - 0:0.15-0.fdr.1 +- Update to 0.15. + * Tue May 25 2004 Jose Pedro Oliveira - 0:0.14-0.fdr.1 - Update to 0.14. - Require perl >= 1:5.6.1 for vendor install dir support. - Use pure_install to avoid perllocal.pod workarounds. -- Moved make test to section %check. +- Moved make test to section %%check. * Wed Nov 19 2003 Ville Skytt?? - 0:0.12-0.fdr.1 - First build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/RHL-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:09:02 -0000 1.2 +++ sources 1 Jan 2005 12:58:06 -0000 1.3 @@ -1 +1 @@ -d64b366a3833eea8b6f5f8eabecb2a7f Test-MockObject-0.14.tar.gz +22f92c6e0797cc3e752293f1f26118ea Test-MockObject-0.15.tar.gz From fedora-extras-commits at redhat.com Sat Jan 1 12:59:13 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 07:59:13 -0500 Subject: rpms/perl-ExtUtils-CBuilder import.log,1.8,1.9 Message-ID: <200501011259.j01CxDib023266@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder In directory cvs.fedora.redhat.com:/tmp/cvs-serv23257 Modified Files: import.log Log Message: auto-import perl-ExtUtils-CBuilder-0.06-0.fdr.1.1 on branch FC-1 from perl-ExtUtils-CBuilder-0.06-0.fdr.1.1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 1 Jan 2005 12:57:15 -0000 1.8 +++ import.log 1 Jan 2005 12:59:11 -0000 1.9 @@ -5,3 +5,4 @@ perl-ExtUtils-CBuilder-0_05-0_fdr_1_1:FC-1:perl-ExtUtils-CBuilder-0.05-0.fdr.1.1.src.rpm:1099889993 perl-ExtUtils-CBuilder-0_05-0_fdr_1_2:HEAD:perl-ExtUtils-CBuilder-0.05-0.fdr.1.2.src.rpm:1099890002 perl-ExtUtils-CBuilder-0_06-0_fdr_1_rh90:RHL-9:perl-ExtUtils-CBuilder-0.06-0.fdr.1.rh90.src.rpm:1104584228 +perl-ExtUtils-CBuilder-0_06-0_fdr_1_1:FC-1:perl-ExtUtils-CBuilder-0.06-0.fdr.1.1.src.rpm:1104584345 From fedora-extras-commits at redhat.com Sat Jan 1 12:59:13 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 07:59:13 -0500 Subject: rpms/perl-ExtUtils-CBuilder/FC-1 .cvsignore, 1.3, 1.4 perl-ExtUtils-CBuilder.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200501011259.j01CxDoG023270@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-1 In directory cvs.fedora.redhat.com:/tmp/cvs-serv23257/FC-1 Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Log Message: auto-import perl-ExtUtils-CBuilder-0.06-0.fdr.1.1 on branch FC-1 from perl-ExtUtils-CBuilder-0.06-0.fdr.1.1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-1/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:59:53 -0000 1.3 +++ .cvsignore 1 Jan 2005 12:59:11 -0000 1.4 @@ -1 +1 @@ -ExtUtils-CBuilder-0.05.tar.gz +ExtUtils-CBuilder-0.06.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-1/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-ExtUtils-CBuilder.spec 8 Nov 2004 04:59:53 -0000 1.3 +++ perl-ExtUtils-CBuilder.spec 1 Jan 2005 12:59:11 -0000 1.4 @@ -1,7 +1,7 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-ExtUtils-CBuilder -Version: 0.05 +Version: 0.06 Release: 0.fdr.1.1 Epoch: 0 Summary: Compile and link C code for Perl modules @@ -9,12 +9,11 @@ Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/ExtUtils-CBuilder/ -Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.05.tar.gz +Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.06.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 -BuildRequires: perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -29,18 +28,20 @@ %build -%{__perl} Build.PL installdirs=vendor -./Build +%{__perl} Makefile.PL INSTALLDIRS=vendor +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -./Build install destdir=$RPM_BUILD_ROOT +make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check || : -./Build test +make test %clean @@ -55,6 +56,13 @@ %changelog +* Tue Dec 28 2004 Jose Pedro Oliveira - 0:0.06-0.fdr.1 +- Update to 0.06. + +* Mon Nov 29 2004 Ville Skytt?? - 0:0.05-1 +- Revert to building with ExtUtils::MakeMaker to eliminate a build + dependency loop with Module::Build. + * Fri Oct 15 2004 Jose Pedro Oliveira - 0:0.05-0.fdr.1 - Update to 0.05. - Building procedure: Makefile.PL -> Build.PL. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-1/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:59:53 -0000 1.3 +++ sources 1 Jan 2005 12:59:11 -0000 1.4 @@ -1 +1 @@ -5a2131578972da0b4914c92a39e6051d ExtUtils-CBuilder-0.05.tar.gz +3aef9536908deb4194583c3cfd5281b1 ExtUtils-CBuilder-0.06.tar.gz From fedora-extras-commits at redhat.com Sat Jan 1 13:00:23 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 08:00:23 -0500 Subject: rpms/perl-Test-MockObject import.log,1.5,1.6 Message-ID: <200501011300.j01D0NKD023383@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Test-MockObject In directory cvs.fedora.redhat.com:/tmp/cvs-serv23374 Modified Files: import.log Log Message: auto-import perl-Test-MockObject-0.15-0.fdr.2.1 on branch FC-1 from perl-Test-MockObject-0.15-0.fdr.2.1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 1 Jan 2005 12:58:06 -0000 1.5 +++ import.log 1 Jan 2005 13:00:21 -0000 1.6 @@ -2,3 +2,4 @@ perl-Test-MockObject-0_14-0_fdr_1_1:HEAD:perl-Test-MockObject-0.14-0.fdr.1.1.src.rpm:1099890548 perl-Test-MockObject-0_14-0_fdr_1_2:HEAD:perl-Test-MockObject-0.14-0.fdr.1.2.src.rpm:1099890554 perl-Test-MockObject-0_15-0_fdr_2_rh90:RHL-9:perl-Test-MockObject-0.15-0.fdr.2.rh90.src.rpm:1104584280 +perl-Test-MockObject-0_15-0_fdr_2_1:FC-1:perl-Test-MockObject-0.15-0.fdr.2.1.src.rpm:1104584414 From fedora-extras-commits at redhat.com Sat Jan 1 13:00:23 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 08:00:23 -0500 Subject: rpms/perl-Test-MockObject/FC-1 .cvsignore, 1.2, 1.3 perl-Test-MockObject.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200501011300.j01D0NKO023387@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Test-MockObject/FC-1 In directory cvs.fedora.redhat.com:/tmp/cvs-serv23374/FC-1 Modified Files: .cvsignore perl-Test-MockObject.spec sources Log Message: auto-import perl-Test-MockObject-0.15-0.fdr.2.1 on branch FC-1 from perl-Test-MockObject-0.15-0.fdr.2.1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-1/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:09:02 -0000 1.2 +++ .cvsignore 1 Jan 2005 13:00:21 -0000 1.3 @@ -1 +1 @@ -Test-MockObject-0.14.tar.gz +Test-MockObject-0.15.tar.gz Index: perl-Test-MockObject.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-1/perl-Test-MockObject.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Test-MockObject.spec 8 Nov 2004 05:09:08 -0000 1.2 +++ perl-Test-MockObject.spec 1 Jan 2005 13:00:21 -0000 1.3 @@ -1,20 +1,20 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-Test-MockObject -Version: 0.14 -Release: 0.fdr.1.1 +Version: 0.15 +Release: 0.fdr.2.1 Epoch: 0 Summary: Perl extension for emulating troublesome interfaces Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Test-MockObject/ -Source: http://www.cpan.org/authors/id/C/CH/CHROMATIC/Test-MockObject-0.14.tar.gz +Source: http://www.cpan.org/authors/id/C/CH/CHROMATIC/Test-MockObject-0.15.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 -BuildRequires: perl(Scalar::Util), perl(Test::Builder), perl(Test::More) +BuildRequires: perl(Scalar::Util), perl(Test::Simple) >= 0.44 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -54,16 +54,22 @@ %files %defattr(-,root,root,-) %doc Changes README -%{perl_vendorlib}/* +%{perl_vendorlib}/Test/ %{_mandir}/man3/*.3* %changelog +* Tue Dec 28 2004 Jose Pedro Oliveira - 0:0.15-0.fdr.2 +- Build requires Test::Simple >= 0.44 (bug 2324). + +* Wed Dec 01 2004 Jose Pedro Oliveira - 0:0.15-0.fdr.1 +- Update to 0.15. + * Tue May 25 2004 Jose Pedro Oliveira - 0:0.14-0.fdr.1 - Update to 0.14. - Require perl >= 1:5.6.1 for vendor install dir support. - Use pure_install to avoid perllocal.pod workarounds. -- Moved make test to section %check. +- Moved make test to section %%check. * Wed Nov 19 2003 Ville Skytt?? - 0:0.12-0.fdr.1 - First build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-1/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:09:02 -0000 1.2 +++ sources 1 Jan 2005 13:00:21 -0000 1.3 @@ -1 +1 @@ -d64b366a3833eea8b6f5f8eabecb2a7f Test-MockObject-0.14.tar.gz +22f92c6e0797cc3e752293f1f26118ea Test-MockObject-0.15.tar.gz From fedora-extras-commits at redhat.com Sat Jan 1 13:02:00 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 08:02:00 -0500 Subject: rpms/perl-ExtUtils-CBuilder import.log,1.9,1.10 Message-ID: <200501011302.j01D20jH024083@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder In directory cvs.fedora.redhat.com:/tmp/cvs-serv24074 Modified Files: import.log Log Message: auto-import perl-ExtUtils-CBuilder-0.06-0.fdr.1.2 on branch FC-2 from perl-ExtUtils-CBuilder-0.06-0.fdr.1.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/import.log,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- import.log 1 Jan 2005 12:59:11 -0000 1.9 +++ import.log 1 Jan 2005 13:01:58 -0000 1.10 @@ -6,3 +6,4 @@ perl-ExtUtils-CBuilder-0_05-0_fdr_1_2:HEAD:perl-ExtUtils-CBuilder-0.05-0.fdr.1.2.src.rpm:1099890002 perl-ExtUtils-CBuilder-0_06-0_fdr_1_rh90:RHL-9:perl-ExtUtils-CBuilder-0.06-0.fdr.1.rh90.src.rpm:1104584228 perl-ExtUtils-CBuilder-0_06-0_fdr_1_1:FC-1:perl-ExtUtils-CBuilder-0.06-0.fdr.1.1.src.rpm:1104584345 +perl-ExtUtils-CBuilder-0_06-0_fdr_1_2:FC-2:perl-ExtUtils-CBuilder-0.06-0.fdr.1.2.src.rpm:1104584511 From fedora-extras-commits at redhat.com Sat Jan 1 13:02:00 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 08:02:00 -0500 Subject: rpms/perl-ExtUtils-CBuilder/FC-2 .cvsignore, 1.3, 1.4 perl-ExtUtils-CBuilder.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200501011302.j01D20Yf024087@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv24074/FC-2 Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Log Message: auto-import perl-ExtUtils-CBuilder-0.06-0.fdr.1.2 on branch FC-2 from perl-ExtUtils-CBuilder-0.06-0.fdr.1.2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-2/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 05:00:02 -0000 1.3 +++ .cvsignore 1 Jan 2005 13:01:58 -0000 1.4 @@ -1 +1 @@ -ExtUtils-CBuilder-0.05.tar.gz +ExtUtils-CBuilder-0.06.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-2/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-ExtUtils-CBuilder.spec 8 Nov 2004 05:00:02 -0000 1.4 +++ perl-ExtUtils-CBuilder.spec 1 Jan 2005 13:01:58 -0000 1.5 @@ -1,7 +1,7 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-ExtUtils-CBuilder -Version: 0.05 +Version: 0.06 Release: 0.fdr.1.2 Epoch: 0 Summary: Compile and link C code for Perl modules @@ -9,12 +9,11 @@ Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/ExtUtils-CBuilder/ -Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.05.tar.gz +Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.06.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 -BuildRequires: perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -29,18 +28,20 @@ %build -%{__perl} Build.PL installdirs=vendor -./Build +%{__perl} Makefile.PL INSTALLDIRS=vendor +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -./Build install destdir=$RPM_BUILD_ROOT +make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check || : -./Build test +make test %clean @@ -55,6 +56,13 @@ %changelog +* Tue Dec 28 2004 Jose Pedro Oliveira - 0:0.06-0.fdr.1 +- Update to 0.06. + +* Mon Nov 29 2004 Ville Skytt?? - 0:0.05-1 +- Revert to building with ExtUtils::MakeMaker to eliminate a build + dependency loop with Module::Build. + * Fri Oct 15 2004 Jose Pedro Oliveira - 0:0.05-0.fdr.1 - Update to 0.05. - Building procedure: Makefile.PL -> Build.PL. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-2/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 05:00:02 -0000 1.3 +++ sources 1 Jan 2005 13:01:58 -0000 1.4 @@ -1 +1 @@ -5a2131578972da0b4914c92a39e6051d ExtUtils-CBuilder-0.05.tar.gz +3aef9536908deb4194583c3cfd5281b1 ExtUtils-CBuilder-0.06.tar.gz From fedora-extras-commits at redhat.com Sat Jan 1 13:03:24 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 08:03:24 -0500 Subject: rpms/perl-Test-MockObject import.log,1.6,1.7 Message-ID: <200501011303.j01D3O5Y024209@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Test-MockObject In directory cvs.fedora.redhat.com:/tmp/cvs-serv24200 Modified Files: import.log Log Message: auto-import perl-Test-MockObject-0.15-0.fdr.2.2 on branch FC-2 from perl-Test-MockObject-0.15-0.fdr.2.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 1 Jan 2005 13:00:21 -0000 1.6 +++ import.log 1 Jan 2005 13:03:22 -0000 1.7 @@ -3,3 +3,4 @@ perl-Test-MockObject-0_14-0_fdr_1_2:HEAD:perl-Test-MockObject-0.14-0.fdr.1.2.src.rpm:1099890554 perl-Test-MockObject-0_15-0_fdr_2_rh90:RHL-9:perl-Test-MockObject-0.15-0.fdr.2.rh90.src.rpm:1104584280 perl-Test-MockObject-0_15-0_fdr_2_1:FC-1:perl-Test-MockObject-0.15-0.fdr.2.1.src.rpm:1104584414 +perl-Test-MockObject-0_15-0_fdr_2_2:FC-2:perl-Test-MockObject-0.15-0.fdr.2.2.src.rpm:1104584595 From fedora-extras-commits at redhat.com Sat Jan 1 13:03:24 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 08:03:24 -0500 Subject: rpms/perl-Test-MockObject/FC-2 .cvsignore, 1.2, 1.3 perl-Test-MockObject.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200501011303.j01D3Oj2024213@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Test-MockObject/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv24200/FC-2 Modified Files: .cvsignore perl-Test-MockObject.spec sources Log Message: auto-import perl-Test-MockObject-0.15-0.fdr.2.2 on branch FC-2 from perl-Test-MockObject-0.15-0.fdr.2.2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-2/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:09:02 -0000 1.2 +++ .cvsignore 1 Jan 2005 13:03:22 -0000 1.3 @@ -1 +1 @@ -Test-MockObject-0.14.tar.gz +Test-MockObject-0.15.tar.gz Index: perl-Test-MockObject.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-2/perl-Test-MockObject.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Test-MockObject.spec 8 Nov 2004 05:09:14 -0000 1.3 +++ perl-Test-MockObject.spec 1 Jan 2005 13:03:22 -0000 1.4 @@ -1,20 +1,20 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-Test-MockObject -Version: 0.14 -Release: 0.fdr.1.2 +Version: 0.15 +Release: 0.fdr.2.2 Epoch: 0 Summary: Perl extension for emulating troublesome interfaces Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Test-MockObject/ -Source: http://www.cpan.org/authors/id/C/CH/CHROMATIC/Test-MockObject-0.14.tar.gz +Source: http://www.cpan.org/authors/id/C/CH/CHROMATIC/Test-MockObject-0.15.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 -BuildRequires: perl(Scalar::Util), perl(Test::Builder), perl(Test::More) +BuildRequires: perl(Scalar::Util), perl(Test::Simple) >= 0.44 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -54,16 +54,22 @@ %files %defattr(-,root,root,-) %doc Changes README -%{perl_vendorlib}/* +%{perl_vendorlib}/Test/ %{_mandir}/man3/*.3* %changelog +* Tue Dec 28 2004 Jose Pedro Oliveira - 0:0.15-0.fdr.2 +- Build requires Test::Simple >= 0.44 (bug 2324). + +* Wed Dec 01 2004 Jose Pedro Oliveira - 0:0.15-0.fdr.1 +- Update to 0.15. + * Tue May 25 2004 Jose Pedro Oliveira - 0:0.14-0.fdr.1 - Update to 0.14. - Require perl >= 1:5.6.1 for vendor install dir support. - Use pure_install to avoid perllocal.pod workarounds. -- Moved make test to section %check. +- Moved make test to section %%check. * Wed Nov 19 2003 Ville Skytt?? - 0:0.12-0.fdr.1 - First build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-2/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:09:02 -0000 1.2 +++ sources 1 Jan 2005 13:03:22 -0000 1.3 @@ -1 +1 @@ -d64b366a3833eea8b6f5f8eabecb2a7f Test-MockObject-0.14.tar.gz +22f92c6e0797cc3e752293f1f26118ea Test-MockObject-0.15.tar.gz From fedora-extras-commits at redhat.com Sat Jan 1 13:15:02 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 08:15:02 -0500 Subject: rpms/perl-ExtUtils-CBuilder/devel .cvsignore, 1.3, 1.4 perl-ExtUtils-CBuilder.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200501011315.j01DF20v024389@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24383 Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Log Message: Sync with 0.06-0.fdr.1 from Jose. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 05:00:02 -0000 1.3 +++ .cvsignore 1 Jan 2005 13:15:00 -0000 1.4 @@ -1 +1 @@ -ExtUtils-CBuilder-0.05.tar.gz +ExtUtils-CBuilder-0.06.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-ExtUtils-CBuilder.spec 29 Nov 2004 19:27:00 -0000 1.5 +++ perl-ExtUtils-CBuilder.spec 1 Jan 2005 13:15:00 -0000 1.6 @@ -1,7 +1,7 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-ExtUtils-CBuilder -Version: 0.05 +Version: 0.06 Release: 1 Epoch: 0 Summary: Compile and link C code for Perl modules @@ -9,7 +9,7 @@ Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/ExtUtils-CBuilder/ -Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.05.tar.gz +Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.06.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -56,6 +56,9 @@ %changelog +* Tue Dec 28 2004 Jose Pedro Oliveira - 0:0.06-1 +- Update to 0.06. + * Mon Nov 29 2004 Ville Skytt?? - 0:0.05-1 - Revert to building with ExtUtils::MakeMaker to eliminate a build dependency loop with Module::Build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 05:00:02 -0000 1.3 +++ sources 1 Jan 2005 13:15:00 -0000 1.4 @@ -1 +1 @@ -5a2131578972da0b4914c92a39e6051d ExtUtils-CBuilder-0.05.tar.gz +3aef9536908deb4194583c3cfd5281b1 ExtUtils-CBuilder-0.06.tar.gz From fedora-extras-commits at redhat.com Sat Jan 1 13:17:39 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 08:17:39 -0500 Subject: rpms/perl-Test-MockObject/devel .cvsignore, 1.2, 1.3 perl-Test-MockObject.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200501011317.j01DHd96024442@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Test-MockObject/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24436 Modified Files: .cvsignore perl-Test-MockObject.spec sources Log Message: Sync with 0.15-0.fdr.2 from Jose. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:09:02 -0000 1.2 +++ .cvsignore 1 Jan 2005 13:17:37 -0000 1.3 @@ -1 +1 @@ -Test-MockObject-0.14.tar.gz +Test-MockObject-0.15.tar.gz Index: perl-Test-MockObject.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/perl-Test-MockObject.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Test-MockObject.spec 10 Dec 2004 22:03:09 -0000 1.4 +++ perl-Test-MockObject.spec 1 Jan 2005 13:17:37 -0000 1.5 @@ -1,20 +1,20 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-Test-MockObject -Version: 0.14 -Release: 1 +Version: 0.15 +Release: 2 Epoch: 0 Summary: Perl extension for emulating troublesome interfaces Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Test-MockObject/ -Source: http://www.cpan.org/authors/id/C/CH/CHROMATIC/Test-MockObject-0.14.tar.gz +Source: http://www.cpan.org/authors/id/C/CH/CHROMATIC/Test-MockObject-0.15.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 -BuildRequires: perl(Scalar::Util), perl(Test::Builder), perl(Test::More) +BuildRequires: perl(Scalar::Util), perl(Test::Simple) >= 0.44 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -54,16 +54,22 @@ %files %defattr(-,root,root,-) %doc Changes README -%{perl_vendorlib}/* +%{perl_vendorlib}/Test/ %{_mandir}/man3/*.3* %changelog +* Tue Dec 28 2004 Jose Pedro Oliveira - 0:0.15-2 +- Build requires Test::Simple >= 0.44 (bug 2324). + +* Wed Dec 01 2004 Jose Pedro Oliveira - 0:0.15-0.fdr.1 +- Update to 0.15. + * Tue May 25 2004 Jose Pedro Oliveira - 0:0.14-0.fdr.1 - Update to 0.14. - Require perl >= 1:5.6.1 for vendor install dir support. - Use pure_install to avoid perllocal.pod workarounds. -- Moved make test to section %check. +- Moved make test to section %%check. * Wed Nov 19 2003 Ville Skytt?? - 0:0.12-0.fdr.1 - First build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:09:02 -0000 1.2 +++ sources 1 Jan 2005 13:17:37 -0000 1.3 @@ -1 +1 @@ -d64b366a3833eea8b6f5f8eabecb2a7f Test-MockObject-0.14.tar.gz +22f92c6e0797cc3e752293f1f26118ea Test-MockObject-0.15.tar.gz From fedora-extras-commits at redhat.com Tue Jan 4 23:23:54 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 4 Jan 2005 18:23:54 -0500 Subject: rpms/bash-completion/devel bash-completion-openssl-cnf.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 bash-completion.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200501042323.j04NNsiL030993@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/bash-completion/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv30987 Modified Files: .cvsignore bash-completion.spec sources Added Files: bash-completion-openssl-cnf.patch Log Message: Update to 20050103. bash-completion-openssl-cnf.patch: --- NEW FILE bash-completion-openssl-cnf.patch --- --- bash_completion~ 2005-01-04 08:37:42.000000000 +0200 +++ bash_completion 2005-01-05 01:16:06.683299242 +0200 @@ -3179,6 +3179,7 @@ local config config=/etc/ssl/openssl.cnf + [ ! -f $config ] && config=/usr/share/ssl/openssl.cnf for (( i=2; i < COMP_CWORD; i++ )); do if [[ "${COMP_WORDS[i]}" == -config ]]; then config=${COMP_WORDS[i+1]} Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bash-completion/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:05:13 -0000 1.3 +++ .cvsignore 4 Jan 2005 23:23:51 -0000 1.4 @@ -1 +1 @@ -bash-completion-20041017.tar.bz2 +bash-completion-20050103.tar.bz2 Index: bash-completion.spec =================================================================== RCS file: /cvs/extras/rpms/bash-completion/devel/bash-completion.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bash-completion.spec 27 Nov 2004 15:44:30 -0000 1.3 +++ bash-completion.spec 4 Jan 2005 23:23:51 -0000 1.4 @@ -1,14 +1,15 @@ Name: bash-completion -Version: 20041017 -Release: 5 +Version: 20050103 +Release: 1 Epoch: 0 Summary: Programmable completion for Bash Group: System Environment/Shells License: GPL URL: http://www.caliban.org/bash/ -Source0: http://www.caliban.org/files/bash/bash-completion-20041017.tar.bz2 +Source0: http://www.caliban.org/files/bash/bash-completion-20050103.tar.bz2 Source1: %{name}.profile +Patch0: %{name}-openssl-cnf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -21,6 +22,7 @@ %prep %setup -q -n bash_completion +%patch0 %build @@ -128,6 +130,9 @@ %changelog +* Wed Jan 5 2005 Ville Skytt?? - 0:20050103-1 +- Update to 20050103. + * Sat Nov 27 2004 Ville Skytt?? - 0:20041017-5 - Change version scheme, bump release to provide Extras upgrade path. Index: sources =================================================================== RCS file: /cvs/extras/rpms/bash-completion/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:05:13 -0000 1.3 +++ sources 4 Jan 2005 23:23:51 -0000 1.4 @@ -1 +1 @@ -3fd0836127d01606a9dc4262f3e2e1fb bash-completion-20041017.tar.bz2 +0ee7009b18ff862f8a63c2395e5fd100 bash-completion-20050103.tar.bz2 From fedora-extras-commits at redhat.com Wed Jan 5 09:19:05 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 5 Jan 2005 04:19:05 -0500 Subject: rpms/xdesktopwaves - New directory Message-ID: <200501050919.j059J5cG006082@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/xdesktopwaves In directory cvs.fedora.redhat.com:/tmp/cvs-serv6075/xdesktopwaves Log Message: Directory /cvs/extras/rpms/xdesktopwaves added to the repository From fedora-extras-commits at redhat.com Wed Jan 5 09:19:05 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 5 Jan 2005 04:19:05 -0500 Subject: rpms/xdesktopwaves/devel - New directory Message-ID: <200501050919.j059J5S1006085@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/xdesktopwaves/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv6075/xdesktopwaves/devel Log Message: Directory /cvs/extras/rpms/xdesktopwaves/devel added to the repository From fedora-extras-commits at redhat.com Wed Jan 5 09:19:28 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 5 Jan 2005 04:19:28 -0500 Subject: rpms/xdesktopwaves Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501050919.j059JS6m006144@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/xdesktopwaves In directory cvs.fedora.redhat.com:/tmp/cvs-serv6135 Added Files: Makefile import.log Log Message: Setup of module xdesktopwaves --- NEW FILE Makefile --- # Top level Makefile for module xdesktopwaves all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 5 09:19:28 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 5 Jan 2005 04:19:28 -0500 Subject: rpms/xdesktopwaves/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501050919.j059JSgU006147@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/xdesktopwaves/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv6135/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xdesktopwaves --- NEW 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 Jan 5 09:20:17 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 5 Jan 2005 04:20:17 -0500 Subject: rpms/xdesktopwaves import.log,1.1,1.2 Message-ID: <200501050920.j059KHjW006240@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/xdesktopwaves In directory cvs.fedora.redhat.com:/tmp/cvs-serv6231 Modified Files: import.log Log Message: auto-import xdesktopwaves-1.2-1 on branch devel from xdesktopwaves-1.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xdesktopwaves/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 Jan 2005 09:19:26 -0000 1.1 +++ import.log 5 Jan 2005 09:20:15 -0000 1.2 @@ -0,0 +1 @@ +xdesktopwaves-1_2-1:HEAD:xdesktopwaves-1.2-1.src.rpm:1104916833 From fedora-extras-commits at redhat.com Wed Jan 5 09:20:17 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 5 Jan 2005 04:20:17 -0500 Subject: rpms/xdesktopwaves/devel xdesktopwaves.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501050920.j059KHrP006244@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/xdesktopwaves/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv6231/devel Modified Files: .cvsignore sources Added Files: xdesktopwaves.spec Log Message: auto-import xdesktopwaves-1.2-1 on branch devel from xdesktopwaves-1.2-1.src.rpm --- NEW FILE xdesktopwaves.spec --- # $Id: xdesktopwaves.spec,v 1.4 2004/12/07 07:32:08 adrian Exp $ Name: xdesktopwaves Version: 1.2 Release: 1 Summary: Simulation of water waves on the X Window System desktop License: GPL Group: Amusements/Graphics URL: http://xdesktopwaves.sf.net/ Source: http://dl.sf.net/xdesktopwaves/xdesktopwaves-1.2.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xorg-x11-devel, desktop-file-utils %description xdesktopwaves is a cellular automata setting the background of your X Window System desktop under water. Windows and mouse are like ships on the sea. Each movement of these ends up in moving water waves. You can even have rain and/or storm stirring up the water. %prep %setup -q %build %{__make} CFLAGS="$RPM_OPT_FLAGS -I/usr/X11R6/include" \ LFLAGS="-L/usr/X11R6/%{_lib}" %{?_smp_mflags} %install %{__rm} -rf $RPM_BUILD_ROOT %{__mkdir_p} $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1} %{__mkdir_p} $RPM_BUILD_ROOT{%{_datadir}/applications,%{_datadir}/pixmaps} %{__make} install BINDIR=$RPM_BUILD_ROOT%{_bindir} MAN1DIR=$RPM_BUILD_ROOT%{_mandir}/man1 %{__cp} -p %{name}.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps cat > %{name}.desktop < - 1.2-1 - Make with proper LFLAGS to support /usr/X11R6/lib64 location (fix confirmed as necessary via Matthias Saou's package). * Tue Dec 07 2004 Adrian Reber - 0:1.2-0.fdr.1 - updated to 1.2 * Mon Nov 22 2004 Adrian Reber - 0:1.0-0.fdr.1 - initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xdesktopwaves/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Jan 2005 09:19:26 -0000 1.1 +++ .cvsignore 5 Jan 2005 09:20:15 -0000 1.2 @@ -0,0 +1 @@ +xdesktopwaves-1.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xdesktopwaves/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Jan 2005 09:19:26 -0000 1.1 +++ sources 5 Jan 2005 09:20:15 -0000 1.2 @@ -0,0 +1 @@ +a91384eab6050402fd2112124ea7c8bb xdesktopwaves-1.2.tar.gz From fedora-extras-commits at redhat.com Wed Jan 5 18:56:27 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 5 Jan 2005 13:56:27 -0500 Subject: rpms/starfighter/devel starfighter.spec,1.2,1.3 Message-ID: <200501051856.j05IuRtM014082@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/starfighter/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv14073 Modified Files: starfighter.spec Log Message: Minor fix for the desktop file. Index: starfighter.spec =================================================================== RCS file: /cvs/extras/rpms/starfighter/devel/starfighter.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- starfighter.spec 16 Nov 2004 18:56:55 -0000 1.2 +++ starfighter.spec 5 Jan 2005 18:56:25 -0000 1.3 @@ -9,7 +9,7 @@ Summary: Project: Starfighter, a space arcade game Name: starfighter Version: 1.1 -Release: 2 +Release: 3 License: GPL Group: Amusements/Games URL: http://www.parallelrealities.co.uk/starfighter.php @@ -63,10 +63,10 @@ Encoding=UTF-8 EOF -%if %{!?_without_freedesktop:1}0 +%if 0%{!?_without_freedesktop:1} %{__mkdir_p} %{buildroot}%{_datadir}/applications desktop-file-install \ - --vendor %{desktop_vendor} \ + --vendor fedora \ --dir %{buildroot}%{_datadir}/applications \ %{name}.desktop %else @@ -86,13 +86,16 @@ %{_prefix}/share/games/starfighter %{_datadir}/pixmaps/starfighter.png %if %{!?_without_freedesktop:1}0 -%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop +%{_datadir}/applications/fedora-%{name}.desktop %else %{_sysconfdir}/X11/applnk/Games/%{name}.desktop %endif %changelog +* Wed Jan 5 2005 Matthias Saou 1.1-3 +- Fix desktop_vendor in the desktop file name (#143285). + * Tue Nov 16 2004 Matthias Saou 1.1-2 - Bump release to provide Extras upgrade path. From fedora-extras-commits at redhat.com Wed Jan 5 19:32:37 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 5 Jan 2005 14:32:37 -0500 Subject: rpms/perl-Module-CoreList - New directory Message-ID: <200501051932.j05JWbeg014809@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Module-CoreList In directory cvs.fedora.redhat.com:/tmp/cvs-serv14802/perl-Module-CoreList Log Message: Directory /cvs/extras/rpms/perl-Module-CoreList added to the repository From fedora-extras-commits at redhat.com Wed Jan 5 19:32:37 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 5 Jan 2005 14:32:37 -0500 Subject: rpms/perl-Module-CoreList/devel - New directory Message-ID: <200501051932.j05JWbBk014812@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Module-CoreList/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv14802/perl-Module-CoreList/devel Log Message: Directory /cvs/extras/rpms/perl-Module-CoreList/devel added to the repository From fedora-extras-commits at redhat.com Wed Jan 5 19:32:55 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 5 Jan 2005 14:32:55 -0500 Subject: rpms/perl-Module-CoreList Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501051932.j05JWtQM014871@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Module-CoreList In directory cvs.fedora.redhat.com:/tmp/cvs-serv14862 Added Files: Makefile import.log Log Message: Setup of module perl-Module-CoreList --- NEW FILE Makefile --- # Top level Makefile for module perl-Module-CoreList all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 5 19:32:55 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 5 Jan 2005 14:32:55 -0500 Subject: rpms/perl-Module-CoreList/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501051932.j05JWtSX014874@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Module-CoreList/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv14862/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Module-CoreList --- NEW 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 Jan 5 19:33:26 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 5 Jan 2005 14:33:26 -0500 Subject: rpms/perl-Module-CoreList import.log,1.1,1.2 Message-ID: <200501051933.j05JXQkg014967@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Module-CoreList In directory cvs.fedora.redhat.com:/tmp/cvs-serv14958 Modified Files: import.log Log Message: auto-import perl-Module-CoreList-1.98-2 on branch devel from perl-Module-CoreList-1.98-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Module-CoreList/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 Jan 2005 19:32:53 -0000 1.1 +++ import.log 5 Jan 2005 19:33:24 -0000 1.2 @@ -0,0 +1 @@ +perl-Module-CoreList-1_98-2:HEAD:perl-Module-CoreList-1.98-2.src.rpm:1104953598 From fedora-extras-commits at redhat.com Wed Jan 5 19:33:26 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 5 Jan 2005 14:33:26 -0500 Subject: rpms/perl-Module-CoreList/devel perl-Module-CoreList.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501051933.j05JXQB0014971@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Module-CoreList/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv14958/devel Modified Files: .cvsignore sources Added Files: perl-Module-CoreList.spec Log Message: auto-import perl-Module-CoreList-1.98-2 on branch devel from perl-Module-CoreList-1.98-2.src.rpm --- NEW FILE perl-Module-CoreList.spec --- %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-Module-CoreList Version: 1.98 Release: 2 Epoch: 0 Summary: Perl core modules indexed by perl versions Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Module-CoreList/ Source0: http://www.cpan.org/authors/id/R/RC/RCLAMP/Module-CoreList-1.98.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 BuildRequires: perl(Module::Build), perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Module::CoreList contains the hash of hashes %Module::CoreList::version, this is keyed on perl version as indicated in $]. The second level hash is module => version pairs. %prep %setup -q -n Module-CoreList-%{version} %{__perl} -pi -e 's{^#!/usr/local/perl5.6.1/bin/perl\b}{#!%{__perl}}' identify-dependencies %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT chmod -R u+w $RPM_BUILD_ROOT/* %check || : ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README identify-dependencies %{_bindir}/* %{perl_vendorlib}/Module/ %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %changelog * Tue Jan 04 2005 Jose Pedro Oliveira - 0:1.98-2 - BuildRequires: perl(Module::Build) (#2362). * Mon Jan 03 2005 Jose Pedro Oliveira - 0:1.98-0.fdr.1 - Update to 1.98. * Thu Dec 23 2004 Jose Pedro Oliveira - 0:1.97-0.fdr.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-CoreList/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Jan 2005 19:32:53 -0000 1.1 +++ .cvsignore 5 Jan 2005 19:33:24 -0000 1.2 @@ -0,0 +1 @@ +Module-CoreList-1.98.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-CoreList/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Jan 2005 19:32:53 -0000 1.1 +++ sources 5 Jan 2005 19:33:24 -0000 1.2 @@ -0,0 +1 @@ +ef50707fb0126e855771313c75f98bee Module-CoreList-1.98.tar.gz From fedora-extras-commits at redhat.com Thu Jan 6 09:07:10 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 6 Jan 2005 04:07:10 -0500 Subject: rpms/vpnc/devel vpnc-0.3.2-64bit.patch,NONE,1.1 vpnc.spec,1.2,1.3 Message-ID: <200501060907.j0697An9025928@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/vpnc/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25916 Modified Files: vpnc.spec Added Files: vpnc-0.3.2-64bit.patch Log Message: Fix 64bit vpnc-0.3.2-64bit.patch: --- NEW FILE vpnc-0.3.2-64bit.patch --- diff -ur /var/zab/src/vpnc-0.3.2/config.c vpnc-0.3.2/config.c --- /var/zab/src/vpnc-0.3.2/config.c 2004-11-21 16:11:48.000000000 -0800 +++ vpnc-0.3.2/config.c 2005-01-04 09:58:35.000000000 -0800 @@ -352,7 +352,7 @@ const char *p, *q; for (p = text, q = strchr(p, '\n'); q; p = q+1, q = strchr(p, '\n')) - printf("%s%.*s\n", pre, q-p, p); + printf("%s%.*s\n", pre, (int)(q-p), p); if (*p != '\0') printf("%s%s\n", pre, p); @@ -423,8 +423,9 @@ void do_config(int argc, char **argv) { char *s; - int i, c, known, s_len; + int i, c, known; int print_config = 0; + size_t s_len; for (i = 1; i < argc; i++) { if (argv[i][0] != '-') { diff -ur /var/zab/src/vpnc-0.3.2/isakmp-pkt.c vpnc-0.3.2/isakmp-pkt.c --- /var/zab/src/vpnc-0.3.2/isakmp-pkt.c 2004-11-21 14:15:41.000000000 -0800 +++ vpnc-0.3.2/isakmp-pkt.c 2005-01-04 09:56:31.000000000 -0800 @@ -293,14 +293,14 @@ struct isakmp_payload *new_isakmp_payload(uint8_t type) { - struct isakmp_payload *result = xallocc(sizeof(struct isakmp_packet)); + struct isakmp_payload *result = xallocc(sizeof(struct isakmp_payload)); result->type = type; return result; } struct isakmp_payload *new_isakmp_data_payload(uint8_t type, const void *data, size_t data_length) { - struct isakmp_payload *result = xallocc(sizeof(struct isakmp_packet)); + struct isakmp_payload *result = xallocc(sizeof(struct isakmp_payload)); if (type != ISAKMP_PAYLOAD_KE && type != ISAKMP_PAYLOAD_HASH && type != ISAKMP_PAYLOAD_SIG && type != ISAKMP_PAYLOAD_NONCE @@ -697,7 +697,7 @@ size_t isakmp_data_len; if (data_len < ISAKMP_PAYLOAD_O) { - DEBUG(2, printf("packet to short: len = %d < min = %d\n", data_len, ISAKMP_PAYLOAD_O)); + DEBUG(2, printf("packet to short: len = %lld < min = %d\n", (long long)data_len, ISAKMP_PAYLOAD_O)); reason = ISAKMP_N_UNEQUAL_PAYLOAD_LENGTHS; goto error; } @@ -730,8 +730,8 @@ isakmp_data_len = fetch4(); hex_dump("len", &isakmp_data_len, UINT32); if (o_data_len != isakmp_data_len) { - DEBUG(2, printf("isakmp length does not match packet length: isakmp = %d != datalen = %d\n", - isakmp_data_len, o_data_len)); + DEBUG(2, printf("isakmp length does not match packet length: isakmp = %lld != datalen = %lld\n", + (long long)isakmp_data_len, (long long)o_data_len)); reason = ISAKMP_N_UNEQUAL_PAYLOAD_LENGTHS; goto error; } diff -ur /var/zab/src/vpnc-0.3.2/isakmp-pkt.h vpnc-0.3.2/isakmp-pkt.h --- /var/zab/src/vpnc-0.3.2/isakmp-pkt.h 2004-11-21 14:15:05.000000000 -0800 +++ vpnc-0.3.2/isakmp-pkt.h 2005-01-04 10:03:26.000000000 -0800 @@ -41,7 +41,7 @@ uint8_t *data; } lots; } u; -}; +} __attribute__((packed)); struct isakmp_payload { struct isakmp_payload *next; @@ -102,7 +102,7 @@ struct isakmp_attribute *attributes; } modecfg; } u; -}; +} __attribute__((packed)); struct isakmp_packet { uint8_t i_cookie[ISAKMP_COOKIE_LENGTH]; @@ -112,7 +112,7 @@ uint8_t flags; uint32_t message_id; struct isakmp_payload *payload; -}; +} __attribute__((packed)); extern void *xallocc(size_t x); extern struct isakmp_packet *new_isakmp_packet(void); diff -ur /var/zab/src/vpnc-0.3.2/sysdep-bsd.c vpnc-0.3.2/sysdep-bsd.c --- /var/zab/src/vpnc-0.3.2/sysdep-bsd.c 2004-07-04 06:57:30.000000000 -0700 +++ vpnc-0.3.2/sysdep-bsd.c 2005-01-04 10:09:21.000000000 -0800 @@ -74,7 +74,7 @@ uint32_t timeout; } header; u_char data[MAX_MRU]; -}; +} __attribute__((packed)); /* Read/write frames from TUN device */ int tun_write(int fd, char *buf, int len) diff -ur /var/zab/src/vpnc-0.3.2/tunip.c vpnc-0.3.2/tunip.c --- /var/zab/src/vpnc-0.3.2/tunip.c 2004-11-17 12:23:43.000000000 -0800 +++ vpnc-0.3.2/tunip.c 2005-01-04 10:56:06.000000000 -0800 @@ -87,8 +87,8 @@ unsigned char use_fallback; /* use initial address as fallback? */ unsigned char use_dest; /* is dest address known yet? */ - unsigned long spi; /* security parameters index */ - unsigned long seq_id; /* for replay protection (not implemented) */ + uint32_t spi; /* security parameters index */ + uint32_t seq_id; /* for replay protection (not implemented) */ /* Encryption key */ const unsigned char *enc_secret; @@ -118,12 +118,12 @@ /* A real ESP header (RFC 2406) */ typedef struct esp_encap_header { - unsigned long spi; /* security parameters index */ - unsigned long seq_id; /* sequence id (unimplemented) */ + uint32_t spi; /* security parameters index */ + uint32_t seq_id; /* sequence id (unimplemented) */ /* variable-length payload data + padding */ /* unsigned char next_header */ /* optional auth data */ -} esp_encap_header_t; +} esp_encap_header_t __attribute__((packed)); struct encap_method { int fd; /* file descriptor for relevant socket */ @@ -136,7 +136,7 @@ unsigned int bufsize, bufpayload, var_header_size; int buflen; struct sockaddr_in from; - int fromlen; + socklen_t fromlen; int (*recv) (struct encap_method * encap, unsigned char *buf, unsigned int bufsize, struct sockaddr_in * from); @@ -151,7 +151,7 @@ struct peer_desc *peer, unsigned char *buf, unsigned int bufsize); void encap_udp_send_peer(struct encap_method *encap, struct peer_desc *peer, unsigned char *buf, unsigned int bufsize); -struct peer_desc *peer_find(unsigned long spi, struct encap_method *encap); +struct peer_desc *peer_find(uint32_t spi, struct encap_method *encap); int encap_esp_recv_peer(struct encap_method *encap, struct peer_desc *peer); /* Yuck! Global variables... */ @@ -220,7 +220,7 @@ int encap_rawip_recv(struct encap_method *encap, unsigned char *buf, unsigned int bufsize, struct sockaddr_in *from) { - int r; + ssize_t r; struct ip *p = (struct ip *)buf; encap->fromlen = sizeof(encap->from); @@ -231,7 +231,10 @@ return -1; } if (r < (p->ip_hl << 2) + encap->fixed_header_size) { - syslog(LOG_ALERT, "packet too short from %s", inet_ntoa(encap->from.sin_addr)); +#if 0 + syslog(LOG_ALERT, "packet too short from %s", + inet_ntoa(encap->from.sin_addr)); +#endif return -1; } #if 0 @@ -268,7 +271,7 @@ unsigned char *buf, unsigned int bufsize, struct sockaddr_in *from) { - int r; + ssize_t r; encap->fromlen = sizeof(encap->from); @@ -279,8 +282,10 @@ return -1; } if (r < encap->fixed_header_size) { +#if 0 syslog(LOG_ALERT, "packet too short from %s", inet_ntoa(encap->from.sin_addr)); +#endif return -1; } @@ -447,11 +452,11 @@ /* * Find the peer record associated with a given local SPI. */ -struct peer_desc *peer_find(unsigned long spi, struct encap_method *encap) +struct peer_desc *peer_find(uint32_t spi, struct encap_method *encap) { if (vpnpeer.local_sa->spi == spi && vpnpeer.local_sa->em == encap) return &vpnpeer; - syslog(LOG_ALERT, "unknown spi %ld", spi); + syslog(LOG_ALERT, "unknown spi %u", spi); return NULL; } @@ -623,7 +628,7 @@ return; } if (sent != encap->buflen) - syslog(LOG_ALERT, "truncated out (%d out of %d)", sent, encap->buflen); + syslog(LOG_ALERT, "truncated out (%llu out of %d)", (unsigned long long)sent, encap->buflen); } /* @@ -659,8 +664,8 @@ return; } if (sent != encap->buflen) - syslog(LOG_ALERT, "truncated out (%Zd out of %Zd)", - sent, encap->buflen); + syslog(LOG_ALERT, "truncated out (%lld out of %d)", + (long long)sent, encap->buflen); } int encap_esp_recv_peer(struct encap_method *encap, struct peer_desc *peer) @@ -838,7 +843,7 @@ char addr1[16]; strcpy(addr1, inet_ntoa(peer->remote_sa->dest.sin_addr)); syslog(LOG_NOTICE, - "spi %ld: remote address changed from %s to %s", + "spi %u: remote address changed from %s to %s", peer->remote_sa->spi, addr1, inet_ntoa(from.sin_addr)); peer->remote_sa->dest.sin_addr.s_addr = from.sin_addr.s_addr; peer->remote_sa->use_dest = 1; diff -ur /var/zab/src/vpnc-0.3.2/vpnc.c vpnc-0.3.2/vpnc.c --- /var/zab/src/vpnc-0.3.2/vpnc.c 2004-11-21 16:12:02.000000000 -0800 +++ vpnc-0.3.2/vpnc.c 2005-01-04 09:55:37.000000000 -0800 @@ -468,8 +468,8 @@ *r_p = NULL; if (r_length < ISAKMP_PAYLOAD_O || ((r_length - ISAKMP_PAYLOAD_O) % s->ivlen != 0)) { - DEBUG(2, printf("payload to short or not padded: len=%d, min=%d (ivlen=%d)\n", - r_length, ISAKMP_PAYLOAD_O, s->ivlen)); + DEBUG(2, printf("payload to short or not padded: len=%lld, min=%d (ivlen=%lld)\n", + (long long)r_length, ISAKMP_PAYLOAD_O, (long long)s->ivlen)); return ISAKMP_N_UNEQUAL_PAYLOAD_LENGTHS; } Index: vpnc.spec =================================================================== RCS file: /cvs/extras/rpms/vpnc/devel/vpnc.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- vpnc.spec 24 Dec 2004 03:16:24 -0000 1.2 +++ vpnc.spec 6 Jan 2005 09:07:08 -0000 1.3 @@ -1,6 +1,6 @@ Name: vpnc Version: 0.3.2 -Release: 2 +Release: 3 Summary: IPSec VPN client compatible with Cisco equipment Group: Applications/Internet @@ -9,6 +9,7 @@ Source0: vpnc-0.3.2.tar.gz Source1: generic-vpnc.conf Patch0: vpnc-0.3.2-pie.patch +Patch1: vpnc-0.3.2-64bit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgcrypt-devel > 0:1.1.90 @@ -23,6 +24,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build make @@ -45,6 +47,9 @@ /sbin/* %changelog +* Wed Jan 05 2005 Warren Togami 0.3.2-3 +- Fix 64bit + * Thu Dec 23 2004 Warren Togami 0.3.2-2 - make PIE (davej) From fedora-extras-commits at redhat.com Thu Jan 6 18:17:18 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 6 Jan 2005 13:17:18 -0500 Subject: rpms/gpgme03/devel gpgme-0.3.16-underquoted.patch, NONE, 1.1 gpgme03.spec, 1.5, 1.6 Message-ID: <200501061817.j06IHIju001696@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gpgme03/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv1690 Modified Files: gpgme03.spec Added Files: gpgme-0.3.16-underquoted.patch Log Message: Fix underquoted definition in gpgme.m4 gpgme-0.3.16-underquoted.patch: --- NEW FILE gpgme-0.3.16-underquoted.patch --- diff -Nur gpgme-0.3.16-orig/gpgme/gpgme.m4 gpgme-0.3.16/gpgme/gpgme.m4 --- gpgme-0.3.16-orig/gpgme/gpgme.m4 2002-08-23 21:48:30.000000000 +0200 +++ gpgme-0.3.16/gpgme/gpgme.m4 2005-01-06 19:04:50.006691496 +0100 @@ -6,7 +6,7 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) dnl Test for libgpgme and define GPGME_CFLAGS and GPGME_LIBS dnl -AC_DEFUN(AM_PATH_GPGME, +AC_DEFUN([AM_PATH_GPGME], [ AC_ARG_WITH(gpgme-prefix, AC_HELP_STRING([--with-gpgme-prefix=PFX], [prefix where GPGME is installed (optional)]), Index: gpgme03.spec =================================================================== RCS file: /cvs/extras/rpms/gpgme03/devel/gpgme03.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gpgme03.spec 30 Nov 2004 11:04:30 -0000 1.5 +++ gpgme03.spec 6 Jan 2005 18:17:16 -0000 1.6 @@ -1,12 +1,13 @@ Summary: GnuPG Made Easy interface library Name: gpgme03 Version: 0.3.16 -Release: 5 +Release: 6 Epoch: 0 License: GPL Group: Applications/System Source: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-0.3.16.tar.gz Patch: gpgme-0.3.16-select.patch +Patch1: gpgme-0.3.16-underquoted.patch URL: http://www.gnupg.org/related_software/gpgme/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gnupg >= 0:1.2.0, %{_bindir}/gpgsm @@ -32,6 +33,7 @@ %prep %setup -q -n gpgme-%{version} %patch -p1 -b .select +%patch1 -p1 -b .underquoted %build @@ -82,6 +84,9 @@ %changelog +* Thu Jan 6 2005 Michael Schwendt - 0.3.16-6 +- Fix underquoted definition in gpgme.m4. + * Tue Nov 30 2004 Michael Schwendt - 0.3.16-5 - Drop BR pth-devel and build --with-pth=no. It is neither used nor linked against libpth. configure.ac does a negative check for pth 1.2.0 From fedora-extras-commits at redhat.com Fri Jan 7 07:22:40 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 7 Jan 2005 02:22:40 -0500 Subject: rpms/pop-before-smtp - New directory Message-ID: <200501070722.j077Meqr011855@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/pop-before-smtp In directory cvs.fedora.redhat.com:/tmp/cvs-serv11842/pop-before-smtp Log Message: Directory /cvs/extras/rpms/pop-before-smtp added to the repository From fedora-extras-commits at redhat.com Fri Jan 7 07:22:40 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 7 Jan 2005 02:22:40 -0500 Subject: rpms/pop-before-smtp/devel - New directory Message-ID: <200501070722.j077MeSI011858@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/pop-before-smtp/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv11842/pop-before-smtp/devel Log Message: Directory /cvs/extras/rpms/pop-before-smtp/devel added to the repository From fedora-extras-commits at redhat.com Fri Jan 7 07:22:57 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 7 Jan 2005 02:22:57 -0500 Subject: rpms/pop-before-smtp Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501070722.j077MvWt011935@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/pop-before-smtp In directory cvs.fedora.redhat.com:/tmp/cvs-serv11920 Added Files: Makefile import.log Log Message: Setup of module pop-before-smtp --- NEW FILE Makefile --- # Top level Makefile for module pop-before-smtp all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 7 07:22:57 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 7 Jan 2005 02:22:57 -0500 Subject: rpms/pop-before-smtp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501070722.j077Mve8011938@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/pop-before-smtp/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv11920/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pop-before-smtp --- NEW 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 Jan 7 07:23:26 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 7 Jan 2005 02:23:26 -0500 Subject: rpms/pop-before-smtp import.log,1.1,1.2 Message-ID: <200501070723.j077NQf7012068@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/pop-before-smtp In directory cvs.fedora.redhat.com:/tmp/cvs-serv12052 Modified Files: import.log Log Message: auto-import pop-before-smtp-1.36-1 on branch devel from pop-before-smtp-1.36-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pop-before-smtp/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 Jan 2005 07:22:55 -0000 1.1 +++ import.log 7 Jan 2005 07:23:24 -0000 1.2 @@ -0,0 +1 @@ +pop-before-smtp-1_36-1:HEAD:pop-before-smtp-1.36-1.src.rpm:1105082599 From fedora-extras-commits at redhat.com Fri Jan 7 07:23:27 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 7 Jan 2005 02:23:27 -0500 Subject: rpms/pop-before-smtp/devel pop-before-smtp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501070723.j077NRVv012071@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/pop-before-smtp/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv12052/devel Modified Files: .cvsignore sources Added Files: pop-before-smtp.spec Log Message: auto-import pop-before-smtp-1.36-1 on branch devel from pop-before-smtp-1.36-1.src.rpm --- NEW FILE pop-before-smtp.spec --- Summary: Watch log for POP/IMAP auth, notify MTA to allow relay Name: pop-before-smtp Version: 1.36 Release: 1 Source: http://download.sourceforge.net/sourceforge/popbsmtp/pop-before-smtp-1.36.tar.gz URL: http://popbsmtp.sourceforge.net/ License: GPL or Artistic Group: System Environment/Daemons BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Spam prevention requires preventing open relaying through email servers. However, legit users want to be able to relay. If legit users always stayed in one spot, they'd be easy to describe to the daemon. However, what with roving laptops, logins from home, etc., legit users refuse to stay in one spot. pop-before-smtp watches the mail log, looking for successful pop/imap logins, and posts the originating IP address into a database which can be checked by Postfix, to allow relaying for people who have recently downloaded their email. %prep %setup -q -n pop-before-smtp-1.36 %build echo Nothing to build... %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_initrddir} mkdir -p $RPM_BUILD_ROOT%{_sbindir} mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 install pop-before-smtp $RPM_BUILD_ROOT%{_sbindir} pod2man pop-before-smtp >$RPM_BUILD_ROOT%{_mandir}/man8/pop-before-smtp.8 2>/dev/null perl -i -e 'undef $/; $_ = <>; s/\n=head1.*\n=cut//s; print' $RPM_BUILD_ROOT%_sbindir}/pop-before-smtp install pop-before-smtp-conf.pl $RPM_BUILD_ROOT%{_sysconfdir} install pop-before-smtp.init $RPM_BUILD_ROOT%{_initrddir}/pop-before-smtp %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc README ChangeLog pop-before-smtp-conf.pl %doc contrib/README* %attr(0644,root,root) %{_mandir}/man8/pop-before-smtp.8* %attr(0755,root,root) %{_sbindir}/pop-before-smtp %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pop-before-smtp-conf.pl %attr(0755,root,root) %{_initrddir}/pop-before-smtp %post [ $1 = 1 ] || exit 0 /sbin/chkconfig --add pop-before-smtp %preun [ $1 = 0 ] || exit 0 /sbin/chkconfig --del pop-before-smtp %changelog * Thu Jan 06 2005 Warren Togami 1.36-1 - 1.36 * Tue May 11 2004 Warren Togami 1.35-1 - 1.35, remove some docs * Sat Feb 07 2004 Warren Togami 1.34-0.fdr.1 - Update to 1.34 * Tue Sep 02 2003 Warren Togami 1.34-0.fdr.0.1.cvs20030717 - Fedora * Fri Mar 28 2003 Wayne Davison - Modified for 1.33 * Sun Dec 15 2002 Wayne Davison - Modified for 1.32 * Sat Aug 31 2002 Wayne Davison - Modified for 1.31 * Fri Apr 12 2002 Wayne Davison - Modified for 1.30 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pop-before-smtp/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Jan 2005 07:22:55 -0000 1.1 +++ .cvsignore 7 Jan 2005 07:23:24 -0000 1.2 @@ -0,0 +1 @@ +pop-before-smtp-1.36.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/pop-before-smtp/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Jan 2005 07:22:55 -0000 1.1 +++ sources 7 Jan 2005 07:23:24 -0000 1.2 @@ -0,0 +1 @@ +f437144b4730072416459e4e51614759 pop-before-smtp-1.36.tar.gz From fedora-extras-commits at redhat.com Fri Jan 7 08:31:37 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 7 Jan 2005 03:31:37 -0500 Subject: rpms/rkhunter import.log,1.2,1.3 Message-ID: <200501070831.j078Vba9013263@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/rkhunter In directory cvs.fedora.redhat.com:/tmp/cvs-serv13254 Modified Files: import.log Log Message: auto-import rkhunter-1.1.9-1 on branch devel from rkhunter-1.1.9-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/rkhunter/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 8 Nov 2004 05:17:52 -0000 1.2 +++ import.log 7 Jan 2005 08:31:35 -0000 1.3 @@ -1 +1,2 @@ rkhunter-1_1_8-0_fdr_1:HEAD:rkhunter-1.1.8-0.fdr.1.src.rpm:1099891072 +rkhunter-1_1_9-1:HEAD:rkhunter-1.1.9-1.src.rpm:1105086718 From fedora-extras-commits at redhat.com Fri Jan 7 08:31:37 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 7 Jan 2005 03:31:37 -0500 Subject: rpms/rkhunter/devel rkhunter-1.1.9-0.fdr.1.src.md5, NONE, 1.1 rkhunter-1.1.9-app_check_default.patch, NONE, 1.1 rkhunter-1.1.9-prelink_cleanup.patch, NONE, 1.1 rkhunter-1.1.9-shared_man_search.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 rkhunter.spec, 1.2, 1.3 sources, 1.2, 1.3 rkhunter-1.1.8-0.fdr.1.src.md5, 1.1, NONE rkhunter-1.1.8-app_check_default.patch, 1.1, NONE rkhunter-1.1.8-prelink_cleanup.patch, 1.1, NONE rkhunter-1.1.8-shared_man_search.patch, 1.1, NONE Message-ID: <200501070831.j078VbQx013267@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/rkhunter/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv13254/devel Modified Files: .cvsignore rkhunter.spec sources Added Files: rkhunter-1.1.9-0.fdr.1.src.md5 rkhunter-1.1.9-app_check_default.patch rkhunter-1.1.9-prelink_cleanup.patch rkhunter-1.1.9-shared_man_search.patch Removed Files: rkhunter-1.1.8-0.fdr.1.src.md5 rkhunter-1.1.8-app_check_default.patch rkhunter-1.1.8-prelink_cleanup.patch rkhunter-1.1.8-shared_man_search.patch Log Message: auto-import rkhunter-1.1.9-1 on branch devel from rkhunter-1.1.9-1.src.rpm --- NEW FILE rkhunter-1.1.9-0.fdr.1.src.md5 --- 2e24806cb1267124fba6132009e30f1b ../SOURCES/rkhunter-1.1.9.tar.gz 0728cef20dde6817c36ef5787286b6f6 ../SOURCES/rkhunter-scan_on_boot-rc.local.tar.gz 22ad8521939744a7889d4fd8e6dad619 ../SOURCES/rkhunter-1.1.9-shared_man_search.patch b1525a7b472b96c669d6b7cd9048d6ed ../SOURCES/rkhunter-1.1.8-showfiles.patch a76e5bcece252676355fd97b791f1000 ../SOURCES/rkhunter-1.1.8-whitelist_dir-conf.patch 7d2857462a1555dff41b467d6272b35d ../SOURCES/rkhunter-1.1.9-app_check_default.patch 2559461d3064ee82eda4d227c40a21d9 ../SOURCES/rkhunter-1.1.9-prelink_cleanup.patch rkhunter-1.1.9-app_check_default.patch: --- NEW FILE rkhunter-1.1.9-app_check_default.patch --- --- files/rkhunter.orig 2004-12-28 12:45:21.000000000 -0500 +++ files/rkhunter 2004-12-31 13:53:16.000000000 -0500 @@ -49,7 +49,7 @@ # Skip passwd/group check PASSWDCHECK_SKIP=0 # Application check -APPLICATION_CHECK=1 +APPLICATION_CHECK=0 USE_PATCHED_SOFTWARE=0 @@ -186,6 +186,9 @@ shift ROOTDIR=$1 ;; + --run-application-check | --runapplicationcheck | --run-applicationcheck) + APPLICATION_CHECK=1 + ;; --scan-knownbad-files) PERFORMKNOWNBAD=1 ;; @@ -4957,7 +4960,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* : 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.1.9-prelink_cleanup.patch: --- NEW FILE rkhunter-1.1.9-prelink_cleanup.patch --- --- files/rkhunter.orig 2004-12-28 12:45:21.000000000 -0500 +++ files/rkhunter 2004-12-31 13:38:30.000000000 -0500 @@ -2304,6 +2304,8 @@ lastfile="${file}" done + + [ -f ${TMPDIR}/prelink.tst ] && rm -f ${TMPDIR}/prelink.tst if [ ${WARNING} -eq 1 ]; then displaytext "--------------------------------------------------------------------------------" rkhunter-1.1.9-shared_man_search.patch: --- NEW FILE rkhunter-1.1.9-shared_man_search.patch --- --- files/rkhunter.orig 2004-12-28 12:45:21.000000000 -0500 +++ files/rkhunter 2004-12-31 13:25:53.000000000 -0500 @@ -4127,7 +4127,7 @@ displaytext -n " Scanning for hidden files..." - SEARCHINDIRS="/dev /bin /usr /usr/man /usr/man/man1 /usr/man/man8 /usr/bin /usr/sbin /sbin /etc" + SEARCHINDIRS="/dev /bin /usr /usr/share/man /usr/share/man/man1 /usr/share/man/man8 /usr/bin /usr/sbin /sbin /etc" # Only reset status once STATUS=0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rkhunter/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:17:52 -0000 1.2 +++ .cvsignore 7 Jan 2005 08:31:35 -0000 1.3 @@ -1,2 +1,2 @@ -rkhunter-1.1.8.tar.gz rkhunter-scan_on_boot-rc.local.tar.gz +rkhunter-1.1.9.tar.gz Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/devel/rkhunter.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rkhunter.spec 10 Dec 2004 22:03:10 -0000 1.2 +++ rkhunter.spec 7 Jan 2005 08:31:35 -0000 1.3 @@ -4,7 +4,7 @@ AutoReqProv: no Name: rkhunter -Version: 1.1.8 +Version: 1.1.9 Release: 1 Epoch: 0 Summary: Rootkit Hunter scans for rootkits, backdoors and local exploits. @@ -12,14 +12,14 @@ Group: Applications/System License: GPL URL: http://www.rootkit.nl/ -Source0: http://downloads.rootkit.nl/rkhunter-1.1.8.tar.gz +Source0: http://downloads.rootkit.nl/rkhunter-1.1.9.tar.gz Source1: rkhunter-scan_on_boot-rc.local.tar.gz -Source2: rkhunter-1.1.8-0.fdr.1.src.md5 +Source2: rkhunter-1.1.9-0.fdr.1.src.md5 Patch1: rkhunter-1.1.8-whitelist_dir-conf.patch Patch2: rkhunter-1.1.8-showfiles.patch -Patch3: rkhunter-1.1.8-shared_man_search.patch -Patch4: rkhunter-1.1.8-app_check_default.patch -Patch5: rkhunter-1.1.8-prelink_cleanup.patch +Patch3: rkhunter-1.1.9-shared_man_search.patch +Patch4: rkhunter-1.1.9-app_check_default.patch +Patch5: rkhunter-1.1.9-prelink_cleanup.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -59,18 +59,21 @@ %{__perl} -pi.orig -e ' s|\@RKLIB\@|%{_libdir}/%{name}|g; - s|\@RCDIR\@|%{_sysconfdir}/rc.d|g; s|\@LGDIR\@|%{_localstatedir}/log|g; - ' rkhunter-scan_on_boot - -%{__perl} -pi.orig -e ' s|\@RCDIR\@|%{_sysconfdir}/rc.d|g; s|\@ITDIR\@|%{_initrddir}|g; s|\@SCDIR\@|%{_sysconfdir}/sysconfig|g; s|\@RKEXE\@|%{_bindir}/%{name}|g; - ' rkhunter-scan_on_boot-rc.local + ' rkhunter-scan_on_boot \ + rkhunter-scan_on_boot-rc.local + +%{__perl} -pi.orig -e ' + s|^#$|INSTALLDIR=%{_prefix}|; + s|^#(TMPDIR=).+$|$1%{_var}/%{name}/tmp|; + s|^#(DBDIR=).+$|$1%{_var}/%{name}/db|; + ' files/%{name}.conf -%patch1 -b .orig +%patch1 -b .0001 %patch2 -b .orig %patch3 -b .orig %patch4 -b .0001 @@ -86,16 +89,6 @@ " EOF -%{__cat} <<'EOF' >%{name}.conf -## Next three lines installed automatically by RPM. Do not change -## unless you know what you're doing... -INSTALLDIR=%{_prefix} -DBDIR=%{_var}/%{name}/db -TMPDIR=%{_var}/%{name}/tmp - -EOF -%{__cat} files/%{name}.conf >> %{name}.conf - %{__cat} <<'EOF' >01-%{name} #!/bin/sh %{_bindir}/%{name} --cronjob | /bin/mail -s '%{name} Daily Run' root @@ -143,7 +136,7 @@ %{__install} -m750 -p files/showfiles.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ %{__install} -m750 -p 01-%{name} ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/ %{__install} -m750 -p rkhunter-scan_on_boot-rc.local ${RPM_BUILD_ROOT}%{_libdir}/%{name}/rc.d/rc.local -%{__install} -m640 -p %{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/ +%{__install} -m640 -p files/%{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/ %{__install} -m640 -p %{name}.sysconfig ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name} @@ -151,7 +144,7 @@ %{__rm} -rf $RPM_BUILD_ROOT # Autoclean for rpmbuild -bb #cd .. -#%{__rm} -rf %{name} +#[ ! -d %{name} ] || %{__rm} -rf %{name} %postun @@ -179,6 +172,14 @@ %changelog +* Sun Jan 2 2005 Greg Houlette - 0:1.1.9-1 +- New package version release +- Added the --run-application-check command line option + to listing in command help +- Replaced 'Here' Doc editing of rkhunter.conf file + with in-place Perl edit +- tweaked rpmbuild -bb Autoclean + * Fri Oct 15 2004 Greg Houlette - 0:1.1.8-0.fdr.1 (revisited) - Removed redundant buildrequires /bin/sh, coreutils and perl - Revise postun scriptlet Index: sources =================================================================== RCS file: /cvs/extras/rpms/rkhunter/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:17:52 -0000 1.2 +++ sources 7 Jan 2005 08:31:35 -0000 1.3 @@ -1,2 +1,2 @@ -91cae6f04582fb0b27c96784ffe5adae rkhunter-1.1.8.tar.gz 0728cef20dde6817c36ef5787286b6f6 rkhunter-scan_on_boot-rc.local.tar.gz +2e24806cb1267124fba6132009e30f1b rkhunter-1.1.9.tar.gz --- rkhunter-1.1.8-0.fdr.1.src.md5 DELETED --- --- rkhunter-1.1.8-app_check_default.patch DELETED --- --- rkhunter-1.1.8-prelink_cleanup.patch DELETED --- --- rkhunter-1.1.8-shared_man_search.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jan 7 19:55:22 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 7 Jan 2005 14:55:22 -0500 Subject: rpms/pcsc-lite - New directory Message-ID: <200501071955.j07JtMKG022852@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-lite In directory cvs.fedora.redhat.com:/tmp/cvs-serv22843/pcsc-lite Log Message: Directory /cvs/extras/rpms/pcsc-lite added to the repository From fedora-extras-commits at redhat.com Fri Jan 7 19:55:22 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 7 Jan 2005 14:55:22 -0500 Subject: rpms/pcsc-lite/devel - New directory Message-ID: <200501071955.j07JtMCi022855@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-lite/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22843/pcsc-lite/devel Log Message: Directory /cvs/extras/rpms/pcsc-lite/devel added to the repository From fedora-extras-commits at redhat.com Fri Jan 7 19:55:41 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 7 Jan 2005 14:55:41 -0500 Subject: rpms/pcsc-lite Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501071955.j07JtfTC022918@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-lite In directory cvs.fedora.redhat.com:/tmp/cvs-serv22907 Added Files: Makefile import.log Log Message: Setup of module pcsc-lite --- NEW FILE Makefile --- # Top level Makefile for module pcsc-lite all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Jan 7 19:55:41 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 7 Jan 2005 14:55:41 -0500 Subject: rpms/pcsc-lite/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501071955.j07Jtfg5022921@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-lite/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22907/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pcsc-lite --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jan 7 19:57:20 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 7 Jan 2005 14:57:20 -0500 Subject: rpms/pcsc-lite import.log,1.1,1.2 Message-ID: <200501071957.j07JvK0G023035@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-lite In directory cvs.fedora.redhat.com:/tmp/cvs-serv23026 Modified Files: import.log Log Message: auto-import pcsc-lite-1.2.0-10 on branch devel from pcsc-lite-1.2.0-10.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pcsc-lite/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 Jan 2005 19:55:39 -0000 1.1 +++ import.log 7 Jan 2005 19:57:18 -0000 1.2 @@ -0,0 +1 @@ +pcsc-lite-1_2_0-10:HEAD:pcsc-lite-1.2.0-10.src.rpm:1105127825 From fedora-extras-commits at redhat.com Fri Jan 7 19:57:20 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 7 Jan 2005 14:57:20 -0500 Subject: rpms/pcsc-lite/devel pcsc-lite-docinst.patch, NONE, 1.1 pcsc-lite-pcscd.init, NONE, 1.1 pcsc-lite-update-reader.conf, NONE, 1.1 pcsc-lite.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501071957.j07JvKsa023041@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-lite/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv23026/devel Modified Files: .cvsignore sources Added Files: pcsc-lite-docinst.patch pcsc-lite-pcscd.init pcsc-lite-update-reader.conf pcsc-lite.spec Log Message: auto-import pcsc-lite-1.2.0-10 on branch devel from pcsc-lite-1.2.0-10.src.rpm pcsc-lite-docinst.patch: --- NEW FILE pcsc-lite-docinst.patch --- --- doc/Makefile.in 2003-05-31 00:24:32.000000000 +0300 +++ doc/Makefile.in 2003-06-01 15:43:17.000000000 +0300 @@ -390,7 +390,7 @@ info-am: -install-data-am: install-dataDATA install-man +install-data-am: install-man install-exec-am: --- NEW FILE pcsc-lite-pcscd.init --- #!/bin/sh # # pcscd Starts the pcscd Daemon # # chkconfig: 2345 25 88 # description: The PC/SC smart card daemon is a resource manager for the \ # PC/SC lite and Musclecard frameworks. It coordinates \ # communications with smart card readers, smart cards, and \ # cryptographic tokens that are connected to the system. # # processname: pcscd # pidfile: __LOCALSTATEDIR__/run/pcscd.pid # config: __SYSCONFDIR__/reader.conf # # Note! pcscd should be started after pcmcia, and shut down before it # for smooth experience with PCMCIA readers. . __INITRDDIR__/functions umask 077 exec=__SBINDIR__/pcscd prog=$(basename $exec) lockfile=__LOCALSTATEDIR__/lock/subsys/$prog start() { echo -n $"Starting PC/SC smart card daemon ($prog): " __SBINDIR__/update-reader.conf && daemon $prog retval=$? echo [ $retval -eq 0 ] && touch $lockfile return $retval } stop() { echo -n $"Stopping PC/SC smart card daemon ($prog): " killproc $prog retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile return $retval } restart() { stop start } case "$1" in start|stop|restart) $1 ;; reload|force-reload) restart ;; status) status $prog ;; condrestart|try-restart) [ ! -f $lockfile ] || restart ;; *) echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}" exit 2 esac --- NEW FILE pcsc-lite-update-reader.conf --- #!/bin/sh # Merge all reader config file snippets for pcsc-lite from a reader.conf.d # directory into a reader.conf. CONF=__SYSCONFDIR__/reader.conf CONFDIR=__SYSCONFDIR__/reader.conf.d umask 0022 set -e trap cleanup EXIT cleanup() { test -z "$tmpfile" || rm -f "$tmpfile" } tmpfile=`mktemp /tmp/reader.conf.XXXXXX` cat > "$tmpfile" </dev/null` ; do echo "# $f" >> "$tmpfile" cat "$f" >> "$tmpfile" echo >> "$tmpfile" done echo "# End of file" >> "$tmpfile" cat "$tmpfile" > "$CONF" --- NEW FILE pcsc-lite.spec --- Name: pcsc-lite Version: 1.2.0 Release: 10 Epoch: 0 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/pcsc-lite-1.2.0.tar.gz Source1: %{name}-pcscd.init Source2: %{name}-update-reader.conf Patch0: %{name}-docinst.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{__perl}, flex, libusb-devel >= 0:0.1.6 Requires: chkconfig, pcsc-ifd-handler %description The purpose of PC/SC Lite is to provide a Windows(R) SCard interface in a very small form factor for communicating to smartcards and readers. PC/SC Lite uses the same winscard API as used under Windows(R). This package includes the PC/SC Lite daemon, a resource manager that coordinates communications with smart card readers and smart cards that are connected to the system, as well as other command line tools. %package libs Summary: PC/SC Lite libraries Group: System Environment/Libraries Provides: libpcsc-lite = %{epoch}:%{version}-%{release} Provides: libmusclecard = %{epoch}:%{version}-%{release} %description libs PC/SC Lite libraries. %package devel Summary: PC/SC Lite development files Group: Development/Libraries Requires: %{name}-libs = %{epoch}:%{version}-%{release}, pkgconfig Provides: libpcsc-lite-devel = %{epoch}:%{version}-%{release} Provides: libmusclecard-devel = %{epoch}:%{version}-%{release} %description devel PC/SC Lite development files. %prep %setup -q %patch0 -p0 %{__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 %build %configure \ --disable-dependency-tracking \ --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} %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 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}/ %clean rm -rf $RPM_BUILD_ROOT %post /sbin/chkconfig --add pcscd %preun if [ $1 -eq 0 ] ; then %{_initrddir}/pcscd stop >/dev/null || : /sbin/chkconfig --del pcscd fi %postun [ $1 -gt 0 ] && %{_initrddir}/pcscd try-restart >/dev/null || : %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog* COPYING DRIVERS HELP NEWS README SECURITY %dir %{_sysconfdir}/reader.conf.d %{_sysconfdir}/reader.conf.d/README %ghost %config %{_sysconfdir}/reader.conf %config %{_initrddir}/pcscd %{_bindir}/bundleTool %{_bindir}/formaticc %{_bindir}/installifd %exclude %{_bindir}/pcsc_demo %{_sbindir}/pcscd %{_sbindir}/update-reader.conf %{_libdir}/pcsc %{_mandir}/man[18]/*.[18]* %files libs %defattr(-,root,root,-) %{_libdir}/lib*.so.* %files devel %defattr(-,root,root,-) %doc doc/*.pdf doc/example/pcsc_demo.c %{_includedir}/*.h %{_libdir}/lib*.so %{_libdir}/lib*.a %exclude %{_libdir}/lib*.la %{_libdir}/pkgconfig/lib*.pc %changelog * Tue Aug 17 2004 Ville Skytt?? - 0:1.2.0-10 - Disable dependency tracking to speed up the build. - Drop reader.conf patch, it's not needed any more. - Rename update-reader-conf to update-reader.conf for consistency with Debian, and improve it a bit. * Sat Jul 31 2004 Ville Skytt?? - 0:1.2.0-0.fdr.9 - Add update-reader-conf, thanks to Fritz Elfert. * Thu Jul 1 2004 Ville Skytt?? - 0:1.2.0-0.fdr.8 - Own the %%{_libdir}/pcsc hierarchy. * Thu May 13 2004 Ville Skytt?? - 0:1.2.0-0.fdr.7 - Make main package require pcsc-ifd-handler (idea from Debian). * Wed May 12 2004 Ville Skytt?? - 0:1.2.0-0.fdr.6 - Improve package summary. - Improvements based on suggestions from Ludovic Rousseau: - Don't install pcsc_demo but do include its source in -devel. - Sync reader.conf with current upstream CVS HEAD (better docs, less intrusive in USB-only setups where it's not needed). * Fri Apr 16 2004 Ville Skytt?? - 0:1.2.0-0.fdr.5 - Move PDF API docs to -devel. - Improve main package and init script descriptions. * Thu Jan 29 2004 Ville Skytt?? - 0:1.2.0-0.fdr.4 - Init script fine tuning. * Fri Jan 9 2004 Ville Skytt?? - 0:1.2.0-0.fdr.3 - BuildRequires libusb-devel 0.1.6 or newer. * Thu Oct 30 2003 Ville Skytt?? - 0:1.2.0-0.fdr.2 - s/pkgconfi/pkgconfig/ in -devel requirements. * Tue Oct 28 2003 Ville Skytt?? - 0:1.2.0-0.fdr.1 - Update to 1.2.0. - Add libpcsc-lite and libmusclecard provides to -libs and -devel. * Thu Oct 16 2003 Ville Skytt?? - 0:1.2.0-0.fdr.0.2.rc3 - Update to 1.2.0-rc3. - Trivial init script improvements. - Enable %%{_smp_mflags}. - Don't bother trying to enable SCF. * Sun Sep 14 2003 Ville Skytt?? - 0:1.2.0-0.fdr.0.2.rc2 - Specfile cleanups. * Fri Sep 5 2003 Ville Skytt?? - 0:1.2.0-0.fdr.0.1.rc2 - Update to 1.2.0-rc2. * Wed Aug 27 2003 Ville Skytt?? - 0:1.2.0-0.fdr.0.1.rc1 - Update to 1.2.0-rc1. * Sun Jun 1 2003 Ville Skytt?? - 0:1.1.2-0.fdr.0.1.beta5 - Update to 1.1.2beta5. * Sat May 24 2003 Ville Skytt?? - 0:1.1.2-0.fdr.0.1.beta4 - First build, based on PLD's 1.1.1-2. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcsc-lite/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Jan 2005 19:55:39 -0000 1.1 +++ .cvsignore 7 Jan 2005 19:57:18 -0000 1.2 @@ -0,0 +1 @@ +pcsc-lite-1.2.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcsc-lite/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Jan 2005 19:55:39 -0000 1.1 +++ sources 7 Jan 2005 19:57:18 -0000 1.2 @@ -0,0 +1 @@ +98456d274b2f4bfe74c5ab59070f8d50 pcsc-lite-1.2.0.tar.gz From fedora-extras-commits at redhat.com Fri Jan 7 20:14:56 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 7 Jan 2005 15:14:56 -0500 Subject: rpms/pcsc-perl - New directory Message-ID: <200501072014.j07KEucY023786@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-perl In directory cvs.fedora.redhat.com:/tmp/cvs-serv23779/pcsc-perl Log Message: Directory /cvs/extras/rpms/pcsc-perl added to the repository From fedora-extras-commits at redhat.com Fri Jan 7 20:14:56 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 7 Jan 2005 15:14:56 -0500 Subject: rpms/pcsc-perl/devel - New directory Message-ID: <200501072014.j07KEuBu023789@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-perl/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv23779/pcsc-perl/devel Log Message: Directory /cvs/extras/rpms/pcsc-perl/devel added to the repository From fedora-extras-commits at redhat.com Fri Jan 7 20:15:14 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 7 Jan 2005 15:15:14 -0500 Subject: rpms/pcsc-perl Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501072015.j07KFEsp023848@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-perl In directory cvs.fedora.redhat.com:/tmp/cvs-serv23839 Added Files: Makefile import.log Log Message: Setup of module pcsc-perl --- NEW FILE Makefile --- # Top level Makefile for module pcsc-perl all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Jan 7 20:15:14 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 7 Jan 2005 15:15:14 -0500 Subject: rpms/pcsc-perl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501072015.j07KFEic023851@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-perl/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv23839/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pcsc-perl --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jan 7 20:15:48 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 7 Jan 2005 15:15:48 -0500 Subject: rpms/pcsc-perl import.log,1.1,1.2 Message-ID: <200501072015.j07KFmCN023944@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-perl In directory cvs.fedora.redhat.com:/tmp/cvs-serv23935 Modified Files: import.log Log Message: auto-import pcsc-perl-1.3.1-4 on branch devel from pcsc-perl-1.3.1-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pcsc-perl/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 Jan 2005 20:15:12 -0000 1.1 +++ import.log 7 Jan 2005 20:15:46 -0000 1.2 @@ -0,0 +1 @@ +pcsc-perl-1_3_1-4:HEAD:pcsc-perl-1.3.1-4.src.rpm:1105128940 From fedora-extras-commits at redhat.com Fri Jan 7 20:15:48 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 7 Jan 2005 15:15:48 -0500 Subject: rpms/pcsc-perl/devel pcsc-perl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501072015.j07KFmDP023948@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-perl/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv23935/devel Modified Files: .cvsignore sources Added Files: pcsc-perl.spec Log Message: auto-import pcsc-perl-1.3.1-4 on branch devel from pcsc-perl-1.3.1-4.src.rpm --- NEW FILE pcsc-perl.spec --- %define pcscver %(rpm -q --qf %%{epoch}:%%{version} pcsc-lite-libs) %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} Name: pcsc-perl Version: 1.3.1 Release: 4 Epoch: 0 Summary: Perl interface to the PC/SC smart card library Group: Development/Libraries License: GPL URL: http://ludovic.rousseau.free.fr/softwares/pcsc-perl/ Source0: http://ludovic.rousseau.free.fr/softwares/pcsc-perl/pcsc-perl-1.3.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl >= 1:5.6.1, pcsc-lite-devel Requires: pcsc-lite-libs = %{pcscver} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This package contains a Perl interface to the PC/SC smart card library. %prep %setup -q chmod 644 examples/* # avoid dependencies %build CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor INC= \ DEFINE=-Wall make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS" %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 || : # skipping tests %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changelog LICENCE README examples %{perl_vendorarch}/auto/Chipcard %{perl_vendorarch}/Chipcard %{_mandir}/man3/*.3* %changelog * Fri Jan 7 2005 Ville Skytt?? - 0:1.3.1-4 - Honor $RPM_OPT_FLAGS, remove (some) extra include dirs from build (#1281). - Improve summary and description. * Wed May 12 2004 Ville Skytt?? - 0:1.3.1-0.fdr.3 - BuildRequire perl >= 1:5.6.1 for vendor install dir support. - Use pure_install to avoid perllocal.pod workarounds. * Sun Apr 25 2004 Ville Skytt?? - 0:1.3.1-0.fdr.2 - Require perl(:MODULE_COMPAT_*). * Fri Apr 2 2004 Ville Skytt?? - 0:1.3.1-0.fdr.1 - Update to 1.3.1. * Sun Feb 8 2004 Ville Skytt?? - 0:1.3.0-0.fdr.2 - Reduce directory ownership bloat. * Wed Dec 17 2003 Ville Skytt?? - 0:1.3.0-0.fdr.1 - Update to 1.3.0. * Sun Sep 14 2003 Ville Skytt?? - 0:1.2.2-0.fdr.4 - More spec cleanups. * Wed Aug 27 2003 Ville Skytt?? - 0:1.2.2-0.fdr.3 - Spec cleanups, install into vendor dirs. * Fri Jul 4 2003 Ville Skytt?? - 0:1.2.2-0.fdr.2 - Fix dir ownerships, non-root strip during build. * Thu May 29 2003 Ville Skytt?? - 0:1.2.2-0.fdr.1 - Update to 1.2.2. - Drop patch and hacks, already applied/fixed upstream. * Sun May 25 2003 Ville Skytt?? - 0:1.2.1-0.fdr.1 - Update to 1.2.1. - Fix build and runtime dependencies. * Thu May 22 2003 Ville Skytt?? - 0:1.2.0-0.fdr.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcsc-perl/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Jan 2005 20:15:12 -0000 1.1 +++ .cvsignore 7 Jan 2005 20:15:46 -0000 1.2 @@ -0,0 +1 @@ +pcsc-perl-1.3.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcsc-perl/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Jan 2005 20:15:12 -0000 1.1 +++ sources 7 Jan 2005 20:15:46 -0000 1.2 @@ -0,0 +1 @@ +4c1869b5b726f7ab5b1bda88b390c821 pcsc-perl-1.3.1.tar.gz From fedora-extras-commits at redhat.com Fri Jan 7 22:06:38 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 7 Jan 2005 17:06:38 -0500 Subject: rpms/tpctl/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 tpctl.spec, 1.5, 1.6 tpctl-4.8-alt-cli.patch, 1.1, NONE Message-ID: <200501072206.j07M6ciF025441@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/tpctl/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25435 Modified Files: .cvsignore sources tpctl.spec Removed Files: tpctl-4.8-alt-cli.patch Log Message: Vanity update to 4.16. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tpctl/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Nov 2004 17:05:11 -0000 1.4 +++ .cvsignore 7 Jan 2005 22:06:36 -0000 1.5 @@ -1,2 +1 @@ -tpctl_4.14.tar.gz -tpctl_4.15.tar.gz +tpctl_4.16.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tpctl/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Nov 2004 17:05:11 -0000 1.4 +++ sources 7 Jan 2005 22:06:36 -0000 1.5 @@ -1 +1 @@ -d8d84c592dfae6f53cf43824c0c78506 tpctl_4.15.tar.gz +03afcfdd58a97693263ddcec80582fe0 tpctl_4.16.tar.gz Index: tpctl.spec =================================================================== RCS file: /cvs/extras/rpms/tpctl/devel/tpctl.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- tpctl.spec 27 Nov 2004 17:05:11 -0000 1.5 +++ tpctl.spec 7 Jan 2005 22:06:36 -0000 1.6 @@ -1,5 +1,5 @@ Name: tpctl -Version: 4.15 +Version: 4.16 Release: 1 Epoch: 0 Summary: IBM ThinkPad configuration tools @@ -7,11 +7,10 @@ Group: System Environment/Base License: GPL URL: http://tpctl.sourceforge.net/ -Source0: http://download.sourceforge.net/tpctl/tpctl_4.15.tar.gz +Source0: http://download.sourceforge.net/tpctl/tpctl_4.16.tar.gz Source1: %{name}.apmiser.init Patch0: %{name}-rpm.patch Patch1: %{name}-optflags.patch -Patch2: %{name}-4.8-alt-cli.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(id -u -n) BuildRequires: ncurses-devel, libtool @@ -36,7 +35,6 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 cp -p tpctlir/README README.tpctlir @@ -97,6 +95,9 @@ %changelog +* Fri Jan 7 2005 Ville Skytt?? - 0:4.16-1 +- Update to 4.16, tpctlir patch applied upstream. + * Sat Nov 27 2004 Ville Skytt?? - 0:4.15-1 - Vanity update to 4.15, only changelog changed. - Apply tpctlir patch from ALT Linux's tpctl-4.15-alt1, always build it --- tpctl-4.8-alt-cli.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jan 8 06:24:02 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 8 Jan 2005 01:24:02 -0500 Subject: rpms/TeXmacs import.log,1.4,1.5 Message-ID: <200501080624.j086O2Nu031576@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/TeXmacs In directory cvs.fedora.redhat.com:/tmp/cvs-serv31566 Modified Files: import.log Log Message: auto-import TeXmacs-1.0.4.4-1 on branch devel from TeXmacs-1.0.4.4-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 8 Nov 2004 03:59:46 -0000 1.4 +++ import.log 8 Jan 2005 06:24:00 -0000 1.5 @@ -1,3 +1,4 @@ TeXmacs-1_0_2_9-0_fdr_1_rh80:HEAD:TeXmacs-1.0.2.9-0.fdr.1.rh80.src.rpm:1099886373 TeXmacs-1_0_3_7-0_fdr_1_1:HEAD:TeXmacs-1.0.3.7-0.fdr.1.1.src.rpm:1099886379 TeXmacs-1_0_3_7-0_fdr_1_2:HEAD:TeXmacs-1.0.3.7-0.fdr.1.2.src.rpm:1099886386 +TeXmacs-1_0_4_4-1:HEAD:TeXmacs-1.0.4.4-1.src.rpm:1105165464 From fedora-extras-commits at redhat.com Sat Jan 8 06:24:02 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 8 Jan 2005 01:24:02 -0500 Subject: rpms/TeXmacs/devel .cvsignore, 1.3, 1.4 TeXmacs.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200501080624.j086O2ca031580@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/TeXmacs/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv31566/devel Modified Files: .cvsignore TeXmacs.spec sources Log Message: auto-import TeXmacs-1.0.4.4-1 on branch devel from TeXmacs-1.0.4.4-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 03:59:39 -0000 1.3 +++ .cvsignore 8 Jan 2005 06:24:00 -0000 1.4 @@ -1 +1 @@ -TeXmacs-1.0.3.7-src.tar.gz +TeXmacs-1.0.4.4-src.tar.gz Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- TeXmacs.spec 8 Nov 2004 03:59:46 -0000 1.3 +++ TeXmacs.spec 8 Jan 2005 06:24:00 -0000 1.4 @@ -1,16 +1,17 @@ Name: TeXmacs -Version: 1.0.3.7 -Release: 0.fdr.1.2 +Version: 1.0.4.4 +Release: 1 Epoch: 0 Summary: A structured wysiwyg scientific text editor Group: Applications/Editors License: GPL URL: http://www.texmacs.org -Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.3.7-src.tar.gz +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.4.4-src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tetex, tetex-fonts, ghostscript Buildrequires: guile-devel, desktop-file-utils, tetex, freetype-devel, XFree86-devel +Requires(post,postun): shared-mime-info, desktop-file-utils %description GNU TeXmacs is a free scientific text editor, which was both inspired @@ -46,7 +47,6 @@ cp -r -f $GUILE_LOAD_PATH $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs chmod -f 644 $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs/ice-9/* chmod -f 755 $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs/ice-9 -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications mkdir -p $RPM_BUILD_ROOT%{_datadir}/application-registry mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime-info mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps @@ -55,6 +55,19 @@ cp $RPM_BUILD_ROOT%{_datadir}/TeXmacs/misc/mime/texmacs.mime $RPM_BUILD_ROOT%{_datadir}/mime-info cp $RPM_BUILD_ROOT%{_datadir}/TeXmacs/misc/pixmaps/TeXmacs.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps rm -fr $RPM_BUILD_ROOT%{_datadir}/TeXmacs/misc/mime + +mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime/packages +cat > $RPM_BUILD_ROOT%{_datadir}/mime/packages/texmacs.xml < + + + TeXmacs document + + + + +EOF + cat > texmacs.desktop < /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 %defattr(-,root,root,-) %{_bindir}/* @@ -87,13 +114,34 @@ %{_datadir}/applications/* %{_datadir}/application-registry/* %{_datadir}/mime-info/* +%{_datadir}/mime/packages/* %{_datadir}/pixmaps/* +%{_datadir}/icons/gnome/48x48/mimetypes/gnome-mime-text-texmacs.xpm %doc LICENSE COPYING TeXmacs/README TeXmacs/TEX_FONTS %clean rm -rf $RPM_BUILD_ROOT %changelog +* Mon Nov 15 2004 Gerard Milmeister - 0:1.0.4.4-1 +- New Version 1.0.4.4 +- Added support for new mime system + +* Sun Oct 24 2004 Gerard Milmeister - 0:1.0.4.3-0.fdr.1 +- New Version 1.0.4.3 + +* Tue Aug 31 2004 Gerard Milmeister - 0:1.0.4.2-0.fdr.1 +- New Version 1.0.4.2 + +* Mon Aug 9 2004 Gerard Milmeister - 0:1.0.4.1-0.fdr.1 +- New Version 1.0.4.1 + +* Sat Jul 17 2004 Gerard Milmeister - 0:1.0.3.11-0.fdr.1 +- New Version 1.0.3.11 + +* Sun May 23 2004 Gerard Milmeister - 0:1.0.3.9-0.fdr.1 +- New Version 1.0.3.9 + * Sun Apr 4 2004 Gerard Milmeister - 0:1.0.3.6-0.fdr.1 - New Version 1.0.3.6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 03:59:39 -0000 1.3 +++ sources 8 Jan 2005 06:24:00 -0000 1.4 @@ -1 +1 @@ -130ad369d12c96b50235e28f375f6ec0 TeXmacs-1.0.3.7-src.tar.gz +5212c0850a8d6308e8629b75a1f954b5 TeXmacs-1.0.4.4-src.tar.gz From fedora-extras-commits at redhat.com Sat Jan 8 06:27:07 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 8 Jan 2005 01:27:07 -0500 Subject: rpms/xtide import.log,1.4,1.5 Message-ID: <200501080627.j086R7iP031711@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/xtide In directory cvs.fedora.redhat.com:/tmp/cvs-serv31702 Modified Files: import.log Log Message: auto-import xtide-2.8-1 on branch devel from xtide-2.8-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xtide/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 8 Nov 2004 05:36:44 -0000 1.4 +++ import.log 8 Jan 2005 06:27:05 -0000 1.5 @@ -1,3 +1,4 @@ xtide-2_6_4-0_fdr_4_rh90:HEAD:xtide-2.6.4-0.fdr.4.rh90.src.rpm:1099892179 xtide-2_6_4-0_fdr_4_1:HEAD:xtide-2.6.4-0.fdr.4.1.src.rpm:1099892198 xtide-2_6_4-0_fdr_4_2:HEAD:xtide-2.6.4-0.fdr.4.2.src.rpm:1099892204 +xtide-2_8-1:HEAD:xtide-2.8-1.src.rpm:1105165649 From fedora-extras-commits at redhat.com Sat Jan 8 06:27:07 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 8 Jan 2005 01:27:07 -0500 Subject: rpms/xtide/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xtide.spec, 1.4, 1.5 xtide-2.6.4.patch, 1.1, NONE Message-ID: <200501080627.j086R7ps031715@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/xtide/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv31702/devel Modified Files: .cvsignore sources xtide.spec Removed Files: xtide-2.6.4.patch Log Message: auto-import xtide-2.8-1 on branch devel from xtide-2.8-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xtide/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:36:19 -0000 1.2 +++ .cvsignore 8 Jan 2005 06:27:05 -0000 1.3 @@ -1,2 +1,2 @@ -harmonics.tcd.gz -xtide-2.6.4.tar.gz +harmonics-dwf-2004-12-10-v2.tcd.gz +xtide-2.8.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xtide/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:36:19 -0000 1.2 +++ sources 8 Jan 2005 06:27:05 -0000 1.3 @@ -1,2 +1,2 @@ -d632604083928ab97deacfab76c2d50e harmonics.tcd.gz -6b0d5f99586a6356dbfa498629d8f793 xtide-2.6.4.tar.gz +cc55cdf906c9cb5e7938731391f486e0 harmonics-dwf-2004-12-10-v2.tcd.gz +17e34e7d7fc1dcf7b564b2970f821d0e xtide-2.8.tar.gz Index: xtide.spec =================================================================== RCS file: /cvs/extras/rpms/xtide/devel/xtide.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xtide.spec 10 Dec 2004 22:03:13 -0000 1.4 +++ xtide.spec 8 Jan 2005 06:27:05 -0000 1.5 @@ -1,17 +1,16 @@ Summary: A program for calculating tide all over the world Name: xtide -Version: 2.6.4 -Release: 4 +Version: 2.8 +Release: 1 Epoch: 0 URL: http://www.flaterco.com/xtide/ Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.gz -Source1: ftp://harmonics.unh.edu/xtide/harmonics.tcd.gz +Source1: ftp://ftp.flaterco.com/xtide/harmonics-dwf-2004-12-10-v2.tcd.gz Source2: %{name}.desktop -Patch0: %{name}-%{version}.patch +#Patch0: %{name}-%{version}.patch License: GPL Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# BuildRequires: wget BuildRequires: libpng-devel BuildRequires: XFree86-devel BuildRequires: zlib-devel @@ -58,23 +57,19 @@ %prep %setup -q -T -b 0 -%patch -p1 -b .buildroot +#%patch -p1 -b .buildroot cp %{SOURCE1} ./ cp %{SOURCE2} ./ %build %configure -# Generates xml parsing routines. Requires bison and flex. -./do_xml.sh - make %{?_smp_mflags} -# # Get harmonics file -# wget ftp://anonymous:$USER%40$HOSTNAME at harmonics.unh.edu/xtide/harmonics.tcd.gz - # Unzip harmonics file -gunzip harmonics.tcd.gz +gunzip harmonics-dwf-2004-12-10-v2.tcd.gz + +echo "%{_datadir}/%{name}/harmonics-dwf-2004-12-10-v2.tcd" > %{name}.conf %install rm -rf $RPM_BUILD_ROOT @@ -83,11 +78,11 @@ # Install harmonics file. mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name} -cp harmonics.tcd ${RPM_BUILD_ROOT}%{_datadir}/%{name}/ +install -m 644 harmonics-dwf-2004-12-10-v2.tcd ${RPM_BUILD_ROOT}%{_datadir}/%{name}/ # Add configuration file mkdir ${RPM_BUILD_ROOT}%{_sysconfdir} -echo "%{_datadir}/%{name}/harmonics.tcd" > ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}.conf +install -m 644 %{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}.conf # Add desktop entry mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications @@ -112,7 +107,7 @@ %dir %{_datadir}/%{name} # TCD file -%config(missingok) %{_datadir}/%{name}/harmonics.tcd +%config(missingok) %{_datadir}/%{name}/harmonics-dwf-2004-12-10-v2.tcd # Config file %config(noreplace) %{_sysconfdir}/* @@ -125,6 +120,11 @@ %{_sbindir}/* %changelog +* Wed Dec 15 2004 David M. Kaplan 0:2.8-1 +- Updated to version 2.8 +- Cleaned up spec file because much of the tricks to get it to work + are no longer necessary. + * Mon Dec 8 2003 David M. Kaplan 0:2.6.4-0.fdr.4 - Removed 644 permissions. --- xtide-2.6.4.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jan 8 23:07:02 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 8 Jan 2005 18:07:02 -0500 Subject: rpms/xtide import.log,1.5,1.6 Message-ID: <200501082307.j08N727W017159@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/xtide In directory cvs.fedora.redhat.com:/tmp/cvs-serv17150 Modified Files: import.log Log Message: auto-import xtide-2.8-2 on branch devel from xtide-2.8-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xtide/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 8 Jan 2005 06:27:05 -0000 1.5 +++ import.log 8 Jan 2005 23:07:00 -0000 1.6 @@ -2,3 +2,4 @@ xtide-2_6_4-0_fdr_4_1:HEAD:xtide-2.6.4-0.fdr.4.1.src.rpm:1099892198 xtide-2_6_4-0_fdr_4_2:HEAD:xtide-2.6.4-0.fdr.4.2.src.rpm:1099892204 xtide-2_8-1:HEAD:xtide-2.8-1.src.rpm:1105165649 +xtide-2_8-2:HEAD:xtide-2.8-2.src.rpm:1105225646 From fedora-extras-commits at redhat.com Sat Jan 8 23:07:02 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 8 Jan 2005 18:07:02 -0500 Subject: rpms/xtide/devel xtide-2.8.for_x86_64.patch, NONE, 1.1 xtide.spec, 1.5, 1.6 Message-ID: <200501082307.j08N72jv017163@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/xtide/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17150/devel Modified Files: xtide.spec Added Files: xtide-2.8.for_x86_64.patch Log Message: auto-import xtide-2.8-2 on branch devel from xtide-2.8-2.src.rpm xtide-2.8.for_x86_64.patch: --- NEW FILE xtide-2.8.for_x86_64.patch --- diff -Naur xtide-2.8.orig/Makefile.in xtide-2.8/Makefile.in --- xtide-2.8.orig/Makefile.in 2004-12-17 18:21:28.000000000 -0800 +++ xtide-2.8/Makefile.in 2004-12-17 18:14:39.000000000 -0800 @@ -15,7 +15,7 @@ CXX = @CXX@ CC = @CC@ CXXFLAGS = @extracxxflags@ @DEFS@ -I at includedir@ -Ilibtcd -I$(XROOT)/include @normalcxxflags@ -c -LDFLAGS = @extraldflags@ -L at libdir@ -L$(XROOT)/lib @normalldflags@ -o +LDFLAGS = @extraldflags@ -L at libdir@ -L$(XROOT)/lib64 @normalldflags@ -o # Extra switches and libs determined by configure.in extraswitches=@extraswitches@ diff -Naur xtide-2.8.orig/configure xtide-2.8/configure --- xtide-2.8.orig/configure 2004-12-17 18:21:28.000000000 -0800 +++ xtide-2.8/configure 2004-12-17 18:23:57.000000000 -0800 @@ -2602,6 +2602,12 @@ break fi done +for dir in "/usr/X11R6" "/usr/openwin" "/usr/contrib/X11R6" "/usr"; do + if test -r "$dir/lib64/libXaw.so" -o -r "$dir/lib64/libXaw.a" -o -r "$dir/lib64/libXaw.dll.a"; then + xroot="$dir" + break + fi +done echo "$as_me:$LINENO: result: $xroot" >&5 echo "${ECHO_T}$xroot" >&6 if test "$xroot" = "NOT FOUND"; then diff -Naur xtide-2.8.orig/configure.in xtide-2.8/configure.in --- xtide-2.8.orig/configure.in 2004-12-17 18:21:28.000000000 -0800 +++ xtide-2.8/configure.in 2004-12-17 18:19:50.000000000 -0800 @@ -54,6 +54,12 @@ break fi done +for dir in "/usr/X11R6" "/usr/openwin" "/usr/contrib/X11R6" "/usr"; do + if test -r "$dir/lib64/libXaw.so" -o -r "$dir/lib64/libXaw.a" -o -r "$dir/lib64/libXaw.dll.a"; then + xroot="$dir" + break + fi +done AC_MSG_RESULT($xroot) if test "$xroot" = "NOT FOUND"; then AC_MSG_WARN(Type 'make tide' or 'make xttpd' to compile without X11.) Index: xtide.spec =================================================================== RCS file: /cvs/extras/rpms/xtide/devel/xtide.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xtide.spec 8 Jan 2005 06:27:05 -0000 1.5 +++ xtide.spec 8 Jan 2005 23:07:00 -0000 1.6 @@ -1,13 +1,13 @@ Summary: A program for calculating tide all over the world Name: xtide Version: 2.8 -Release: 1 +Release: 2 Epoch: 0 URL: http://www.flaterco.com/xtide/ Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.gz Source1: ftp://ftp.flaterco.com/xtide/harmonics-dwf-2004-12-10-v2.tcd.gz Source2: %{name}.desktop -#Patch0: %{name}-%{version}.patch +Patch0: %{name}-%{version}.for_x86_64.patch License: GPL Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -57,7 +57,11 @@ %prep %setup -q -T -b 0 -#%patch -p1 -b .buildroot + +%ifarch x86_64 +%patch0 -p1 -b .buildroot +%endif + cp %{SOURCE1} ./ cp %{SOURCE2} ./ @@ -120,6 +124,9 @@ %{_sbindir}/* %changelog +* Fri Dec 17 2004 David M. Kaplan 0:2.8-2 +- Made a small hack that should make it compile on x86_64 systems. + * Wed Dec 15 2004 David M. Kaplan 0:2.8-1 - Updated to version 2.8 - Cleaned up spec file because much of the tricks to get it to work From fedora-extras-commits at redhat.com Sun Jan 9 11:58:42 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 9 Jan 2005 06:58:42 -0500 Subject: rpms/perl-IO-Socket-SSL - New directory Message-ID: <200501091158.j09BwgJ8000958@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-IO-Socket-SSL In directory cvs.fedora.redhat.com:/tmp/cvs-serv951/perl-IO-Socket-SSL Log Message: Directory /cvs/extras/rpms/perl-IO-Socket-SSL added to the repository From fedora-extras-commits at redhat.com Sun Jan 9 11:58:42 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 9 Jan 2005 06:58:42 -0500 Subject: rpms/perl-IO-Socket-SSL/devel - New directory Message-ID: <200501091158.j09BwgS6000961@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-IO-Socket-SSL/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv951/perl-IO-Socket-SSL/devel Log Message: Directory /cvs/extras/rpms/perl-IO-Socket-SSL/devel added to the repository From fedora-extras-commits at redhat.com Sun Jan 9 11:59:00 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 9 Jan 2005 06:59:00 -0500 Subject: rpms/perl-IO-Socket-SSL Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501091159.j09Bx0D3001020@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-IO-Socket-SSL In directory cvs.fedora.redhat.com:/tmp/cvs-serv1011 Added Files: Makefile import.log Log Message: Setup of module perl-IO-Socket-SSL --- NEW FILE Makefile --- # Top level Makefile for module perl-IO-Socket-SSL all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 9 11:59:00 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 9 Jan 2005 06:59:00 -0500 Subject: rpms/perl-IO-Socket-SSL/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501091159.j09Bx0Sb001023@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-IO-Socket-SSL/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv1011/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-IO-Socket-SSL --- NEW 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 Jan 9 11:59:32 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 9 Jan 2005 06:59:32 -0500 Subject: rpms/perl-IO-Socket-SSL import.log,1.1,1.2 Message-ID: <200501091159.j09BxW71001116@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-IO-Socket-SSL In directory cvs.fedora.redhat.com:/tmp/cvs-serv1107 Modified Files: import.log Log Message: auto-import perl-IO-Socket-SSL-0.96-3 on branch devel from perl-IO-Socket-SSL-0.96-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 Jan 2005 11:58:58 -0000 1.1 +++ import.log 9 Jan 2005 11:59:30 -0000 1.2 @@ -0,0 +1 @@ +perl-IO-Socket-SSL-0_96-3:HEAD:perl-IO-Socket-SSL-0.96-3.src.rpm:1105271963 From fedora-extras-commits at redhat.com Sun Jan 9 11:59:32 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 9 Jan 2005 06:59:32 -0500 Subject: rpms/perl-IO-Socket-SSL/devel perl-IO-Socket-SSL.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501091159.j09BxWEd001121@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-IO-Socket-SSL/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv1107/devel Modified Files: .cvsignore sources Added Files: perl-IO-Socket-SSL.spec Log Message: auto-import perl-IO-Socket-SSL-0.96-3 on branch devel from perl-IO-Socket-SSL-0.96-3.src.rpm --- NEW FILE perl-IO-Socket-SSL.spec --- %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-IO-Socket-SSL Version: 0.96 Release: 3 Epoch: 0 Summary: Perl library for transparent SSL Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/IO-Socket-SSL/ Source0: http://www.cpan.org/authors/id/B/BE/BEHROOZI/IO-Socket-SSL-0.96.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1, perl(Net::SSLeay) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module is a true drop-in replacement for IO::Socket::INET that uses SSL to encrypt data before it is transferred to a remote server or client. IO::Socket::SSL supports all the extra features that one needs to write a full-featured SSL client or server application: multiple SSL contexts, cipher selection, certificate verification, and SSL version selection. As an extra bonus, it works perfectly with mod_perl. %prep %setup -q -n IO-Socket-SSL-%{version} # Avoid running the session tests (spawns servers, requires 3 free ports # and possibly manual configuration). mv t/sessions.t t/sessions.t.not %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check || : make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc BUGS Changes README certs docs example patches util %{perl_vendorlib}/IO %{_mandir}/man3/*.3* %changelog * Tue Oct 12 2004 Ville Skytt?? - 0:0.96-3 - Disable session test suite even if Net::SSLeay >= 1.26 is available. * Wed Jul 7 2004 Ville Skytt?? - 0:0.96-0.fdr.2 - Bring up to date with current fedora.us Perl spec template. - Include examples in docs. * Sat May 1 2004 Ville Skytt?? - 0:0.96-0.fdr.1 - Update to 0.96. - Reduce directory ownership bloat. - Require perl(:MODULE_COMPAT_*). * Fri Oct 17 2003 Ville Skytt?? - 0:0.95-0.fdr.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Jan 2005 11:58:58 -0000 1.1 +++ .cvsignore 9 Jan 2005 11:59:30 -0000 1.2 @@ -0,0 +1 @@ +IO-Socket-SSL-0.96.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Jan 2005 11:58:58 -0000 1.1 +++ sources 9 Jan 2005 11:59:30 -0000 1.2 @@ -0,0 +1 @@ +85f84c0810851eb4f540b118c9902b03 IO-Socket-SSL-0.96.tar.gz From fedora-extras-commits at redhat.com Sun Jan 9 12:06:16 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 9 Jan 2005 07:06:16 -0500 Subject: rpms/zope - New directory Message-ID: <200501091206.j09C6Gv1001836@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/zope In directory cvs.fedora.redhat.com:/tmp/cvs-serv1829/zope Log Message: Directory /cvs/extras/rpms/zope added to the repository From fedora-extras-commits at redhat.com Sun Jan 9 12:06:16 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 9 Jan 2005 07:06:16 -0500 Subject: rpms/zope/devel - New directory Message-ID: <200501091206.j09C6GZ9001839@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/zope/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv1829/zope/devel Log Message: Directory /cvs/extras/rpms/zope/devel added to the repository From fedora-extras-commits at redhat.com Sun Jan 9 12:06:34 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 9 Jan 2005 07:06:34 -0500 Subject: rpms/zope Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501091206.j09C6YER001898@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/zope In directory cvs.fedora.redhat.com:/tmp/cvs-serv1889 Added Files: Makefile import.log Log Message: Setup of module zope --- NEW FILE Makefile --- # Top level Makefile for module zope all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 9 12:06:35 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 9 Jan 2005 07:06:35 -0500 Subject: rpms/zope/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501091206.j09C6ZOR001901@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/zope/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv1889/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module zope --- NEW 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 Jan 9 12:09:26 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 9 Jan 2005 07:09:26 -0500 Subject: rpms/zope import.log,1.1,1.2 Message-ID: <200501091209.j09C9QI3002024@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/zope In directory cvs.fedora.redhat.com:/tmp/cvs-serv2015 Modified Files: import.log Log Message: auto-import zope-2.7.3-6 on branch devel from zope-2.7.3-6.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/zope/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 Jan 2005 12:06:32 -0000 1.1 +++ import.log 9 Jan 2005 12:09:24 -0000 1.2 @@ -0,0 +1 @@ +zope-2_7_3-6:HEAD:zope-2.7.3-6.src.rpm:1105272558 From fedora-extras-commits at redhat.com Sun Jan 9 12:09:26 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 9 Jan 2005 07:09:26 -0500 Subject: rpms/zope/devel zope-2.7.3-config.patch, NONE, 1.1 zope-README.Fedora, NONE, 1.1 zope.init.in, NONE, 1.1 zope.spec, NONE, 1.1 zope.sysconfig.in, NONE, 1.1 zope.zopectl.in, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501091209.j09C9QTs002028@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/zope/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv2015/devel Modified Files: .cvsignore sources Added Files: zope-2.7.3-config.patch zope-README.Fedora zope.init.in zope.spec zope.sysconfig.in zope.zopectl.in Log Message: auto-import zope-2.7.3-6 on branch devel from zope-2.7.3-6.src.rpm zope-2.7.3-config.patch: --- NEW FILE zope-2.7.3-config.patch --- --- ./skel/etc/zope.conf.in.config 2004-09-28 20:08:52.000000000 +0200 +++ ./skel/etc/zope.conf.in 2004-12-10 18:27:55.393492142 +0100 @@ -138,6 +138,7 @@ # # effective-user chrism +effective-user <> # Directive: enable-product-installation # @@ -295,6 +296,7 @@ # # mime-types $INSTANCE/etc/mime.types +mime-types /etc/mime.types # Directive: structured-text-header-level # @@ -491,7 +493,7 @@ # # Example: # -# security-policy-implementation python +security-policy-implementation python # Directive: skip-authentication-checking # --- NEW FILE zope-README.Fedora --- ==== Concerning the Fedora package ==== A default instance has been installed in <>/lib/zope. You can create additional instances using the mkzopeinstance.py script Add your instances to <>/sysconfig/zope to make the zopectl script aware of them. Every operation run by <>/zopectl will affect all your instances, you can control them independently using the zopectl script in the bin/ directory inside your instance. When you create a new instance, remember to change the default listening ports and to chown the directory to the zope user. --- NEW FILE zope.init.in --- #!/bin/sh # Startup script for Zope # # chkconfig: 345 80 20 # description: Zope, a web application server # # config: $instance/etc/zope.conf # Source function library. . /etc/init.d/functions RETVAL=0 zopectl="<>/zopectl" user="<>" prog="zope" start() { output=`$zopectl -u $user start` # the return status of zopectl is not reliable, we need to parse # its output via substring match if echo $output | grep -q "started"; then # success action $"Starting $prog: " /bin/true touch /var/lock/subsys/$prog RETVAL=0 else # failed action $"Starting $prog: " /bin/false RETVAL=1 fi return $RETVAL } stop() { output=`$zopectl -u $user stop` # the return status of zopectl is not reliable, we need to parse # its output via substring match if echo $output | grep -q "stopped"; then # success action $"Stopping $prog: " /bin/true rm -f /var/lock/subsys/$prog RETVAL=1 else # failed action $"Stopping $prog: " /bin/false RETVAL=0 fi return $RETVAL } restart() { stop start } case "$1" in start) start ;; stop) stop ;; status) $zopectl status ;; restart) restart ;; condrestart) [ -e /var/lock/subsys/$prog ] && restart ;; *) echo $"Usage: $0 {start|stop|status|restart|condrestart}" RETVAL=1 esac exit $REVAL --- NEW FILE zope.spec --- %define python_minver 2.3.3 %define zope_user zope %define zope_group %{zope_user} %define zope_home %{_libdir}/zope %define software_home %{zope_home}/lib/python %define instance_home %{_localstatedir}/lib/zope %define zopectl %{_bindir}/zopectl %define runzope %{_bindir}/runzope Name: zope Summary: Web application server for flexible content management applications Version: 2.7.3 Release: 6 License: ZPL Group: System Environment/Daemons URL: http://www.zope.org/ Source: http://zope.org/Products/Zope/2.7.3/Zope-2.7.3-0.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: zope.init.in #Source2: http://plope.com/software/zope-rpm/zope.logrotate.in Source2: zope.sysconfig.in Source3: zope.zopectl.in Source4: zope-README.Fedora Patch0: zope-2.7.3-config.patch BuildRequires: python-devel >= %{python_minver} BuildRequires: python >= %{python_minver} Requires: python >= %{python_minver} Requires(pre): /usr/sbin/useradd Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig, /sbin/service Requires(postun): /usr/sbin/userdel %description Zope is an application server framework that enables developers to quickly build web applications such as intranets, portals, and content management systems. %prep %setup -q -n Zope-%{version}-0 # Do not use -b option, or we'll install the backup too %patch0 -p1 -b .config rm -f skel/etc/zope.conf.in.config cp -p %{SOURCE4} README.Fedora %build ./configure \ --with-python=%{__python} \ --prefix=$RPM_BUILD_ROOT%{zope_home} \ --optimize # --no-compile make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT rm -f docs # Create all required additional directories for dir in %{zope_home} %{software_home} %{instance_home}/{Products,bin,var} \ %{_sysconfdir}/sysconfig %{_bindir}; do mkdir -p $RPM_BUILD_ROOT$dir done install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/zope install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/zope install -D -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/zopectl perl -pi -e 's,<>,%{_sysconfdir},g; s,<>,%{_bindir},g; s,<>,%{_localstatedir},g; s,<>,%{zope_user},g' \ $RPM_BUILD_ROOT%{_initrddir}/zope \ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/zope \ $RPM_BUILD_ROOT%{_bindir}/zopectl \ README.Fedora skel/etc/zope.conf.in # Install the skel, translating paths, into the build root %{__python} "utilities/copyzopeskel.py" \ --sourcedir="skel" \ --targetdir="$RPM_BUILD_ROOT%{_localstatedir}/lib/zope" \ --replace="INSTANCE_HOME:%{instance_home}" \ --replace="SOFTWARE_HOME:%{software_home}" \ --replace="ZOPE_HOME:%{zope_home}" \ --replace="PYTHON:%{__python}" \ # Actually copy all the other files over make install chmod 700 $RPM_BUILD_ROOT%{_localstatedir}/lib/zope # Symlink to include in the docs ln -sf %{zope_home}/doc docs # write version.txt echo "Zope %{version}-%{release}" > \ "$RPM_BUILD_ROOT%{zope_home}/lib/python/version.txt" # Compile .pyc %{__python} -c "import compileall; \ compileall.compile_dir(\"$RPM_BUILD_ROOT%{zope_home}\", \ ddir=\"%{zope_home}\", force=1)" %clean rm -rf $RPM_BUILD_ROOT %pre /usr/sbin/useradd -c "Zope user" -s /bin/false -r -d %{zope_home} \ %{zope_user} 2>/dev/null || : %post # add zope init to runlevels /sbin/chkconfig --add zope %preun if [ $1 -eq 0 ]; then /sbin/service zope stop >/dev/null 2>&1 /sbin/chkconfig --del zope fi %postun if [ $1 -eq 0 ]; then /usr/sbin/userdel %{zope_user} 2>/dev/null || : fi %files %defattr(-, root, root, -) %doc docs README.Fedora %config(noreplace) %{_sysconfdir}/sysconfig/zope %config %{_initrddir}/zope %attr(0755, root, root) %{_bindir}/zopectl %{zope_home} %attr(-, %{zope_user}, %{zope_group}) %verify(not md5 size mtime) %{instance_home} %changelog * Fri Dec 10 2004 Aurelien Bompard 2.7.3-6 - activate "security-policy-implementation python" in zope.conf * Sun Nov 21 2004 Aurelien Bompard 2.7.3-0.fdr.5 - revert to zope's default directory tree to allow multiple instances - make the zopectl script multiple-instaces-aware. - add README.Fedora * Fri Nov 12 2004 Aurelien Bompard 2.7.3-0.fdr.4 - compile scripts in %zope_home/bin too - keep skel dir in %zope_home to fix mkzopeinstance - BuildRequire python, since python-devel doesn't require it. * Fri Nov 12 2004 Aurelien Bompard 2.7.3-0.fdr.3 - compile .pyc instead of just touch-ing them * Thu Nov 11 2004 Aurelien Bompard 2.7.3-0.fdr.2 - deal with leftover .pyc files - minor spec cleanups * Thu Nov 11 2004 Aurelien Bompard 2.7.3-0.fdr.1 - fix scriptlets requirements - use standard buildroot - replace %%buildroot by RPM_BUILD_ROOT - update to 2.7.3 - drop Hotfix - drop patch 1, fixed upstream * Tue Aug 10 2004 Aurelien Bompard 2.7.2-0.fdr.3 - add hotfix from Zope.org: http://zope.org/Products/Zope/Hotfix-200400807/Hotfix-20040807-alert * Wed Aug 04 2004 Aurelien Bompard 2.7.2-0.fdr.2 - add patch to warn the user that the initial user cannot be added while Zope is running (from Chris McDonough) * Wed Aug 04 2004 Aurelien Bompard 2.7.2-0.fdr.1 - version 2.7.2 - remove leftover byte-compilation in %%post - Zope 2.7.x really requires python >= 2.3.3 * Wed Jul 14 2004 Rex Dieter 2.7.1-0.fdr.1 - 2.7.1 - move files created in %%post back into rpm. Unowned files are bad. - make (theoretically) buildable for all rh73-rh90,fc1/2,el3 NOTE: lowerred python_minver to 2.2.2 to test builds, though (most) docs claim 2.3.3 is required. (??) - don't use Requires(preun,postun) - use %%_smp_mflags * Tue Apr 28 2004 Chris McDonough 2.7.0-0.fdr.1 - Prep for submission to Fedora.us by revising work done by Matthias - Refer to source files by URL instead of by name - Write version.txt into software home in post - Don't ship byte-compiled files, instead compile them in post - Add patch for inverted P_WAIT/P_NOWAIT in zdctl (fixes startup) - Add patch for objectmanager bug that could effect sites that depend on userid/username separation - Improved init script (OK and FAILED now are printed at the appropriate times) - Remove runzope workaround by adding a stanza to the config file. - Start in runlevels 345. - Known issues: - zopectl is started and runs as the root user at boot time, (although Zope itself runs as the zope user) - no distro-specific docs telling people which port the software runs on or how to add a user via zopectl adduser. * Wed Feb 18 2004 Matthias Saou 2.7.0-0.6.fr - Initial RPM release. - The startup/stop needs to be modified further. - Currently "zopectl" returns an error although Zope does start... --- NEW FILE zope.sysconfig.in --- # List here the paths to your Zope instances, space separated. # # Example : ZOPE_INSTANCES="/var/lib/zope-test /var/lib/zope-prod" # # This file is used by the generic zopectl script. # ZOPE_INSTANCES="<>/lib/zope" --- NEW FILE zope.zopectl.in --- #!/bin/bash . <>/sysconfig/zope for instance in $ZOPE_INSTANCES; do $instance/bin/zopectl "$@" done Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/zope/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Jan 2005 12:06:32 -0000 1.1 +++ .cvsignore 9 Jan 2005 12:09:24 -0000 1.2 @@ -0,0 +1 @@ +Zope-2.7.3-0.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/zope/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Jan 2005 12:06:32 -0000 1.1 +++ sources 9 Jan 2005 12:09:24 -0000 1.2 @@ -0,0 +1 @@ +15001ab6d429dc80b1f49735e8d2ee10 Zope-2.7.3-0.tgz From fedora-extras-commits at redhat.com Sun Jan 9 16:24:33 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sun, 9 Jan 2005 11:24:33 -0500 Subject: rpms/ghex/devel sources,1.4,1.5 ghex.spec,1.5,1.6 Message-ID: <200501091624.j09GOXfM005110@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/ghex/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv5104 Modified Files: sources ghex.spec Log Message: Fix for #143876 from Thorsten. Index: sources =================================================================== RCS file: /cvs/extras/rpms/ghex/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Nov 2004 04:23:31 -0000 1.4 +++ sources 9 Jan 2005 16:24:30 -0000 1.5 @@ -1 +1 @@ -7f9b30d0a9e707d395509538f0019bbd ghex-2.8.0.tar.bz2 +ef17f945b9dc701193451f9b083e5116 ghex-2.8.1.tar.bz2 Index: ghex.spec =================================================================== RCS file: /cvs/extras/rpms/ghex/devel/ghex.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ghex.spec 21 Dec 2004 12:24:34 -0000 1.5 +++ ghex.spec 9 Jan 2005 16:24:30 -0000 1.6 @@ -1,12 +1,12 @@ Name: ghex -Version: 2.8.0 -Release: 3 +Version: 2.8.1 +Release: 2 Summary: A binary editor for GNOME Group: Applications/Editors License: GPL URL: http://www.gnome.org/softwaremap/projects/ghex -Source0: http://ftp.gnome.org/pub/GNOME/sources/ghex/2.8/ghex-2.8.0.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/ghex/2.8/ghex-2.8.1.tar.bz2 Patch: ghex-2.8.0-no-scrollkeeper.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -16,6 +16,7 @@ BuildRequires: gettext BuildRequires: desktop-file-utils BuildRequires: scrollkeeper +BuildRequires: libtool Requires(post): GConf2 Requires(post): scrollkeeper Requires(post): /sbin/ldconfig @@ -46,7 +47,7 @@ %build %configure -make %{?_smp_mflags} +make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool %install @@ -108,6 +109,14 @@ %changelog +* Sun Jan 09 2005 Thorsten Leemhuis - 2.8.1-2 +- Use make param LIBTOOL=/usr/bin/libtool insteat autoreconf -- fixes x86_64 + build + +* Mon Dec 27 2004 Thorsten Leemhuis - 2.8.1-1 +- Update to 2.8.1 +- recreate autoconf & co data during pre; fixes build issues on x86_64 + * Tue Dec 21 2004 Michael Schwendt - 2.8.0-3 - Ran into the incomplete-removal-of-epoch trap. Fixed that. From fedora-extras-commits at redhat.com Sun Jan 9 16:28:57 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sun, 9 Jan 2005 11:28:57 -0500 Subject: rpms/ghex/devel ghex.spec,1.6,1.7 Message-ID: <200501091628.j09GSvnq005148@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/ghex/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv5142 Modified Files: ghex.spec Log Message: Fix spelling in changelog entry. Index: ghex.spec =================================================================== RCS file: /cvs/extras/rpms/ghex/devel/ghex.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ghex.spec 9 Jan 2005 16:24:30 -0000 1.6 +++ ghex.spec 9 Jan 2005 16:28:55 -0000 1.7 @@ -110,7 +110,7 @@ %changelog * Sun Jan 09 2005 Thorsten Leemhuis - 2.8.1-2 -- Use make param LIBTOOL=/usr/bin/libtool insteat autoreconf -- fixes x86_64 +- Use make param LIBTOOL=/usr/bin/libtool instead autoreconf -- fixes x86_64 build * Mon Dec 27 2004 Thorsten Leemhuis - 2.8.1-1 From fedora-extras-commits at redhat.com Sun Jan 9 19:29:47 2005 From: fedora-extras-commits at redhat.com (Phillip Compton (pcompton)) Date: Sun, 9 Jan 2005 14:29:47 -0500 Subject: rpms/scribus/devel .cvsignore, 1.4, 1.5 scribus.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200501091929.j09JTlB2007288@cvs.fedora.redhat.com> Author: pcompton Update of /cvs/extras/rpms/scribus/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv7275 Modified Files: .cvsignore scribus.spec sources Log Message: scribus 1.2.1 update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scribus/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 Nov 2004 05:20:05 -0000 1.4 +++ .cvsignore 9 Jan 2005 19:29:45 -0000 1.5 @@ -1 +1 @@ -scribus-1.2.tar.bz2 +scribus-1.2.1.tar.bz2 Index: scribus.spec =================================================================== RCS file: /cvs/extras/rpms/scribus/devel/scribus.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- scribus.spec 10 Dec 2004 22:03:11 -0000 1.6 +++ scribus.spec 9 Jan 2005 19:29:45 -0000 1.7 @@ -1,14 +1,13 @@ Name: scribus -Version: 1.2 -Release: 3 +Version: 1.2.1 +Release: 1 Summary: DeskTop Publishing app in QT. Group: Applications/Productivity License: GPL URL: http://www.scribus.net/ -Source0: http://www.scribus.org.uk/downloads/1.2/scribus-1.2.tar.bz2 +Source0: http://www.scribus.org.uk/downloads/1.2.1/scribus-1.2.1.tar.bz2 Source1: scribus.xml -Source2: scribus.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cups-devel @@ -19,6 +18,7 @@ BuildRequires: libpng-devel BuildRequires: libtiff-devel BuildRequires: libtool +BuildRequires: libxml2-devel BuildRequires: openssl-devel BuildRequires: python-devel >= 2.2 BuildRequires: qt-devel >= 1:3.0.5 @@ -31,6 +31,8 @@ Requires(postun): shared-mime-info Requires(postun): desktop-file-utils +Obsoletes: scribus-i18n-en + %description Scribus is a Layout program for GNU/Linux??, similar to Adobe?? PageMaker???, @@ -71,10 +73,10 @@ install -p -D -m0644 scribus/icons/scribusdoc.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/x-scribus.png install -p -D -m0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/mime/packages/scribus.xml -desktop-file-install --vendor fedora \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - --add-category X-Fedora \ - %{SOURCE2} +desktop-file-install --vendor fedora \ + --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --add-category X-Fedora \ + scribus.desktop find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' @@ -102,6 +104,8 @@ %{_datadir}/pixmaps/* %{_datadir}/scribus/ %{_libdir}/scribus/ +%{_mandir}/man1/* +%{_mandir}/pl/man1/* %files devel %defattr(-,root,root,-) @@ -110,6 +114,12 @@ %changelog +* Sun Jan 09 2005 Phillip Compton - 1.2.1-1 +- 1.2.1. + +* Sat Dec 04 2004 Phillip Compton - 1.2.1-0.1.cvs20041118 +- cvs snapshot. + * Wed Nov 11 2004 Phillip Compton - 1.2-0.fdr.3 - Redirect output in post/postun, to avoid failure. Index: sources =================================================================== RCS file: /cvs/extras/rpms/scribus/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Nov 2004 05:20:05 -0000 1.4 +++ sources 9 Jan 2005 19:29:45 -0000 1.5 @@ -1 +1 @@ -7d2c2b228f9a6ff82c9401fd54bdbe16 scribus-1.2.tar.bz2 +002cb629e817722f4123df7a41fc824b scribus-1.2.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Jan 12 00:56:54 2005 From: fedora-extras-commits at redhat.com (Phillip Compton (pcompton)) Date: Tue, 11 Jan 2005 19:56:54 -0500 Subject: rpms/bluefish/devel .cvsignore, 1.3, 1.4 bluefish.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200501120056.j0C0usMX023068@cvs.fedora.redhat.com> Author: pcompton Update of /cvs/extras/rpms/bluefish/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv23060 Modified Files: .cvsignore bluefish.spec sources Log Message: bluefish 1.0 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bluefish/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:06:19 -0000 1.3 +++ .cvsignore 12 Jan 2005 00:56:52 -0000 1.4 @@ -1 +1 @@ -bluefish-0.13.tar.bz2 +bluefish-1.0.tar.bz2 Index: bluefish.spec =================================================================== RCS file: /cvs/extras/rpms/bluefish/devel/bluefish.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- bluefish.spec 10 Dec 2004 22:03:01 -0000 1.6 +++ bluefish.spec 12 Jan 2005 00:56:52 -0000 1.7 @@ -1,14 +1,13 @@ Name: bluefish -Version: 0.13 -Release: 4 +Version: 1.0 +Release: 1 Summary: A GTK2 web development application for experienced users. Group: Development/Tools License: GPL URL: http://bluefish.openoffice.nl/ -Source0: http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/bluefish-0.13.tar.bz2 -Source1: bluefish.desktop -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/bluefish-1.0.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: aspell-devel >= 0.5 BuildRequires: desktop-file-utils @@ -17,8 +16,9 @@ BuildRequires: gtk2-devel >= 2.0.6 BuildRequires: pcre-devel >= 3.9 Requires(post): desktop-file-utils +Requires(post): shared-mime-info Requires(postun): desktop-file-utils - +Requires(postun): shared-mime-info %description Bluefish is a powerful editor for experienced web designers and programmers. @@ -31,27 +31,20 @@ %build -%configure +%configure --disable-update-databases make %{?_smp_mflags} %install rm -rf ${RPM_BUILD_ROOT} mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications -%makeinstall \ - pkgdatadir=${RPM_BUILD_ROOT}%{_datadir}/%{name} \ - gnome2prefix=${RPM_BUILD_ROOT}%{_datadir}/applications \ - gnome2menupath=${RPM_BUILD_ROOT}%{_datadir}/applications \ - gnome1menupath=/_not_used_here_ \ - iconpath=${RPM_BUILD_ROOT}%{_datadir}/pixmaps +make install DESTDIR=${RPM_BUILD_ROOT} \ %find_lang %{name} - -install -p -D -m0644 inline_images/bluefish_icon1.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png -desktop-file-install --vendor fedora \ +desktop-file-install --vendor fedora --delete-original \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ - %{SOURCE1} + ${RPM_BUILD_ROOT}%{_datadir}/applications/bluefish.desktop %clean @@ -59,10 +52,12 @@ %post +update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %postun +update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : @@ -70,12 +65,21 @@ %defattr(-,root,root,-) %doc COPYING %{_bindir}/bluefish -%{_datadir}/bluefish %{_datadir}/applications/fedora-%{name}.desktop -%{_datadir}/pixmaps/%{name}.png +%{_datadir}/application-registry/* +%{_datadir}/bluefish +%{_datadir}/mime/packages/bluefish.xml +%{_datadir}/mime-info/* +%{_datadir}/pixmaps/* %changelog +* Tue Jan 11 2005 Phillip Compton 1.0-1 +- 1.0. + +* Sat Jan 01 2005 Phillip Compton 1.0-0.1.cvs20041231 +- cvs20041231 + * Fri Nov 12 2004 Phillip Compton 0.13-0.fdr.4 - Redirect output for post/postun. - More mime-types in desktop entry. Index: sources =================================================================== RCS file: /cvs/extras/rpms/bluefish/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:06:19 -0000 1.3 +++ sources 12 Jan 2005 00:56:52 -0000 1.4 @@ -1 +1 @@ -e5f1f5eff0933dc68a51adcdce352826 bluefish-0.13.tar.bz2 +3f92c1ca80da129c0eff0d2fbde69cb3 bluefish-1.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Jan 12 20:05:48 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 15:05:48 -0500 Subject: rpms/liferea import.log,1.6,1.7 Message-ID: <200501122005.j0CK5m4F014402@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/liferea In directory cvs.fedora.redhat.com:/tmp/cvs-serv14393 Modified Files: import.log Log Message: auto-import liferea-0.6.4-1.b on branch devel from liferea-0.6.4-1.b.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/liferea/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 8 Nov 2004 04:49:46 -0000 1.6 +++ import.log 12 Jan 2005 20:05:46 -0000 1.7 @@ -3,3 +3,4 @@ liferea-0_5_3-0_fdr_3_c_1:FC-1:liferea-0.5.3-0.fdr.3.c.1.src.rpm:1099889374 liferea-0_5_3-0_fdr_3_c_2:HEAD:liferea-0.5.3-0.fdr.3.c.2.src.rpm:1099889383 liferea-0_5_3-0_fdr_4_c_2:HEAD:liferea-0.5.3-0.fdr.4.c.2.src.rpm:1099889386 +liferea-0_6_4-1_b:HEAD:liferea-0.6.4-1.b.src.rpm:1105560383 From fedora-extras-commits at redhat.com Wed Jan 12 20:05:48 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 15:05:48 -0500 Subject: rpms/liferea/devel .cvsignore, 1.3, 1.4 liferea.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200501122005.j0CK5m3F014406@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/liferea/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv14393/devel Modified Files: .cvsignore liferea.spec sources Log Message: auto-import liferea-0.6.4-1.b on branch devel from liferea-0.6.4-1.b.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 25 Nov 2004 02:05:20 -0000 1.3 +++ .cvsignore 12 Jan 2005 20:05:46 -0000 1.4 @@ -1 +1 @@ -liferea-0.6.1.tar.gz +liferea-0.6.4b.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- liferea.spec 25 Nov 2004 02:05:20 -0000 1.5 +++ liferea.spec 12 Jan 2005 20:05:46 -0000 1.6 @@ -1,12 +1,13 @@ Name: liferea -Version: 0.6.1 -Release: 1 +Version: 0.6.4 +Release: 1.b +Epoch: 0 Summary: An RSS/RDF feed reader. Group: Applications/Internet License: GPL URL: http://liferea.sourceforge.net/ -Source0: http://download.sourceforge.net/liferea/liferea-0.6.1.tar.gz +Source0: http://download.sourceforge.net/liferea/liferea-0.6.4b.tar.gz Source2: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -30,7 +31,7 @@ %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{version}b %build @@ -82,7 +83,10 @@ %changelog -* Mon Nov 1 2004 Brian Pepple - 0.6.1-1 +* Wed Jan 12 2005 Brian Pepple - 0:0.6.4-1.b +- Updated to 0.6.4b. + +* Mon Nov 1 2004 Brian Pepple - 0:0.6.1-0.fdr.1 - Updated to 0.6.1. - Added %exclude *.la - Removed liferea-0.5.3c-fixes.patch, not needed anymore. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 25 Nov 2004 02:05:20 -0000 1.3 +++ sources 12 Jan 2005 20:05:46 -0000 1.4 @@ -1 +1 @@ -a9a03cdeeb2a57c96dd8e7718917e787 liferea-0.6.1.tar.gz +d45086ee3fc098cc9ca146bece0ddf9f liferea-0.6.4b.tar.gz From fedora-extras-commits at redhat.com Wed Jan 12 20:07:18 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 15:07:18 -0500 Subject: rpms/libkipi - New directory Message-ID: <200501122007.j0CK7INg014537@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libkipi In directory cvs.fedora.redhat.com:/tmp/cvs-serv14530/libkipi Log Message: Directory /cvs/extras/rpms/libkipi added to the repository From fedora-extras-commits at redhat.com Wed Jan 12 20:07:18 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 15:07:18 -0500 Subject: rpms/libkipi/devel - New directory Message-ID: <200501122007.j0CK7I34014540@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libkipi/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv14530/libkipi/devel Log Message: Directory /cvs/extras/rpms/libkipi/devel added to the repository From fedora-extras-commits at redhat.com Wed Jan 12 20:07:43 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 15:07:43 -0500 Subject: rpms/libkipi Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501122007.j0CK7hlg014605@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libkipi In directory cvs.fedora.redhat.com:/tmp/cvs-serv14594 Added Files: Makefile import.log Log Message: Setup of module libkipi --- NEW FILE Makefile --- # Top level Makefile for module libkipi all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 12 20:07:43 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 15:07:43 -0500 Subject: rpms/libkipi/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501122007.j0CK7hnd014608@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libkipi/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv14594/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libkipi --- NEW 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 Jan 12 20:09:36 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 15:09:36 -0500 Subject: rpms/libkipi import.log,1.1,1.2 Message-ID: <200501122009.j0CK9a87014729@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libkipi In directory cvs.fedora.redhat.com:/tmp/cvs-serv14720 Modified Files: import.log Log Message: auto-import libkipi-0.1-2 on branch devel from libkipi-0.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libkipi/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 12 Jan 2005 20:07:41 -0000 1.1 +++ import.log 12 Jan 2005 20:09:34 -0000 1.2 @@ -0,0 +1 @@ +libkipi-0_1-2:HEAD:libkipi-0.1-2.src.rpm:1105560609 From fedora-extras-commits at redhat.com Wed Jan 12 20:09:36 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 15:09:36 -0500 Subject: rpms/libkipi/devel libkipi.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501122009.j0CK9aJs014734@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libkipi/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv14720/devel Modified Files: .cvsignore sources Added Files: libkipi.spec Log Message: auto-import libkipi-0.1-2 on branch devel from libkipi-0.1-2.src.rpm --- NEW FILE libkipi.spec --- Name: libkipi Version: 0.1 Release: 2 Epoch: 0 Summary: Common plugin infrastructure for KDE image applications Group: System Environment/Libraries License: LGPL URL: http://extragear.kde.org/apps/kipi.php Source0: http://dl.sf.net/digikam/libkipi-0.1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel >= 6:3.0 BuildRequires: gettext %description Kipi (KDE Image Plugin Interface) is an effort to develop a common plugin structure for Digikam, KimDaBa, Showimg and Gwenview. Its aim is to share image plugins among graphic applications. %package devel Summary: Common plugin infrastructure for KDE image applications Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} Requires: kdelibs-devel %description devel Kipi (KDE Image Plugin Interface) is an effort to develop a common plugin structure for Digikam, KimDaBa, Showimg and Gwenview. Its aim is to share image plugins among graphic applications. This package contains the files needed to build applications with Kipi support %prep %setup -q %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh %configure --disable-rpath --disable-debug --enable-final make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} #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 -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README TODO %{_libdir}/*.so.* %{_datadir}/apps/kipi %{_datadir}/icons/hicolor/*/apps/kipi.png %{_datadir}/servicetypes/*.desktop %files devel %defattr(-,root,root,-) %{_libdir}/*.so %{_libdir}/*.la %{_libdir}/pkgconfig/*.pc %{_includedir}/libkipi %changelog * Wed Jan 05 2005 Aurelien Bompard 0:0.1-2 - Fix libkipi-devel requirements - Reduce hicolor icon directory ownership bloat - Switch group "System Environment/Libraries" * Mon Oct 25 2004 Aurelien Bompard 0:0.1-0.fdr.1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libkipi/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Jan 2005 20:07:41 -0000 1.1 +++ .cvsignore 12 Jan 2005 20:09:34 -0000 1.2 @@ -0,0 +1 @@ +libkipi-0.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libkipi/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Jan 2005 20:07:41 -0000 1.1 +++ sources 12 Jan 2005 20:09:34 -0000 1.2 @@ -0,0 +1 @@ +7268776060b348c21d9dd9936443dca2 libkipi-0.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Jan 12 20:11:02 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 15:11:02 -0500 Subject: rpms/libkexif - New directory Message-ID: <200501122011.j0CKB2pa014859@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libkexif In directory cvs.fedora.redhat.com:/tmp/cvs-serv14850/libkexif Log Message: Directory /cvs/extras/rpms/libkexif added to the repository From fedora-extras-commits at redhat.com Wed Jan 12 20:11:02 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 15:11:02 -0500 Subject: rpms/libkexif/devel - New directory Message-ID: <200501122011.j0CKB2eG014862@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libkexif/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv14850/libkexif/devel Log Message: Directory /cvs/extras/rpms/libkexif/devel added to the repository From fedora-extras-commits at redhat.com Wed Jan 12 20:11:24 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 15:11:24 -0500 Subject: rpms/libkexif Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501122011.j0CKBOtw014923@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libkexif In directory cvs.fedora.redhat.com:/tmp/cvs-serv14914 Added Files: Makefile import.log Log Message: Setup of module libkexif --- NEW FILE Makefile --- # Top level Makefile for module libkexif all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 12 20:11:24 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 15:11:24 -0500 Subject: rpms/libkexif/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501122011.j0CKBO4D014926@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libkexif/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv14914/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libkexif --- NEW 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 Jan 12 20:12:54 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 15:12:54 -0500 Subject: rpms/libkexif import.log,1.1,1.2 Message-ID: <200501122012.j0CKCsJ9015021@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libkexif In directory cvs.fedora.redhat.com:/tmp/cvs-serv15012 Modified Files: import.log Log Message: auto-import libkexif-0.1-2 on branch devel from libkexif-0.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libkexif/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 12 Jan 2005 20:11:22 -0000 1.1 +++ import.log 12 Jan 2005 20:12:52 -0000 1.2 @@ -0,0 +1 @@ +libkexif-0_1-2:HEAD:libkexif-0.1-2.src.rpm:1105560811 From fedora-extras-commits at redhat.com Wed Jan 12 20:12:54 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 15:12:54 -0500 Subject: rpms/libkexif/devel libkexif.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501122012.j0CKCsfj015027@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libkexif/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv15012/devel Modified Files: .cvsignore sources Added Files: libkexif.spec Log Message: auto-import libkexif-0.1-2 on branch devel from libkexif-0.1-2.src.rpm --- NEW FILE libkexif.spec --- Name: libkexif Version: 0.1 Release: 2 Epoch: 0 Summary: Allow Kipi plugins to extract EXIF information Group: System Environment/Libraries License: GPL URL: http://extragear.kde.org/apps/kipi.php Source0: http://dl.sf.net/digikam/libkexif-0.1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libexif-devel >= 0:0.5.7, kdelibs-devel >= 6:3.0 BuildRequires: gettext %description This library allows Kipi plugins to extract EXIF information from JPEG files. %package devel Summary: Allow Kipi plugins to extract EXIF information Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} Requires: kdelibs-devel %description devel libkexif allows Kipi plugins to extract EXIF information from JPEG files. This package contains the files needed to build applications with libkexif support. %prep %setup -q %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh %configure --disable-rpath --disable-debug --enable-final make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} #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 -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %{_libdir}/*.so %{_libdir}/*.la %{_libdir}/pkgconfig/*.pc %{_includedir}/libkexif %changelog * Wed Jan 05 2005 Aurelien Bompard 0:0.1-2 - Licence is GPL not LGPL - Fix -devel description and requirements - Switch group to "System Environment/Libraries" * Mon Oct 25 2004 Aurelien Bompard 0:0.1-0.fdr.1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libkexif/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Jan 2005 20:11:22 -0000 1.1 +++ .cvsignore 12 Jan 2005 20:12:52 -0000 1.2 @@ -0,0 +1 @@ +libkexif-0.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libkexif/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Jan 2005 20:11:22 -0000 1.1 +++ sources 12 Jan 2005 20:12:52 -0000 1.2 @@ -0,0 +1 @@ +2d1ed6285fd9490c72327ff6dacd9185 libkexif-0.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Jan 12 21:12:00 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 16:12:00 -0500 Subject: rpms/psi import.log,1.8,1.9 Message-ID: <200501122112.j0CLC0ID016330@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/psi In directory cvs.fedora.redhat.com:/tmp/cvs-serv16321 Modified Files: import.log Log Message: auto-import psi-0.9.3-1 on branch devel from psi-0.9.3-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/psi/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 8 Nov 2004 05:14:00 -0000 1.8 +++ import.log 12 Jan 2005 21:11:58 -0000 1.9 @@ -5,3 +5,4 @@ psi-0_9_2-0_fdr_2_rh90:RHL-9:psi-0.9.2-0.fdr.2.rh90.src.rpm:1099890821 psi-0_9_2-0_fdr_2_1:FC-1:psi-0.9.2-0.fdr.2.1.src.rpm:1099890830 psi-0_9_2-0_fdr_2_2:HEAD:psi-0.9.2-0.fdr.2.2.src.rpm:1099890840 +psi-0_9_3-1:HEAD:psi-0.9.3-1.src.rpm:1105564278 From fedora-extras-commits at redhat.com Wed Jan 12 21:12:00 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 16:12:00 -0500 Subject: rpms/psi/devel crystal_roster.jisp, NONE, 1.1 crystal_system.jisp, NONE, 1.1 .cvsignore, 1.4, 1.5 psi.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200501122112.j0CLC07b016334@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/psi/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv16321/devel Modified Files: .cvsignore psi.spec sources Added Files: crystal_roster.jisp crystal_system.jisp Log Message: auto-import psi-0.9.3-1 on branch devel from psi-0.9.3-1.src.rpm --- NEW FILE crystal_roster.jisp --- PK  ?]??? ?"????)^x?]E???B?? ??RJ???@????ik????P?1&??D{v!V???|?|???= ?G(??x??9>.u&MhL?? ? juUkw?????Em.??g[)8p ???????K???a??UYk4?-?4e?lH?  ?I8DI????e(A?H?U?EZ? Z?(??jT- 2raFv??r?[?3N9???s?s?ia?h????????{??m &?w? p????~0???cEQ [F??2T???????`y??u"y?,@???1?4?@@?m?k8?????}k|U????'$?[M0  )%  $i$6 ?cv?I???d????]4d9x!???&?{? ?"bv??^Tl?n6?e??n *"Z??P???Jg?iY??????|?????m??? ]??F????0==??? ???  i??$4J?$??c?3???]DvH?????|??=:??? H)?%ala??GP(rXm"Jmh???a,?"?No??.????>&r?I??@3??Z??u??????eIfffXZZj?RJ???.?o4?Uap?Q??.9m????M;?k?D+p+4,???st???eW?c?vNa`?X?0Q1I,??d?z??U?a~?Y????c??9??7Q?????%NcdP^???C???U??E?pGVF?  -??E!H??`??]??????mC?8???Lf?a7????????_??|??P( ??k?Z????????1 ?J?B?? pe?????d???Z_?s?~??w?8??J|s?v?M??BJy?40T??x8?*?>?-?8?4D??QVVh?:E?XDy????<@4??????4:?O?i??6=:??n?.?4???]??Z?V???D??f??#j??{??GD?eb?.?6ckk?/??m??7?xq??&????n?1M????????t?h?S??? )? ?B ?.4??KHLH?nD ??@???d???;??O=P?????????? X4 ??lb??l????? -?[? ?80? v?9sN2??U??V???\a??u????3?4\cf8???k??q`????????"?_???nx.????z>??fqZ??Y  ???b??q????x?T?l4M?L????a?? ?g???[???B?=z#?C?z????qy`?f!?i?Nx|UV??=W????lz2?o??? ?)^?0???(?j???#???? ?j??va1?/???#??????|Ty??S????9!? ?d??@@ o?????R)??H)Q??????????;7.W>?+??[??^f??1??D???????j??m?3@?? ?f???N?l?`6?=???? 13#Wm???z?s???C???_TKyvD? kF.. G%?`/?\/ ??Y??Lk?d?M ry?C?X?sobr???'d?-?H?? ?`??? 3??b???h?z??n:~???|??[Ec??O??????}??L??????OV??#?R?V???i??? }4?????????k??}trt$g?-.???2?n?'?F,?O!)&N?(}?yne???????????s?? ?o>)?(?-?B?0?D?d at m?D???>?????(( ???(??!?4??dt{?`u??'?{??? j????O1; ^x?e????? h??q??M???r??????=2?????&??u?kd??$;P??P7??g???T?$?????????????KH?????:v?????ho????????D\??v???% ?$????Dg?A ?8?kV??>?N??)r??5O?}S?? ?? J##a????7?J???????Bq?FNK?]2?4?}B????U^??]??VI1x?X2?3?m??0Ug?n?_?{6f+N??D?0?9???7fw??& ?7???*NM]?[???lGJ"?s{??!??pg?-+?eH?/???(v?Uy?%??)??s????X?????? ??h?e9?ncf??????b=h^?4?@?|??Of?Ka??6P?K????+{??}???? q?8?? ???uL?I??k ?iX\???vT#\vUw??}"?l??|1??\?S??Z<*"???@?wU?H??paKLQY>+ddO@????????? v&?M???g?@??`??? ??k??x? ?u:8)???4?z?mI??M'?6???m????-ch??Run?)??d[h???m??? /?$??N???pl j???G????G???2W?????????W[ QP?4?????r??e?#q?Z??????!?hv????????g\???Ul?Z??a??@:?????q?W9$E? ?? P? ?4"?????^?4:????+(????s?'???x???J??s??-"?S(?6???i?? ?E?P??~u}?' K???`@[??~??K?R??}t?RE?EcS0??\?RPmE??/?Jq?.A?`BBXY????oJ?e?k?~???=J?"n8?w?$ ??~???????p??N?{5?7? ???C??t_m H??3?Z??? }?@???N????o????????????y?G?????]??B??,?Z?BK??H???? t!FZ??O#?PK ??&7???7\f?/??????LIpX?'q?7=0L??"^~?????Z??j????<x?tr ????Z`?=Q??iX`8w??)??@?r????9????{??98??~??\z}+f??????(??^??A???C?>?yG1n?&?z13Y?-R6??1????&??@??58??(?c????? S]]]?mK?3??8N?7vu????b:??k?x??=jtY`ss?s^4`)??,x?3??g?mP?T4_>???N?????"?v?]5?8g8 ? y3?|??'#%[?]?????}????jU?y*P?UsP??N9???1????:ZbI?L?\U?fu???V???:?????5\R?????? O???xY?-?\?3O???t?M??L??T?????????%v{?;G6a|^I5l??????_??oZm?p{?\???{?H?4:??\-U ??k)??@???zhc?.r?)x??>?;?N???q??u?????8? ?????>??D??=^=&9?\?$??,=???????????e\y|]\4g8?????+f??????????????u[4????????/:?;?M????y???HC8? c????????b2Y??$!?@??????V?p?P _??RsG{?????&?NU???????????G??????9????_I?%???2??PA?4??z?3?^M?MN??<<??P3"?Fi]`z?w4?<;?p??????????8*!dk?l7u????u??p??.????r????0$???k?a???>%????Zxz??|?#A???&j???????cC????8?*????t/5????o??' bz??`0?{??2-4???T:???^?K??}?X? ??bp???:?l?y?GS??9?]??TY8???'?k6w???Q A ?s? ?,??!?^?y??1%tP?{?O?? ?l???B????2?B??2~???O?>??!|9??4?e?n?a?C ????i??S?SE]?h???E?n?W????]?] Z???7??S???m dm ?C??G?RY$?{X????u?? ???=?t??/????G?? ?? ??zH?'\?wn???}?x?Q?f??FM?? ??M?????????????????? ?y?/0???M?5??{????? Y?Kt?G?r?:???8?3Z}?O?}????R?_??/??#6r??n"O???p&B???g\??A?{???8 ?N???`?XT????=???~??h?{*?????jN?????\??????f!?y1A?b'W???4???t?????js? ?????EAX???????^ ?P??w?&?P?????O)?[D? ZH]&???[??A??e)??!??$?????c8??n?$???qc?\????u???>V at W~2????W?????,l?3? ;???+Z?)0?`?????a3?<%????p??(|??P?CC>s?c???A?jW??? m:F?5v7?bJC2?Yb??e,?>?rt??U?47:??W???????????6;?w?????h=4??jt?y1{?V??????Zd1Xz#?E?$?{???"?|`?V???~?????V??? ?w?nry;??j{? _/GK??,?????????RY?R????f?f?????????X?vX??????"iQG C?o.??y?f??R?_?_?????????m?7? (fh?a?B=?5V?b????Ow????b??H??????.?[??^?|?bdie??0Y??xi??gm?b??~???.??K,????????rk^?x?,?z?"??U?@[bbr????K??|?kZBZB8;??R'%.q!???mj??kaa??i?_?????E??K?2P??k??xd?I~=???f??G?^??v?{$ ???P?P_???&~??lA9??t????U??[? ^!?9!? N???????7o????a??vg?O?,?|??MS????[9T ?JOO?????B?,???!???P[??|M????}?!v:%j%jo???$????D?&??}????8>k@?K??z*??%?Gz?6??????U"X??.1?^?bb5?>;?b3???????H?????8?c?[??l???T?????+?j7???9?\?P??21?P??C??W$??io??fI?o?L?9bv?}?nR?j??V5Jjx??d?u?? ????KBGe/GH[?J?'J????(@?$?xZ??+o4?M]??O??60??<,/????) + K??S-S-o?c ??Z??W ?`X???B=?'?S?????<\?C????"K?6'h?Q?6z?Ss 5??? "2??/?QA??Jx:?d???E?(?G???&k??H ?h&J????????H?#?f??i???m??Q at b???5????aa!?$? ?i??kF?????????W7???? U/?U????$ ? Ux?W{,???:??-s5?H?+???djs66??????????j???H?d?aN?N????:???n?.?~X?Yz?pB?????e?w?"? y??b??(:.???Db???^??=???????O(QSO?E??ia???p@???WiW?ai????X??&r???.?h7???&?????zb?(?KJ??a?>>??GI?I?E???X?Y???Z?-[SB??*??.,l???a`??w'???-fb`p???Y?K???????Z????????2?I???35^??IgI???Jc????q??%??$?,?jSx?2h?#?h?b?b??!+V+??e??LW?y?'Q??l4?c5?M]??C?K1?kW??OtlH?+g??????[??_?-U??%0m3n??????2??~3?i?)d? ??W??q? ?????-w??n?(r??y?\7Us5&l??s?E>K???>?f?B0}~?l?Y?c?????I7?'_?????t??????0[?@\;F?kx?}???aQ?u~)??,,tj??g^?&?8?R?M?;?;99?:???;N??|_&!}???????|&?B$????G?b??V??????W/^9?????s?????#??f~?8*? 1G?m_?? ??GF??s?s? ??3??l}?????^pq%??????2???u<4?T?1????z?NV????6?????{Ow?+Z&-????vpk??r?'?l?mo?????B[]i????Cn?{????w??}}???-??Ez????u???^0???y???????????ZQ\S??????u???J-???S?_?Qj?xy??#??q? ~x??1?Q~w5#L??v&???@?w?(?+?F7n??;?e6?(??e?????SM?p?D#A'Ba?'\1!g??kMW?F,r??8???(????i?+?g?-I??O??v}??M??Qn? c?????$5?&,\!i(????O?? 8?v???>?ah??????,b?a!?R(K??k?????W??? ???(U(U?\A??$P{Z| ??S???Z~?A????Xr??O???1V?Z?>hV?LRG?h?h??B?v???!O?? f6??Fg`o??? y?:WA&Mv??]????)?f????a?ai?&0???L??V??ZP???fF?Hnw??)?????( ????F?5?????@?}L??????X????cH???>??9n:?y??d??A???y????%, ??!?????k??r:U??????]y?? ?L&N?q?????EK?I?t?D????V.?a-??$????j mL?^??O?ul?\Ym?w???=?^?3!?+f?+??=Q???#c`?0>6??"?'??a?s??'??- at 9?',iY h??r?O?O?W[{??<?m/=W?5 X???0?70p????b???$z????_?Gy?J??A? ???3"E$??]?f_x-??&?&M?y?H?4~???I ???Y????????X??&?$Y2??s??e?X??????LC?@Vosu.??2???.Xe??????K???c??0Sv?y?x??-l????`?1?g?a?A_??r?????>?u???????zz???T???s??2??n?}???t??k?Rg[?X;?ej?6??I/1{xk??o$????|???#)>]@????i??E?Wd??????*?ST?dHd????)?ibU??< ?unpVa?@B??Z h ??????????N?gV???e?1?"B??bTN "16?ili?'??m ??????>?(???3*o{~?H7?UX4\?i) ?]W??W?R? QQ`?Q???????;??????????p??n????.r???a?J.??x????z.>??c?u???????u ??]%]%5??????Z?4??M ?,r???V|x??Q?q?z???6b?c?c???????on&/y?E?? ??j?Mt.????,????jx? ???? ???P2 ??L?i???'{b6<?)j?d????4??IX??$3??bSE????R?z?C???????N,?LKL??s??*oD3????r?^y?8A???0???l1em7z???????$ R??qS?>?+ ?,}'i??????3b??y?????Q???iQ??L/??ix?6Xm??U????u??f??????q??6?5SD??4??q????L4u0?HJm ?????V??I?6?????0Og????}Kvf)???:??[???k?O?c[?aB ??b?}????????s?G?##C?`{????7?n?g???rlo??R??QY????(?n5??v??P/C?&??????L??oJ??w)f????q??-??8???V2 ???B(??#? ???=W??2?Y???V?? ? ??YYYp??????????X??o?S???{?zm/ ?:9bi??Q?1?[jg| ??? ????W??????> ???????C?&?????D&Wb_3???????????,????Q?eH`???9m?IEv ???? N=?o????c???.??~?xS?|`/?A?jv> |&`9??myG=i`?W????-???es at l??? ?? v`?2????R??X?? w??a???????td?jG7??&1???OvY43?_??pp*??0????6^O?e ?"+.?h?????9?,.???d\?"$??`%?L8? ??eg???????gJ?fk?R??K? b[??""??ej*?V???^-Y?0???TV?6Y??&????????@??\ ??y??]51???j~?{??VI?.???M?n????tnIv?R?;?a ?:?`??.??qG?57?u??1???K?G?? ^nG+nR*WM?????? ??????E?????8}?}` (T ?o?=4??q?%???? ?Y??M??r;???#t;<*A??l?V???W???p????M?X?cc_??M???? ? `??@  ??????????f???V??,D?AJ?????t?Ff?V??n?57????=W?s?????s????=?s9??K??x????F??3?V??*??N???yi???????N9?8? @h ??????z=jqdo????mz??#?'o??sHg????0?K??-F$M?5?!??????mj????L0???9=/??=]????$jL?{???????L?edPR:????????Qw;???G?R???i?}I?=???F?ao?Sl??zc?>"?????E??Xr???w 4?p???Wp????_?z?"??:?sB????o?Ha4D??   ??? ???p??v????? ?gl?@ i?$v"??A5???????B??? ?.?}????@?&???iGI:Z?D??OK??????V???+????????R?W????????????t6??^???C5:f?&\i???&''[?o?    ????? .CYx??f????????? ?olj?[??aP?5f??d*???????? 2? =.+]Q&p????3?  ??V_Y???t???F?E ????d????????@'108???:?????7?@??  ?&JF????????GJ?n'+?p\?q?^j-???? ?.L&{?G?Tg?X?e?Qk:V ?r ?m??0?/5????C?4}}tJ/2????w????? U?+?*???Xh?}??k??C??#?7??s ???  ????1|??f7P?9p(@ ?L` ?v?????Hn?????S??????+?S]?,?D|6????M????8?i???8??1`l ??t/?I???Z?B??????%%M??????[?"???????"R r*b%l8*ej??(??!!)F?X?\?$ J 7?! ??H$?;q???Tlt%? %???5jt  ???h ????9???~?|?? ?p????? ????????|f`??FQ @X ???5????@?# ^?????????'T  c?0????Se2?Q?a??kd??|?J.??p?? n???_????? e?????'?y?B?o?w?? ???G??E0l???C?H9????KJJ????1??i?[+?0V???w??????]:fu?p??AL???$kr``j&+OX?1?=?? ??'Hm???,??8??b ?-??A???6t???^???X????z???A???????0?5 "{1?[?`y#tL?????????t??l?8We??[m??:?????]??@m???UN?/?5?iH?]?e???T?%?????y?J  4??Ci???#E'?`D @  ???k>?CH???K?"????cX {t>$8?)??2?? ?4???t?????K????t8?????9G?}f2?n?|?>?aDB???d????t:=??L??]????~? ^G,v?6???/I?b6?.55?X?m??? P?T ??pP???4b?X?R???2?\?bY??? ?????????M&JE???fhny?????? @????h4J#?1???t?T?-9? ?#@?O?j? zo??  ?`???O4J@^R?V(??"m?R?_?5?)h?? ns?w?? ?r? 1?Q? ??{_? d?:b ?%????"???V*?'???j?=g?_??X?FZ]????PR??a|??  ?R?????}$??L'?$?$wf?=.?4?Z?9??w??=??;?????H$O&?N?R???d?"?`??b??R?koL?a,.?RW???1$R???lv????p\??Rc??????????z?|???(?bz????$od????????[????????n?GG?eTU)??o??;????splq-??N&?t.??|?a?U?d,??C??-?u??e??dd2??]P  ????9??| ????7?????(?NO?8????&???zG????????xA??????|??jt??Q at u?\N????1?????????????p??iE???wp??psX???1???N Zz ?p?@??(?c(??r9V?* ?(?;???"???<(??_??(?@?q???I?d?M]%8??$?#???6???@??2? : ???.??^? C?D?1GD?0??41???VG?H???b`HQ:?g??b??9?*?o?1??@??[f??-}?(?M$??/+Eisd?t???KI} B?y???e??7?+?^???????,?q???7z?????]L5???0u??{????aJ??g?9|??????g???$8gv??x6???c(?]?  iW?|?????7???-?? 3^|????;ou???D!Rl?.?v?6X???E??????g??c???L????~?t?V?]????}?l~?2?_7r????h??????t????&??S???]??????`?^?&g???? ?gK????,z?'?? ??????????? M.??EEm`?A?? ?_>??g??????  &2??p ~??!??`??k?WPq??c??@?P ??o4a??[?A??2?`6??x?(w:}???e  ?l??R C???~?{V???5;??4i?P?q??7???? ?????m????/???? )?L?j???x???_??m?*  ??S!?f! ??m????i@????3?????J?E?GqE? ? ??N?=???8?q??N?f?]???A?{^Q????@???? ?\? ?ZhP??z=U??5@l5S?????'g??:??x???? [??h?f6??v??6???????,??eg?`???A??Z9???p'??n????Z?????? ;??????  ?*g??(?? r??<.?c?*?????$\??? )???&??LE????????^?#????-????S??O&?>?????^)??   ???u???? `466.???z????UHV?????_{???????????(((H? LH??????=???I@??????s????????????%Se????)????????S???{?????y??wK??a????????\??????7???????`@????t?? o|2s??????? ????3???kL???w?????? ^`?!n#!!?3&6??yp?O?????|?y??E&?uIL???_??????7o??????????>P?? nnn? M??g?????@??i?;qJc??  ???????( 3;;?????y!A?lZd2i??FP??A??Z??????????z ?s????2?]?U}??vS???U?$?wf??q@?,<_???y)????? ???<?~????p?e???????????s???????  ?????EKR'?S???fviQ?S` ? ??????O???i>?[?A??2?`6??x?(w:}???e   \`?V?x[????6XY%?lh?TiU+??eb?G??: ??0E?J???u at YE???S~$???@N???????? ????I?????}???s??????,M?KZ?{?~????EW?#??????y5u??K??????#????&??-`%?/??`?|????O??}????+?K??^??X?R????'??-]Xszp]:?ze??w?[?UG??G&'` ????????W=????C??=t???;j?2?!(?????t???5B??!????????z???"???vp?T??n??????[?FM]?!??{???:~h??W??%?.19?????[vm[???p0?]?????q????? ????!? IN? ?????^?[??-FH?6?? ????|???E?"????i??????~????????? ??C?u???g? !k?7?^onT ???! ? x{sc~?? ??]p????g?????K??;???[z??AoII???9v???? ?h ?B?????Q__?i]??^?????6??? `| ????#??????????//?4???f?????8>??c?9?6u?????y???q??D?Q???PMM 48.?7?#?? ?@!6*???hjjv1?z??0?r???>?=XT P p ???;?K?p~V eR????n?????I?? ???} ?~?u ?u??  ??`???3??!???iN??T???`pp})8?????z? ?2?N? T??R ?? ?;?d??? ?H?|?   ??K??m9???N??H??5?s)Y_?"??????Q???~??O?????f?#?????????U/??He?BX?fK?????????? ?Nn???'?7????IO?D?_?z?????~????????#?)A??z???)????m;?~?? ??=Z????{[?oQ'?n???+???}v?e7?}???.?@??>? ?fJtvR|????? ?9????1Q?u?.??????o??????l??o??? ?? ?S??&?????P??6j????Hzk~?3?q |L???<???Z?O??#L?????????\?G*D[? C1???mX2[?Z ?^?+*2??"??xg,@!w|$?????w?!L?3?ly5???W$#? `?}o? ?NHSRi?H?s$???Z|????????nN??q^?k? 4?K??{0???KI 3???t???,?a9?4??TU)m ? M*~?uE"(mJ ?K?k????&?????x????e?????????o^p pU??4????B h???'?fG??r???0,??TE?*`T?)?ciBH5??UI??|????5/>d???????O1?{??\p?Q`xi4??d0?B%?????&?0aU?J???~?oM?HO3?Rq?????9*??z_d??? 70????|?$?[3?AG?1~???Z -?? ?'?6????Hc=f?@?L??p&?+?7?{|>?+??Gr???? ?1???n"?I?? ?=`&F?u?K2f? ???? ???:????1;' ?T????$?? ?. \!????qO?1Y?9%`E??x ?j\BV'n??\@Aru?0 ?m?F,k??*8A s????An?\@???j|?L??L4??K?????XDu?????Bq???|???^ ? "???k??_??*9???-@,j??H?? ???f_?^??T?l?g??,T@o?p?_q?iG?8?-?? ??@M???kn???Y????$??????????/|??s??\>???????????????"8????z?_? ? $x????? ?Q???A83Z???R?X?????Lzq??????0??x????3w??9??$La??u[`??|??_|???;v?m????o????S?|?}??g?yf ?? ??? ???c?5????????t???$ ???3k?9????}?????N??????F=1jA@?u>=\?U]SI??C?????f?8??1?4 ??4??65??Z\s?7????@????}?kO?\????o?????? 4?X?Ff? ???????m?.[Hq42W??/;????O???? ??k?????[?5???^*??9?????[a?7??o??A?M7?t??-[A?g&?9???/??O[?? Hz???????? +? ?? , ?=?f??N??*?:< [ /RGtMv?u???rm_^??!-?P?9}??w??]Fdn??????#?K|?S?z????~??x1????&?9?? Qd[???n??n!bnc+????i83?? ;2??C?_??-+????|??bm??O=?????????? ?????7???:?>%?SN9??? ???????? ????E?&?Q ci??? ?D??P?9???N!S??xB? ???UL?y???Z????;?????y]???3??a?g?7 06??d?A?? ?GQ t7j?B?H$??????!=NWY?? ??'a9f?4.Fq&?HB?O??_???????w?[??^d?$Q^G"?J???N ????"?`?K??B?9O????F"???K^ ?L?j??*????:U????>?????O?8??K?=?r?E?`s??wl?6_~q ?N?j???9?Y????2?y?S???M??9?I?:O,?2?U?_??????>?`?Z3s??K?|~q??T.???=???? ?_~?}|??,?&v)???N????-????n?P??f?E???R.?`ma$???T:q?????6O?1[????+??[???"c??Kc??.???;Q???9?????0??[?r??N???@oL? ???9???)i??Y???bs?w??? R?"??J?`????Rz?Ld,?r?????G`?\???( R`???^rX5?#?f????95 qqq???????J?r?|oR??u>???????}y?\?t08C\?????ZV??DF? {}~L?A!????k?s?f_C???????%&&??? ?x??a??L??N?I.?CJlm9^v8??????y??Z%??BH?>@?(??"?b?+? ?B?7???v??? ?q6}r?uZ??Jg?h ????,?F?z??]xrr?>??x?>???G?V???2 \9?+?? ?1?hr?Wuw????b???N???s_W?????????5p.Jc?'?+?&????????px?#?6??0t?>A0Y???m?wb???? ?? ? 2u;M?zL??([?-????L?=B?e??????f88??%??)?)?K?b ?????????Z??a???)??x???R/???(????u?'??F??6X??H???~V?? 5?2O  X.@???_c??1C?e?Z?_ ?z??{?eI?J|&`???I:????_r%I.???"d#S =c*??n??A ????????A-?G5X?z?as?V?S??&?t??IP4?3?A??}Z? h1:??bt ?vdS?U??#S???N?)?#?]???a]cj??y?+6|??A?h?l?????H??;?7????? ?2"?!?? b? 6????,?v?????q??C?*??WC???/V?_?? ?&-G??IQ?T?!}?  ,??"?l! K???? ??4?0?D?DA+??1?L??QI??q)qM?R??A?1&? 5????(?8?sm|???????o9?|?"B??4?l? ??v?6d j?? ??????????????I????G?? ?W{?*n0A??raN< KJ?7?I??M??tj??v'??(???!?}D??? +>?A?4??yDZ"w?5:=????????hO8c???9%=%I(?RA???]T G??mx???C??k???v???95 ??p8?.?r?/?oQ????????A}&F? ??s?g???kF$?y?Q?a????????\????????0?Ob??D?Mt?@?? ???CE???@?M???????N<!???/??c??+??W??? ??\ g?Z?S?-LB??9 ???PS???m?r_e6F?5????5P?U\ z????h?L??6 ??.C?r???{?H??9???*.?M{?a4 u?Td??qf??bY? ???$:a?  3d*U?c:8 ?5R@?`In!$?u??:??s????? @t??^??#9???????{?}IJ???R????3?U?q)?x?KS#;;?O?Pg?`???KI`$.-CuO?? ,!3$ ! ?u??v???x????_s???]?vI??y?;v?n8R7??????Y?Z??H??? ?c???q6!??= ??H?$??99H5?H ??1????B???n?RH@??????? ??90i???B`?)?$??20M??53? @ K??2Q??x?z??F??DY??~?????? '??R?3?:????qH? (?z?????(???ge???H??Fi??????p_3wN @????a??iT???XJ???7???M#rrH???:D"LF`??N:?L^? `??+????/?? ?42q:=2????h?????D? W???I?fd(?)SX?????`:G?!?W4_x???w? ?.???(? C&?@?@??]??g{??`G 1??????  "??iF???WDPc?P???????H??  @?i???ry?t??N?8_!?A` ???????1shh?????.*K?T??ELc?Fe ?T?%?A???t??|?8x?d??7?????@ZOg? ??????l?? dH?????6@?y ?: M?{?U??q`?f?? ~?F_u?  ??w?????~??? A~?d?????W/8?E?a????@  Q????#????????? @C?\?{ f` ?S??e8?????_F?` ?r ????????~??? (?? 4 M????;???? ?^?%"d mi? ????? ???}gxv? ???>?zv?T@?Ar  O80???? h??? ????? ? @??????????_???7778????l (I?????????3??????  HB!H$j???LF2:???? ??????v?#e?? ?Q'?15e?bp?$}}??0v??MR?&?????u`?|^????,??4 P&??Sj??m??L?V? ?W? ?E???*??wff?<v???!?:??c? ????5?Z?c?=?????a???????i?~!TrMWN?:^???????,d4tz??x?????J??h_g?=?{E??S!?_ 1?R??G???\?c??[ ??29v???X?:?`???O??B?X@SJ uz?>G??zh????|?;? ???J7????A&? 1;??&?????Pj??*??????LNL??????ek???L?k9MM5??m?D??w???o]??L??   ?u?? Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/psi/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 Nov 2004 05:14:00 -0000 1.4 +++ .cvsignore 12 Jan 2005 21:11:58 -0000 1.5 @@ -1,15 +1,19 @@ -psi-0.9.2.tar.bz2 -psi-icons.tar.bz2 psi_ca.qm.bz2 psi_cs.qm.bz2 -psi_de.qm.bz2 psi_el.qm.bz2 psi_es.qm.bz2 -psi_fr.qm.bz2 psi_it.qm.bz2 psi_mk.qm.bz2 +psi_se.qm.bz2 +psi-0.9.3.tar.bz2 +psi_de.qm.bz2 +psi_ee.qm.bz2 +psi_et.qm.bz2 +psi_fi.qm.bz2 +psi_fr.qm.bz2 psi_nl.qm.bz2 psi_pl.qm.bz2 -psi_se.qm.bz2 +psi_ru.qm.bz2 psi_sk.qm.bz2 +psi_sw.qm.bz2 psi_zh.qm.bz2 Index: psi.spec =================================================================== RCS file: /cvs/extras/rpms/psi/devel/psi.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- psi.spec 10 Nov 2004 02:05:46 -0000 1.6 +++ psi.spec 12 Jan 2005 21:11:58 -0000 1.7 @@ -1,33 +1,32 @@ # Psi has no KDE-specific feature yet, but it's in the TODO list %{!?_without_kde:%define with_kde 1} -Name: psi -Version: 0.9.2 -Release: 4 -Summary: Jabber client using Qt 3 +Name: psi +Version: 0.9.3 +Release: 1 +Summary: Jabber client using QT3 Epoch: 0 -License: GPL -Group: Applications/Internet -URL: http://psi.affinix.com/ -Source0: http://dl.sf.net/psi/psi-0.9.2.tar.bz2 -Source1: %name-icons.tar.bz2 +License: GPL +Group: Applications/Internet +URL: http://psi.affinix.com/ +Source0: http://dl.sf.net/psi/psi-0.9.3.tar.bz2 Source2: psi-uicwrapper.sh Patch1: psi-0.9.2-strip.patch Patch2: psi-0.9.2-mach-build.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel >= 1:3.1.1 -#BuildRequires: qt-designer >= 1:3.1.1 BuildRequires: XFree86-devel BuildRequires: zlib-devel BuildRequires: desktop-file-utils +BuildRequires: qca-devel %if 0%{?with_kde} BuildRequires: kdelibs-devel %endif -Requires: sox +Requires: sox Requires: gnupg -Requires: qca-tls # Language packs Source50: psi_pl.qm.bz2 @@ -35,9 +34,9 @@ Source52: psi_fr.qm.bz2 #Source53: psi_eo.qm.bz2 #Source54: psi_sr at Latn.qm.bz2 -#Source55: psi_fi.qm.bz2 +Source55: psi_fi.qm.bz2 Source56: psi_cs.qm.bz2 -#Source57: psi_ru.qm.bz2 +Source57: psi_ru.qm.bz2 Source58: psi_de.qm.bz2 Source59: psi_es.qm.bz2 Source60: psi_mk.qm.bz2 @@ -48,7 +47,9 @@ Source65: psi_se.qm.bz2 Source66: psi_ca.qm.bz2 Source67: psi_zh.qm.bz2 - +Source68: psi_sw.qm.bz2 +Source69: psi_ee.qm.bz2 +Source70: psi_et.qm.bz2 # Emoticonsets Source100: Chibi.jisp @@ -63,12 +64,14 @@ Source109: Ninja.jisp Source110: webmessenger.jisp - # Rostericonsets Source130: weather.jisp Source131: icqG.jisp Source132: gaduGaduG.jisp -#Source133: neos.jisp +Source133: http://www.cs.kuleuven.ac.be/~remko/psi/crystal/crystal_roster.jisp + +# System iconsets +Source160: http://www.cs.kuleuven.ac.be/~remko/psi/crystal/crystal_system.jisp %description @@ -86,23 +89,9 @@ %description -n %name-i18n This package adds internationalization to Psi. -Supported languages are: -- Polish (pl) -- French (fr) -- Spanish (es) -- Macedonian (mk) -- Dutch (nl) -- Slovak (sk) -- Cesky (cs) -- Catalan (ca) -- German (de) -- Simplified Chinese (zh) -- Italiano (it) -- Greek (el) -- Svenska (se) If you want to add a translation from http://psi.affinix.com, just put the .qm file in %_datadir/%name (you'll have to do -this as root) +this as root), and restart psi. %package -n %name-icons Summary: Additional icons for Psi @@ -119,23 +108,22 @@ %prep -%setup -q -a 1 +%setup -q # (ugly) hack to enable debuginfo subrpm %patch1 -p1 -b .strip # needed to build with mach %patch2 -p1 -b .mach-build %build -unset QTDIR -. %{_sysconfdir}/profile.d/qt.sh +[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh %if 0%{?with_kde} export KDEDIR=%(kde-config --prefix) %endif ./configure \ - --prefix=%{_prefix} \ - --bindir=%{_bindir} \ + --prefix=%{_prefix} \ + --bindir=%{_bindir} \ --libdir=%{_datadir}/%name \ --qtdir=$QTDIR @@ -151,8 +139,6 @@ %install rm -rf $RPM_BUILD_ROOT -unset QTDIR -. %{_sysconfdir}/profile.d/qt.sh export INSTALL_ROOT=$RPM_BUILD_ROOT make install #rm -f $RPM_BUILD_ROOT%{_datadir}/%name/{README,COPYING} @@ -164,9 +150,9 @@ %__bzip2 -dck %{SOURCE52} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_fr.qm #%__bzip2 -dck %{SOURCE53} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_eo.qm #%__bzip2 -dck %{SOURCE54} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_sr at Latn.qm -#%__bzip2 -dck %{SOURCE55} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_fi.qm +%__bzip2 -dck %{SOURCE55} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_fi.qm %__bzip2 -dck %{SOURCE56} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_cs.qm -#%__bzip2 -dck %{SOURCE57} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_ru.qm +%__bzip2 -dck %{SOURCE57} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_ru.qm %__bzip2 -dck %{SOURCE58} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_de.qm %__bzip2 -dck %{SOURCE59} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_es.qm %__bzip2 -dck %{SOURCE60} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_mk.qm @@ -177,6 +163,9 @@ %__bzip2 -dck %{SOURCE65} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_se.qm %__bzip2 -dck %{SOURCE66} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_ca.qm %__bzip2 -dck %{SOURCE67} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_zh.qm +%__bzip2 -dck %{SOURCE68} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_sw.qm +%__bzip2 -dck %{SOURCE69} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_ee.qm +%__bzip2 -dck %{SOURCE69} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_et.qm ## Install iconsets install -p %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/ @@ -194,7 +183,9 @@ install -p %{SOURCE130} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/ install -p %{SOURCE131} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/ install -p %{SOURCE132} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/ -#install -p %{SOURCE133} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/ +install -p %{SOURCE133} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/ + +install -p %{SOURCE160} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/system/ # Menu perl -pi -e 's/Icon=psi/Icon=psi.png/' $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/%{name}.desktop @@ -207,11 +198,8 @@ $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/%{name}.desktop # icon -install -p -D -m 644 %{name}48.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%name.png -install -p -D -m 644 %{name}32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%name.png -install -p -D -m 644 %{name}16.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%name.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -ln -s ../icons/hicolor/48x48/apps/%name.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%name.png +ln -s ../icons/hicolor/48x48/apps/psi.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%name.png %clean @@ -239,9 +227,25 @@ %changelog -* Wed Nov 10 2004 Michael Schwendt - 0:0.9.2-4 -- Fix build for FC3 (define QTDIR in install section). -- Bump package release. +* Sun Jan 09 2005 Aurelien Bompard 0:0.9.3-1 +- version 0.9.3 final + +* Mon Jan 03 2005 Aurelien Bompard 0:0.9.3-0.fdr.0.3.test2 +- version 0.9.3-test2 + +* Thu Nov 25 2004 Aurelien Bompard 0:0.9.3-0.fdr.0.2.test1 +- Drop hardcoded requirement on qca-tls, it should be a plugin + +* Mon Nov 22 2004 Aurelien Bompard 0:0.9.3-0.fdr.0.1.test1 +- update to 0.9.3test1 +- use the provided icon in the menu and drop Source1. +- add crystal iconset +- added Russian and Eesti translations + +* Sat Sep 18 2004 Aurelien Bompard 0:0.9.2-0.fdr.3 +- add patch for typing notification +- add crystal iconset +- update translations (adding kiswahili and Eesti) * Fri Jun 11 2004 Aurelien Bompard 0:0.9.2-0.fdr.2 - split qca-tls out of this package and require it Index: sources =================================================================== RCS file: /cvs/extras/rpms/psi/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Nov 2004 05:14:00 -0000 1.4 +++ sources 12 Jan 2005 21:11:58 -0000 1.5 @@ -1,15 +1,19 @@ -e29f90aea7d839f2a70e4a6e77e95a70 psi-0.9.2.tar.bz2 -d8d5faecb51ea9b7e814e75b3cfa15f2 psi-icons.tar.bz2 1689645b1e2bf181c6fc2d68f070cf0d psi_ca.qm.bz2 69f88fc4768d963bed4cd3ebfbb75a28 psi_cs.qm.bz2 -8cf8142dc0f00b3169d9ba8fdd4793a5 psi_de.qm.bz2 da61ff1ec70cf90357d78f6c81d0ad86 psi_el.qm.bz2 c831c0924c363e8bac42aab577f6982d psi_es.qm.bz2 -8b525df4dce83f5115d92bca5526ca26 psi_fr.qm.bz2 022996fd1f35f26a777f07d667071421 psi_it.qm.bz2 3e1ac01eaf5451f1b1d0968b2f911983 psi_mk.qm.bz2 -084cf4d01df12cd44a3b02e58f75c30a psi_nl.qm.bz2 -02f712f564a07b8fbd3beae0107cc19f psi_pl.qm.bz2 8cc619e6752d6c4db5093eca5d458f0a psi_se.qm.bz2 -e0c9220a54d2622478599cb94c1c38b8 psi_sk.qm.bz2 -5399ddcc710b216c2b816162b7c2f0ba psi_zh.qm.bz2 +d20f3bb530235a246bc2d92308089744 psi-0.9.3.tar.bz2 +52611e036dd0b7cb2ecadcf16eeb9632 psi_de.qm.bz2 +2e19193ebcfd59f80badf011714a2c82 psi_ee.qm.bz2 +2e19193ebcfd59f80badf011714a2c82 psi_et.qm.bz2 +74053f86b57bd74be4b2866dd02b730d psi_fi.qm.bz2 +dd8f83f3c3fc1c20d094f6570acaad4b psi_fr.qm.bz2 +a0cc2e82074a2be17c5ad0004747ac43 psi_nl.qm.bz2 +d3418d4383e47f37f7fedbbc9591db6c psi_pl.qm.bz2 +5e701ee8f56b01c65f3097f5ba13f63c psi_ru.qm.bz2 +784e291e51e4746b602e182ab9ec3ac2 psi_sk.qm.bz2 +a5570c823cfbe33ee602110b89cf4e16 psi_sw.qm.bz2 +38629928c813dc54fc04b38de5e6dcee psi_zh.qm.bz2 From fedora at wir-sind-cool.org Wed Jan 12 21:30:51 2005 From: fedora at wir-sind-cool.org (Michael Schwendt) Date: Wed, 12 Jan 2005 22:30:51 +0100 Subject: rpms/psi/devel crystal_roster.jisp, NONE, 1.1 crystal_system.jisp, NONE, 1.1 .cvsignore, 1.4, 1.5 psi.spec, 1.6, 1.7 sources, 1.4, 1.5 In-Reply-To: <200501122112.j0CLC07b016334@cvs.fedora.redhat.com> References: <200501122112.j0CLC07b016334@cvs.fedora.redhat.com> Message-ID: <20050112223051.4fbc086f.fedora@wir-sind-cool.org> On Wed, 12 Jan 2005 16:12:00 -0500, Michael Schwendt (mschwendt) wrote: > Author: mschwendt > > Update of /cvs/extras/rpms/psi/devel > In directory cvs.fedora.redhat.com:/tmp/cvs-serv16321/devel > > Modified Files: > .cvsignore psi.spec sources > Added Files: > crystal_roster.jisp crystal_system.jisp > Log Message: > auto-import psi-0.9.3-1 on branch devel from psi-0.9.3-1.src.rpm > > > --- NEW FILE crystal_roster.jisp --- > PK > > Here's room for improvement in a future package revision. Probably, wrapping up all the .jisp files (~500K in total!) into a tgz or zip, so they are uploaded into the lookaside cache automatically. Alternatively, adding .jisp to the recognized file extensions. From gafton at redhat.com Wed Jan 12 21:50:05 2005 From: gafton at redhat.com (Cristian Gafton) Date: Wed, 12 Jan 2005 16:50:05 -0500 (EST) Subject: rpms/psi/devel crystal_roster.jisp, NONE, 1.1 crystal_system.jisp, NONE, 1.1 .cvsignore, 1.4, 1.5 psi.spec, 1.6, 1.7 sources, 1.4, 1.5 In-Reply-To: <20050112223051.4fbc086f.fedora@wir-sind-cool.org> References: <200501122112.j0CLC07b016334@cvs.fedora.redhat.com> <20050112223051.4fbc086f.fedora@wir-sind-cool.org> Message-ID: On Wed, 12 Jan 2005, Michael Schwendt wrote: > On Wed, 12 Jan 2005 16:12:00 -0500, Michael Schwendt (mschwendt) wrote: > >> Author: mschwendt >> >> Update of /cvs/extras/rpms/psi/devel >> In directory cvs.fedora.redhat.com:/tmp/cvs-serv16321/devel >> >> Modified Files: >> .cvsignore psi.spec sources >> Added Files: >> crystal_roster.jisp crystal_system.jisp >> Log Message: >> auto-import psi-0.9.3-1 on branch devel from psi-0.9.3-1.src.rpm >> >> >> --- NEW FILE crystal_roster.jisp --- >> PK What the hell is a .jisp? > Here's room for improvement in a future package revision. Probably, > wrapping up all the .jisp files (~500K in total!) into a tgz or zip, so > they are uploaded into the lookaside cache automatically. Alternatively, > adding .jisp to the recognized file extensions. I'd strongly recommend putting all the unkonwn binary files into such an archive - one can take a look at the cvs-import.sh script to figure out how certain file extensions end up in the lookaside cache instead of being checked into CVS... Cristian -- ---------------------------------------------------------------------- Cristian Gafton -- gafton at redhat.com -- Red Hat, Inc. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ "Linux is a leprosy; and is having a deleterious effect on the U.S. IT industry because it is steadily depreciating the value of the software industry sector." -- Kenneth Brown, President, Alexis de Tocqueville Institution From fedora at wir-sind-cool.org Wed Jan 12 21:58:45 2005 From: fedora at wir-sind-cool.org (Michael Schwendt) Date: Wed, 12 Jan 2005 22:58:45 +0100 Subject: rpms/psi/devel crystal_roster.jisp, NONE, 1.1 crystal_system.jisp, NONE, 1.1 .cvsignore, 1.4, 1.5 psi.spec, 1.6, 1.7 sources, 1.4, 1.5 In-Reply-To: References: <200501122112.j0CLC07b016334@cvs.fedora.redhat.com> <20050112223051.4fbc086f.fedora@wir-sind-cool.org> Message-ID: <20050112225845.68798802.fedora@wir-sind-cool.org> On Wed, 12 Jan 2005 16:50:05 -0500 (EST), Cristian Gafton wrote: > >> --- NEW FILE crystal_roster.jisp --- > >> PK > > What the hell is a .jisp? application/vnd.jisp -- Jabber icon style packages (ZIPped) > > Here's room for improvement in a future package revision. Probably, > > wrapping up all the .jisp files (~500K in total!) into a tgz or zip, so > > they are uploaded into the lookaside cache automatically. Alternatively, > > adding .jisp to the recognized file extensions. > > I'd strongly recommend putting all the unkonwn binary files into such an > archive - one can take a look at the cvs-import.sh script to figure out > how certain file extensions end up in the lookaside cache instead of being > checked into CVS... Yes, but too late for the auto-imported old packages (rh9-fc2). From gafton at redhat.com Wed Jan 12 22:38:36 2005 From: gafton at redhat.com (Cristian Gafton) Date: Wed, 12 Jan 2005 17:38:36 -0500 (EST) Subject: rpms/psi/devel crystal_roster.jisp, NONE, 1.1 crystal_system.jisp, NONE, 1.1 .cvsignore, 1.4, 1.5 psi.spec, 1.6, 1.7 sources, 1.4, 1.5 In-Reply-To: <20050112225845.68798802.fedora@wir-sind-cool.org> References: <200501122112.j0CLC07b016334@cvs.fedora.redhat.com> <20050112223051.4fbc086f.fedora@wir-sind-cool.org> <20050112225845.68798802.fedora@wir-sind-cool.org> Message-ID: On Wed, 12 Jan 2005, Michael Schwendt wrote: >>> Here's room for improvement in a future package revision. Probably, >>> wrapping up all the .jisp files (~500K in total!) into a tgz or zip, so >>> they are uploaded into the lookaside cache automatically. Alternatively, >>> adding .jisp to the recognized file extensions. >> >> I'd strongly recommend putting all the unkonwn binary files into such an >> archive - one can take a look at the cvs-import.sh script to figure out >> how certain file extensions end up in the lookaside cache instead of being >> checked into CVS... > > Yes, but too late for the auto-imported old packages (rh9-fc2). Nah, you can move that shite into the lookaside cache. make upload FILES=.... cvs remove .... cvs commit Cristian -- ---------------------------------------------------------------------- Cristian Gafton -- gafton at redhat.com -- Red Hat, Inc. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ "Linux is a leprosy; and is having a deleterious effect on the U.S. IT industry because it is steadily depreciating the value of the software industry sector." -- Kenneth Brown, President, Alexis de Tocqueville Institution From fedora-extras-commits at redhat.com Thu Jan 13 05:21:52 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 00:21:52 -0500 Subject: rpms/psi/RHL-9 apple_ichat-1.0.jisp, 1.1, NONE Chibi.jisp, 1.1, NONE gaduGaduG.jisp, 1.1, NONE icqG.jisp, 1.1, NONE KMess-Cartoon-1.0.jisp, 1.1, NONE kreativ_squareheads.jisp, 1.1, NONE Ninja.jisp, 1.1, NONE shinyicons.jisp, 1.1, NONE tlen.pl-3.73.jisp, 1.1, NONE trill-extra-smileys.jisp, 1.1, NONE trill-extra-symbols.jisp, 1.1, NONE weather.jisp, 1.1, NONE webmessenger.jisp, 1.1, NONE yahoo_messenger.jisp, 1.1, NONE Message-ID: <200501130521.j0D5LqNb025104@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/psi/RHL-9 In directory cvs.fedora.redhat.com:/tmp/cvs-serv25098 Removed Files: apple_ichat-1.0.jisp Chibi.jisp gaduGaduG.jisp icqG.jisp KMess-Cartoon-1.0.jisp kreativ_squareheads.jisp Ninja.jisp shinyicons.jisp tlen.pl-3.73.jisp trill-extra-smileys.jisp trill-extra-symbols.jisp weather.jisp webmessenger.jisp yahoo_messenger.jisp Log Message: Move Jabber icon style packages into lookaside cache manually. --- apple_ichat-1.0.jisp DELETED --- --- Chibi.jisp DELETED --- --- gaduGaduG.jisp DELETED --- --- icqG.jisp DELETED --- --- KMess-Cartoon-1.0.jisp DELETED --- --- kreativ_squareheads.jisp DELETED --- --- Ninja.jisp DELETED --- --- shinyicons.jisp DELETED --- --- tlen.pl-3.73.jisp DELETED --- --- trill-extra-smileys.jisp DELETED --- --- trill-extra-symbols.jisp DELETED --- --- weather.jisp DELETED --- --- webmessenger.jisp DELETED --- --- yahoo_messenger.jisp DELETED --- From fedora-extras-commits at redhat.com Thu Jan 13 05:24:52 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 00:24:52 -0500 Subject: rpms/psi/FC-1 sources, 1.4, 1.5 apple_ichat-1.0.jisp, 1.1, NONE Chibi.jisp, 1.1, NONE gaduGaduG.jisp, 1.1, NONE icqG.jisp, 1.1, NONE KMess-Cartoon-1.0.jisp, 1.1, NONE kreativ_squareheads.jisp, 1.1, NONE Ninja.jisp, 1.1, NONE shinyicons.jisp, 1.1, NONE tlen.pl-3.73.jisp, 1.1, NONE trill-extra-smileys.jisp, 1.1, NONE trill-extra-symbols.jisp, 1.1, NONE weather.jisp, 1.1, NONE webmessenger.jisp, 1.1, NONE yahoo_messenger.jisp, 1.1, NONE Message-ID: <200501130524.j0D5OqrN025175@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/psi/FC-1 In directory cvs.fedora.redhat.com:/tmp/cvs-serv25166/d Modified Files: sources Removed Files: apple_ichat-1.0.jisp Chibi.jisp gaduGaduG.jisp icqG.jisp KMess-Cartoon-1.0.jisp kreativ_squareheads.jisp Ninja.jisp shinyicons.jisp tlen.pl-3.73.jisp trill-extra-smileys.jisp trill-extra-symbols.jisp weather.jisp webmessenger.jisp yahoo_messenger.jisp Log Message: Move Jabber icon style packages into lookaside cache manually. Index: sources =================================================================== RCS file: /cvs/extras/rpms/psi/FC-1/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Nov 2004 05:13:50 -0000 1.4 +++ sources 13 Jan 2005 05:24:50 -0000 1.5 @@ -13,3 +13,17 @@ 8cc619e6752d6c4db5093eca5d458f0a psi_se.qm.bz2 e0c9220a54d2622478599cb94c1c38b8 psi_sk.qm.bz2 5399ddcc710b216c2b816162b7c2f0ba psi_zh.qm.bz2 +259f0351152852d8091b092440557bab apple_ichat-1.0.jisp +6d98db4a5fab3c5909a422d983ed336f Chibi.jisp +a4aada51bbf57c17c2bfda5ba52717ec gaduGaduG.jisp +9d8b4be36909c235657d61698846aee1 icqG.jisp +459d5feae7cf05210f10ffd8df9ac93f KMess-Cartoon-1.0.jisp +f1760382d3aea32199aeb7303493a9ea kreativ_squareheads.jisp +cbe6f581bf32a2cb56e8bf5871db639d Ninja.jisp +9ec2c600f390dc725e4793383ff50ec2 shinyicons.jisp +099c70f9ca25623c89e3ba5b44af2e6d tlen.pl-3.73.jisp +6a3065d33b072e15decbfb3673028df6 trill-extra-smileys.jisp +b743f3f65dfe526b6d730044031d5c78 trill-extra-symbols.jisp +be98902383c572fd3cd6876a6940a73e weather.jisp +0a2ce25ab4506d563bf65da372c9f8f4 webmessenger.jisp +747a785fdaae8dc5a5ee78a3253035ab yahoo_messenger.jisp --- apple_ichat-1.0.jisp DELETED --- --- Chibi.jisp DELETED --- --- gaduGaduG.jisp DELETED --- --- icqG.jisp DELETED --- --- KMess-Cartoon-1.0.jisp DELETED --- --- kreativ_squareheads.jisp DELETED --- --- Ninja.jisp DELETED --- --- shinyicons.jisp DELETED --- --- tlen.pl-3.73.jisp DELETED --- --- trill-extra-smileys.jisp DELETED --- --- trill-extra-symbols.jisp DELETED --- --- weather.jisp DELETED --- --- webmessenger.jisp DELETED --- --- yahoo_messenger.jisp DELETED --- From fedora-extras-commits at redhat.com Thu Jan 13 05:24:52 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 00:24:52 -0500 Subject: rpms/psi/RHL-9 sources,1.4,1.5 Message-ID: <200501130524.j0D5Oqkt025179@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/psi/RHL-9 In directory cvs.fedora.redhat.com:/tmp/cvs-serv25166/RHL-9 Modified Files: sources Log Message: Move Jabber icon style packages into lookaside cache manually. Index: sources =================================================================== RCS file: /cvs/extras/rpms/psi/RHL-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Nov 2004 05:13:41 -0000 1.4 +++ sources 13 Jan 2005 05:24:50 -0000 1.5 @@ -13,3 +13,17 @@ 8cc619e6752d6c4db5093eca5d458f0a psi_se.qm.bz2 e0c9220a54d2622478599cb94c1c38b8 psi_sk.qm.bz2 5399ddcc710b216c2b816162b7c2f0ba psi_zh.qm.bz2 +259f0351152852d8091b092440557bab apple_ichat-1.0.jisp +6d98db4a5fab3c5909a422d983ed336f Chibi.jisp +a4aada51bbf57c17c2bfda5ba52717ec gaduGaduG.jisp +9d8b4be36909c235657d61698846aee1 icqG.jisp +459d5feae7cf05210f10ffd8df9ac93f KMess-Cartoon-1.0.jisp +f1760382d3aea32199aeb7303493a9ea kreativ_squareheads.jisp +cbe6f581bf32a2cb56e8bf5871db639d Ninja.jisp +9ec2c600f390dc725e4793383ff50ec2 shinyicons.jisp +099c70f9ca25623c89e3ba5b44af2e6d tlen.pl-3.73.jisp +6a3065d33b072e15decbfb3673028df6 trill-extra-smileys.jisp +b743f3f65dfe526b6d730044031d5c78 trill-extra-symbols.jisp +be98902383c572fd3cd6876a6940a73e weather.jisp +0a2ce25ab4506d563bf65da372c9f8f4 webmessenger.jisp +747a785fdaae8dc5a5ee78a3253035ab yahoo_messenger.jisp From fedora-extras-commits at redhat.com Thu Jan 13 05:27:25 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 00:27:25 -0500 Subject: rpms/psi/devel sources, 1.5, 1.6 apple_ichat-1.0.jisp, 1.1, NONE Chibi.jisp, 1.1, NONE crystal_roster.jisp, 1.1, NONE crystal_system.jisp, 1.1, NONE gaduGaduG.jisp, 1.1, NONE icqG.jisp, 1.1, NONE KMess-Cartoon-1.0.jisp, 1.1, NONE kreativ_squareheads.jisp, 1.1, NONE Ninja.jisp, 1.1, NONE shinyicons.jisp, 1.1, NONE tlen.pl-3.73.jisp, 1.1, NONE trill-extra-smileys.jisp, 1.1, NONE trill-extra-symbols.jisp, 1.1, NONE weather.jisp, 1.1, NONE webmessenger.jisp, 1.1, NONE yahoo_messenger.jisp, 1.1, NONE Message-ID: <200501130527.j0D5RPgA025265@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/psi/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25259 Modified Files: sources Removed Files: apple_ichat-1.0.jisp Chibi.jisp crystal_roster.jisp crystal_system.jisp gaduGaduG.jisp icqG.jisp KMess-Cartoon-1.0.jisp kreativ_squareheads.jisp Ninja.jisp shinyicons.jisp tlen.pl-3.73.jisp trill-extra-smileys.jisp trill-extra-symbols.jisp weather.jisp webmessenger.jisp yahoo_messenger.jisp Log Message: Move Jabber icon style packages into lookaside cache manually. Index: sources =================================================================== RCS file: /cvs/extras/rpms/psi/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 12 Jan 2005 21:11:58 -0000 1.5 +++ sources 13 Jan 2005 05:27:23 -0000 1.6 @@ -17,3 +17,19 @@ 784e291e51e4746b602e182ab9ec3ac2 psi_sk.qm.bz2 a5570c823cfbe33ee602110b89cf4e16 psi_sw.qm.bz2 38629928c813dc54fc04b38de5e6dcee psi_zh.qm.bz2 +259f0351152852d8091b092440557bab apple_ichat-1.0.jisp +6d98db4a5fab3c5909a422d983ed336f Chibi.jisp +14f8bdbea1873b2972d56726c4c011cf crystal_roster.jisp +ee56b25a85ec3ddef64339e177f7028d crystal_system.jisp +a4aada51bbf57c17c2bfda5ba52717ec gaduGaduG.jisp +9d8b4be36909c235657d61698846aee1 icqG.jisp +459d5feae7cf05210f10ffd8df9ac93f KMess-Cartoon-1.0.jisp +f1760382d3aea32199aeb7303493a9ea kreativ_squareheads.jisp +cbe6f581bf32a2cb56e8bf5871db639d Ninja.jisp +9ec2c600f390dc725e4793383ff50ec2 shinyicons.jisp +099c70f9ca25623c89e3ba5b44af2e6d tlen.pl-3.73.jisp +6a3065d33b072e15decbfb3673028df6 trill-extra-smileys.jisp +b743f3f65dfe526b6d730044031d5c78 trill-extra-symbols.jisp +be98902383c572fd3cd6876a6940a73e weather.jisp +0a2ce25ab4506d563bf65da372c9f8f4 webmessenger.jisp +747a785fdaae8dc5a5ee78a3253035ab yahoo_messenger.jisp --- apple_ichat-1.0.jisp DELETED --- --- Chibi.jisp DELETED --- --- crystal_roster.jisp DELETED --- --- crystal_system.jisp DELETED --- --- gaduGaduG.jisp DELETED --- --- icqG.jisp DELETED --- --- KMess-Cartoon-1.0.jisp DELETED --- --- kreativ_squareheads.jisp DELETED --- --- Ninja.jisp DELETED --- --- shinyicons.jisp DELETED --- --- tlen.pl-3.73.jisp DELETED --- --- trill-extra-smileys.jisp DELETED --- --- trill-extra-symbols.jisp DELETED --- --- weather.jisp DELETED --- --- webmessenger.jisp DELETED --- --- yahoo_messenger.jisp DELETED --- From wtogami at redhat.com Thu Jan 13 06:11:28 2005 From: wtogami at redhat.com (Warren Togami) Date: Wed, 12 Jan 2005 20:11:28 -1000 Subject: rpms/psi/devel crystal_roster.jisp, NONE, 1.1 crystal_system.jisp, NONE, 1.1 .cvsignore, 1.4, 1.5 psi.spec, 1.6, 1.7 sources, 1.4, 1.5 In-Reply-To: References: <200501122112.j0CLC07b016334@cvs.fedora.redhat.com> <20050112223051.4fbc086f.fedora@wir-sind-cool.org> Message-ID: <41E61110.60100@redhat.com> Cristian Gafton wrote: > > I'd strongly recommend putting all the unkonwn binary files into such an > archive - one can take a look at the cvs-import.sh script to figure out > how certain file extensions end up in the lookaside cache instead of > being checked into CVS... > > Cristian If and when you do create archives, please use unique version numbers on that file name. Warren From fedora-extras-commits at redhat.com Thu Jan 13 06:26:08 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 13 Jan 2005 01:26:08 -0500 Subject: rpms/anthy - New directory Message-ID: <200501130626.j0D6Q8HO026171@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/anthy In directory cvs.fedora.redhat.com:/tmp/cvs-serv26158/anthy Log Message: Directory /cvs/extras/rpms/anthy added to the repository From fedora-extras-commits at redhat.com Thu Jan 13 06:26:08 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 13 Jan 2005 01:26:08 -0500 Subject: rpms/anthy/devel - New directory Message-ID: <200501130626.j0D6Q8hs026174@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/anthy/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv26158/anthy/devel Log Message: Directory /cvs/extras/rpms/anthy/devel added to the repository From fedora-extras-commits at redhat.com Thu Jan 13 06:26:40 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 13 Jan 2005 01:26:40 -0500 Subject: rpms/anthy Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501130626.j0D6Qevg026254@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/anthy In directory cvs.fedora.redhat.com:/tmp/cvs-serv26239 Added Files: Makefile import.log Log Message: Setup of module anthy --- NEW FILE Makefile --- # Top level Makefile for module anthy all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 13 06:26:40 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 13 Jan 2005 01:26:40 -0500 Subject: rpms/anthy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501130626.j0D6Qeur026257@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/anthy/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv26239/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module anthy --- NEW 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 Jan 13 06:27:50 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 13 Jan 2005 01:27:50 -0500 Subject: rpms/anthy import.log,1.1,1.2 Message-ID: <200501130627.j0D6RoVG026403@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/anthy In directory cvs.fedora.redhat.com:/tmp/cvs-serv26388 Modified Files: import.log Log Message: auto-import anthy-6024-1 on branch devel from anthy-6024-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/anthy/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Jan 2005 06:26:38 -0000 1.1 +++ import.log 13 Jan 2005 06:27:48 -0000 1.2 @@ -0,0 +1 @@ +anthy-6024-1:HEAD:anthy-6024-1.src.rpm:1105597663 From fedora-extras-commits at redhat.com Thu Jan 13 06:27:50 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 13 Jan 2005 01:27:50 -0500 Subject: rpms/anthy/devel anthy-init.el, NONE, 1.1 anthy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501130627.j0D6RoR1026407@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/anthy/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv26388/devel Modified Files: .cvsignore sources Added Files: anthy-init.el anthy.spec Log Message: auto-import anthy-6024-1 on branch devel from anthy-6024-1.src.rpm --- NEW FILE anthy-init.el --- ;; anthy-init.el ;; (if (featurep 'xemacs) (setq load-path (cons "/usr/share/xemacs/xemacs-packages/lisp/anthy" load-path)) (setq load-path (cons "/usr/share/emacs/site-lisp/anthy" load-path))) (autoload 'anthy-leim-activate "anthy" nil t) (register-input-method "japanese-anthy" "Japanese" 'anthy-leim-activate "[anthy]" "Anthy Kana Kanji conversion system") --- NEW FILE anthy.spec --- %define version 6024 Name: anthy Version: %{version} Release: 1 License: GPL Group: System Environment/Libraries URL: http://sourceforge.jp/projects/anthy/ Buildroot: %{_tmppath}/%{name}-%{version}-buildroot BuildRequires: emacs xemacs Source0: http://prdownloads.sourceforge.jp/anthy/9723/anthy-%{version}.tar.gz Source1: anthy-init.el Summary: A Japanese character set input library %description Anthy provides the library to input Japanese on the applications, such as X applications and emacs. and the user dictionaries and the users information which is used for the conversion, is stored into their own home directory. So Anthy is secure than other conversion server. %package libs Summary: Runtime library for Anthy Group: System Environment/Libraries %description libs The anthy-libs package contains the runtime library to get working the programs which uses Anthy, Japanese character set input library. %package devel Summary: Header files and library for developing programs which uses Anthy Group: Development/Libraries Requires: anthy-libs = %{version}-%{release} %description devel The anthy-devel package contains the development files which is needed to build the programs which uses Anthy. %package el Summary: Emacs Lisp files to use Anthy on Emacs Group: System Environment/Libraries Requires: emacs Requires: anthy = %{version}-%{release} %description el The anthy-el package contains the emacs lisp to be able to input Japanese character set on Emacs. %package el-xemacs Summary: Emacs Lisp files to use Anthy on XEmacs Group: System Environment/Libraries Requires: xemacs Requires: anthy = %{version}-%{release} %description el-xemacs The anthy-el-xemacs package contains the emacs lisp to be able to input Japanese character set on XEmacs. %prep %setup -q %build %configure make %install rm -rf $RPM_BUILD_ROOT %makeinstall ## for anthy-el %__mkdir_p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d ## for anthy-el-xemacs %__mkdir_p $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d pushd $RPM_BUILD_DIR/%{name}-%{version}/src-util make clean make EMACS=xemacs lispdir="\${datadir}/xemacs/xemacs-packages/lisp/anthy" make install-lispLISP DESTDIR=$RPM_BUILD_ROOT EMACS=xemacs lispdir="\${datadir}/xemacs/xemacs-packages/lisp/anthy" popd %clean rm -rf $RPM_BUILD_ROOT %files %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog DIARY NEWS README doc %{_bindir}/* %{_sysconfdir}/* %{_datadir}/anthy/* %files libs %defattr (-, root, root) %{_libdir}/lib*.so.* %files devel %defattr (-, root, root) %{_includedir}/* %{_libdir}/lib*.so %{_libdir}/lib*.a %{_libdir}/lib*.la %{_libdir}/pkgconfig %files el %defattr (-, root, root) %{_datadir}/emacs/site-lisp/anthy/* %{_datadir}/emacs/site-lisp/site-start.d/anthy-init.el %files el-xemacs %defattr (-, root, root) %{_datadir}/xemacs/xemacs-packages/lisp/anthy/* %{_datadir}/xemacs/site-packages/lisp/site-start.d/anthy-init.el %changelog * Wed Jan 12 2005 Akira TAGOH - 6024-1 - New upstream release. * Wed Sep 08 2004 Akira TAGOH 5704-1 - New upstream release. * Mon Jul 05 2004 Akira TAGOH 5500-1 - New upstream release. * Wed Jun 23 2004 Akira TAGOH 5414-1 - New upstream release. * Tue Jun 08 2004 Akira TAGOH 5406-1 - New upstream release. * Fri Jun 04 2004 Warren Togami 5330-3 - some spec cleanups * Tue Jun 01 2004 Akira TAGOH 5330-2 - anthy-init.el: add some elisp to configure anthy. * Tue Jun 01 2004 Akira TAGOH 5330-1 - Initial package. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/anthy/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Jan 2005 06:26:38 -0000 1.1 +++ .cvsignore 13 Jan 2005 06:27:48 -0000 1.2 @@ -0,0 +1 @@ +anthy-6024.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/anthy/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Jan 2005 06:26:38 -0000 1.1 +++ sources 13 Jan 2005 06:27:48 -0000 1.2 @@ -0,0 +1 @@ +9cdedd9d4f384131c09a5b3fc5c097e6 anthy-6024.tar.gz From fedora-extras-commits at redhat.com Thu Jan 13 06:29:45 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 13 Jan 2005 01:29:45 -0500 Subject: rpms/uim - New directory Message-ID: <200501130629.j0D6TjMv026569@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/uim In directory cvs.fedora.redhat.com:/tmp/cvs-serv26556/uim Log Message: Directory /cvs/extras/rpms/uim added to the repository From fedora-extras-commits at redhat.com Thu Jan 13 06:29:45 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 13 Jan 2005 01:29:45 -0500 Subject: rpms/uim/devel - New directory Message-ID: <200501130629.j0D6Tj3h026572@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/uim/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv26556/uim/devel Log Message: Directory /cvs/extras/rpms/uim/devel added to the repository From fedora-extras-commits at redhat.com Thu Jan 13 06:30:02 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 13 Jan 2005 01:30:02 -0500 Subject: rpms/uim Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501130630.j0D6U2TN026651@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/uim In directory cvs.fedora.redhat.com:/tmp/cvs-serv26636 Added Files: Makefile import.log Log Message: Setup of module uim --- NEW FILE Makefile --- # Top level Makefile for module uim all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 13 06:30:02 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 13 Jan 2005 01:30:02 -0500 Subject: rpms/uim/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501130630.j0D6U2nw026654@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/uim/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv26636/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module uim --- NEW 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 Jan 13 06:30:57 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 13 Jan 2005 01:30:57 -0500 Subject: rpms/uim import.log,1.1,1.2 Message-ID: <200501130630.j0D6Uvfb026783@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/uim In directory cvs.fedora.redhat.com:/tmp/cvs-serv26768 Modified Files: import.log Log Message: auto-import uim-0.4.5-1 on branch devel from uim-0.4.5-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/uim/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Jan 2005 06:30:00 -0000 1.1 +++ import.log 13 Jan 2005 06:30:55 -0000 1.2 @@ -0,0 +1 @@ +uim-0_4_5-1:HEAD:uim-0.4.5-1.src.rpm:1105597849 From fedora-extras-commits at redhat.com Thu Jan 13 06:30:57 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 13 Jan 2005 01:30:57 -0500 Subject: rpms/uim/devel uim.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501130630.j0D6UvMn026787@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/uim/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv26768/devel Modified Files: .cvsignore sources Added Files: uim.spec Log Message: auto-import uim-0.4.5-1 on branch devel from uim-0.4.5-1.src.rpm --- NEW FILE uim.spec --- Summary: A multilingual input method library Name: uim Version: 0.4.5 Release: 1 License: GPL/BSD Group: System Environment/Libraries URL: http://freedesktop.org/Software/uim Source0: http://freedesktop.org/Software/UimDownload/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gtk2-devel BuildRequires: gnome-panel-devel %package devel Summary: Development files for the Uim library Group: Development/Libraries Requires: uim = %{version}-%{release} %package gtk2 Summary: GTK+2 support for Uim Group: User Interface/Desktops Requires: uim = %{version}-%{release} Requires(post,postun): gtk2 %package gnome Summary: GNOME Applet for Uim Group: User Interface/Desktops Requires: uim = %{version}-%{release} Requires(post,postun): %{_sbindir}/bonobo-activation-sysconf %package anthy Summary: Anthy support for Uim Group: System Environment/Libraries Requires: anthy Requires: uim = %{version}-%{release} Requires(post,postun): gtk2 %package canna Summary: Canna support for Uim Group: System Environment/Libraries Requires: Canna Canna-devel Requires: uim = %{version}-%{release} Requires(post,postun): gtk2 %package skk Summary: SKK support for Uim Group: System Environment/Libraries Requires: skkdic Requires: uim = %{version}-%{release} Requires(post,postun): gtk2 %description Uim is a multilingual input method library. Uim aims to provide secure and useful input methods for all languages. Currently, it can input to applications which support Gtk+'s immodule or XIM. This package provides the input method library, the XIM bridge and most of the input methods. For the Japanese input methods you need to install - uim-anthy for Anthy - uim-canna for Canna - uim-skk for SKK. %description devel Uim is a multilingual input method library. Uim aims to provide secure and useful input methods for all languages. Currently, it can input to applications which support Gtk+'s immodule or XIM. This package contains the header files and the libraries which is needed for developing Uim applications. %description gtk2 Uim is a multilingual input method library. Uim aims to provide secure and useful input methods for all languages. Currently, it can input to applications which support Gtk+'s immodule or XIM. This package provides the Gtk IM module and helper program. %description gnome Uim is a multilingual input method library. Uim aims to provide secure and useful input methods for all languages. Currently, it can input to applications which support Gtk+'s immodule or XIM. This package provides the GNOME panel applet. %description anthy This package provides support for Anthy, a Japanese input method. %description canna This package provides support for Canna, a Japanese input method. %description skk This package provides support for SKK, a Japanese input method. %define gtk_im_update ( [ -x "%{_bindir}/update-gtk-immodules" ] && %{_bindir}/update-gtk-immodules %{_arch}-%{_host_vendor}-%{_host_os} ) || ( [ -x "%{_bindir}/gtk-query-immodules-2.0" ] && %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules ) %prep %setup -q %build %configure make %install rm -rf $RPM_BUILD_ROOT %makeinstall %find_lang %{name} find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "(anthy|canna|skk|uim-sh)" > scm.list cat scm.list | sed -e s,$RPM_BUILD_ROOT,,g >> %{name}.lang # compress large doc bzip2 ChangeLog %clean rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig %postun /sbin/ldconfig %post gtk2 umask 022 %{gtk_im_update} %postun gtk2 umask 022 if [ $1 = 0 ]; then %{gtk_im_update} fi %post gnome bonobo-activation-sysconf --add-directory=%{_libdir}/bonobo/servers > /dev/null %postun gnome bonobo-activation-sysconf --remove-directory=%{_libdir}/bonobo/servers %post anthy umask 022 %{gtk_im_update} %postun anthy umask 022 if [ $1 = 0 ]; then %{gtk_im_update} fi %post canna umask 022 %{gtk_im_update} %postun canna umask 022 if [ $1 = 0 ]; then %{gtk_im_update} fi %post skk umask 022 %{gtk_im_update} %postun skk umask 022 if [ $1 = 0 ]; then %{gtk_im_update} fi %files -f %{name}.lang %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog* NEWS README %lang(ja) %doc README.ja %{_bindir}/uim-fep* %{_bindir}/uim-helper-server %{_bindir}/uim-xim %{_libdir}/lib*.so.* %dir %{_datadir}/uim %{_datadir}/uim/tables %files devel %defattr (-, root, root) %dir %{_datadir}/uim %{_bindir}/uim-sh %{_includedir}/uim/* %{_libdir}/gtk-2.0/2.*/immodules/im-uim.*a %{_libdir}/lib*.a %{_libdir}/lib*.la %{_libdir}/lib*.so %{_libdir}/pkgconfig/* %{_datadir}/uim/uim-sh.scm %files gtk2 %defattr (-, root, root) %{_bindir}/uim-candwin-gtk %{_bindir}/uim-im-switcher %{_bindir}/uim-input-pad-ja %{_bindir}/uim-toolbar-gtk %{_bindir}/uim-toolbar-gtk-systray %{_libdir}/gtk-2.0/2.*/immodules %exclude %{_libdir}/gtk-2.0/2.*/immodules/im-uim.*a %dir %{_datadir}/uim %{_datadir}/uim/icons %files gnome %defattr (-, root, root) %{_libexecdir}/uim-toolbar-applet %{_libdir}/bonobo/servers/GNOME_UimApplet.server %files anthy %defattr (-, root, root) %dir %{_datadir}/uim %{_datadir}/uim/anthy.scm %files canna %defattr (-, root, root) %dir %{_datadir}/uim %{_datadir}/uim/canna.scm %files skk %defattr (-, root, root) %dir %{_datadir}/uim %{_datadir}/uim/skk*.scm %changelog * Wed Jan 12 2005 Akira TAGOH 0.4.5-1 - New upstream release. * Wed Sep 08 2004 Akira TAGOH 0.4.3-1 - New upstream release. - moved out gtk2 related files to uim-gtk2 package. * Mon Jul 12 2004 Jens Petersen - 0.4.0-1 - no longer need to remove screen files - include console fep programs * Fri Jul 2 2004 Jens Petersen - 0.3.9-3 - support both update-gtk-immodules of newer gtk2 and older gtk-query-immodules-2.0 with new %%gtk_im_update added * Wed Jun 30 2004 Jens Petersen - 0.3.9-2 - add uim-applet-category-cjk.patch to put applet in right submenu - improve the summaries and descriptions - make the Requires(postun) be Requires(post,postun) - file ownership and other minor cleanup * Wed Jun 23 2004 Akira TAGOH 0.3.9-1 - New upstream release. * Fri Jun 04 2004 Akira TAGOH 0.3.8-4 - wrote the descriptions. - uim-skk: fixed the dependency. * Fri Jun 04 2004 Nils Philippsen 0.3.8-3 - more spec cleanups * Fri Jun 04 2004 Warren Togami 0.3.8-2 - many spec cleanups * Thu Jun 03 2004 Akira TAGOH 0.3.8-1 - Initial package. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/uim/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Jan 2005 06:30:00 -0000 1.1 +++ .cvsignore 13 Jan 2005 06:30:55 -0000 1.2 @@ -0,0 +1 @@ +uim-0.4.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/uim/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Jan 2005 06:30:00 -0000 1.1 +++ sources 13 Jan 2005 06:30:55 -0000 1.2 @@ -0,0 +1 @@ +3979e20d8375fcd1691d74949e5b626c uim-0.4.5.tar.gz From wtogami at redhat.com Thu Jan 13 07:10:09 2005 From: wtogami at redhat.com (Warren Togami) Date: Wed, 12 Jan 2005 21:10:09 -1000 Subject: APPROVED: uim and anthy Message-ID: <41E61ED1.3070304@redhat.com> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 anthy-6024-1 uim-0.4.5-1 These two packages pass my inspection (I actually helped to clean them up a few months ago.) tagoh at redhat.com will be maintaining them in Extras. PUBLISH APPROVED by wtogami at redhat.com on Wed Jan 12th, 2004 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) iD8DBQFB5h6ea93+jlSirPERAokIAJ4g/oMjvLGX7GSvj9Dp8M/UbYIw8ACeIzyB i7iSHB54TLdcumqOyLFE800= =h8k4 -----END PGP SIGNATURE----- From fedora-extras-commits at redhat.com Thu Jan 13 11:14:38 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 06:14:38 -0500 Subject: rpms/gl-117 import.log,1.2,1.3 Message-ID: <200501131114.j0DBEc03000808@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gl-117 In directory cvs.fedora.redhat.com:/tmp/cvs-serv798 Modified Files: import.log Log Message: auto-import gl-117-1.3.1-1 on branch devel from gl-117-1.3.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gl-117/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 8 Nov 2004 04:25:52 -0000 1.2 +++ import.log 13 Jan 2005 11:14:36 -0000 1.3 @@ -1 +1,2 @@ gl-117-1_3-0_fdr_1_2:HEAD:gl-117-1.3-0.fdr.1.2.src.rpm:1099887952 +gl-117-1_3_1-1:HEAD:gl-117-1.3.1-1.src.rpm:1105614917 From fedora-extras-commits at redhat.com Thu Jan 13 11:14:38 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 06:14:38 -0500 Subject: rpms/gl-117/devel .cvsignore, 1.2, 1.3 gl-117.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200501131114.j0DBEceE000811@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gl-117/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv798/devel Modified Files: .cvsignore gl-117.spec sources Log Message: auto-import gl-117-1.3.1-1 on branch devel from gl-117-1.3.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gl-117/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:25:52 -0000 1.2 +++ .cvsignore 13 Jan 2005 11:14:36 -0000 1.3 @@ -1 +1 @@ -gl-117-1.3-src.tar.bz2 +gl-117-1.3.1-src.tar.bz2 Index: gl-117.spec =================================================================== RCS file: /cvs/extras/rpms/gl-117/devel/gl-117.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gl-117.spec 10 Dec 2004 22:03:02 -0000 1.2 +++ gl-117.spec 13 Jan 2005 11:14:36 -0000 1.3 @@ -1,13 +1,13 @@ Name: gl-117 -Version: 1.3 +Version: 1.3.1 Release: 1 Epoch: 0 -Summary: GL-117 is an action flight simulator. +Summary: An action flight simulator Group: Amusements/Games License: GPL -URL: http://home.t-online.de/home/Primetime./gl-117/gl-117.html -Source0: http://dl.sf.net/sourceforge/gl-117/gl-117-1.3-src.tar.bz2 +URL: http://www.heptargon.de/ +Source0: http://dl.sf.net/sourceforge/gl-117/gl-117-%{version}-src.tar.bz2 Source1: gl-117.desktop Source2: gl-117.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -27,7 +27,7 @@ %setup -q -n %{name}-%{version}-src %build -%configure +%configure LDFLAGS="-L/usr/X11R6/%{_lib} -lX11 -lXi -lXmu" make %{?_smp_mflags} %install @@ -55,5 +55,20 @@ %{_mandir}/man6/* %changelog -* Fri Jul 09 2004 Panu Matilainen 0:1.3-0.fdr.1 -- initial packaging +* Tue Dec 21 2004 Panu Matilainen 0:1.3.1-1 +- update to 1.3.1 + +* Sat Jun 19 2004 Panu Matilainen 0:1.3-0.lvn.1 +- update to 1.3 + +* Fri May 21 2004 Panu Matilainen 0:1.2-0.lvn.1 +- update to 1.2 +- dont include document sources +- put manpage where it belongs + +* Thu Nov 27 2003 Panu Matilainen 0:1.0.1-0.lvn.2.2 +- remove ldflags patch (it would've required autoconf), pass LDFLAGS on + configure line instead + +* Thu Nov 27 2003 Panu Matilainen 0:1.0.1-0.lvn.1.2 +- Initial packaging. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gl-117/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:25:52 -0000 1.2 +++ sources 13 Jan 2005 11:14:36 -0000 1.3 @@ -1 +1 @@ -38740f8d354416d3ae30f1b0e1c203c7 gl-117-1.3-src.tar.bz2 +c9bf8573ebb60fd77dc18de7eda006ec gl-117-1.3.1-src.tar.bz2 From fedora-extras-commits at redhat.com Thu Jan 13 13:30:47 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 08:30:47 -0500 Subject: rpms/supertux import.log,1.3,1.4 Message-ID: <200501131330.j0DDUlLZ003020@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/supertux In directory cvs.fedora.redhat.com:/tmp/cvs-serv3011 Modified Files: import.log Log Message: auto-import supertux-0.1.2-1 on branch devel from supertux-0.1.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/supertux/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 8 Nov 2004 05:24:05 -0000 1.3 +++ import.log 13 Jan 2005 13:30:45 -0000 1.4 @@ -1,2 +1,3 @@ supertux-0_1_1-0_fdr_1_1:HEAD:supertux-0.1.1-0.fdr.1.1.src.rpm:1099891439 supertux-0_1_1-0_fdr_1_2:HEAD:supertux-0.1.1-0.fdr.1.2.src.rpm:1099891445 +supertux-0_1_2-1:HEAD:supertux-0.1.2-1.src.rpm:1105623086 From fedora-extras-commits at redhat.com Thu Jan 13 13:30:47 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 08:30:47 -0500 Subject: rpms/supertux/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 supertux.spec, 1.3, 1.4 supertux-0.1.1-nonefix.patch, 1.1, NONE Message-ID: <200501131330.j0DDUlbv003024@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/supertux/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv3011/devel Modified Files: .cvsignore sources supertux.spec Removed Files: supertux-0.1.1-nonefix.patch Log Message: auto-import supertux-0.1.2-1 on branch devel from supertux-0.1.2-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/supertux/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:23:59 -0000 1.2 +++ .cvsignore 13 Jan 2005 13:30:45 -0000 1.3 @@ -1 +1 @@ -supertux-0.1.1.tar.bz2 +supertux-0.1.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/supertux/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:23:59 -0000 1.2 +++ sources 13 Jan 2005 13:30:45 -0000 1.3 @@ -1 +1 @@ -5a6fdf8e0aa4e5b4adbd573a11576f9c supertux-0.1.1.tar.bz2 +7c10acf574f09ae5cb9eb2a4b9bf93ff supertux-0.1.2.tar.bz2 Index: supertux.spec =================================================================== RCS file: /cvs/extras/rpms/supertux/devel/supertux.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- supertux.spec 10 Dec 2004 22:03:11 -0000 1.3 +++ supertux.spec 13 Jan 2005 13:30:45 -0000 1.4 @@ -1,15 +1,14 @@ Name: supertux -Version: 0.1.1 +Version: 0.1.2 Release: 1 Epoch: 0 -Summary: SuperTux is a jump'n run like game similar to Mario Bros. +Summary: A jump'n run like game similar to Mario Bros Group: Amusements/Games License: GPL URL: http://super-tux.sourceforge.net/ -Source0: http://dl.sf.net/super-tux/supertux-0.1.1.tar.bz2 +Source0: http://dl.sf.net/super-tux/supertux-0.1.2.tar.bz2 Source1: %{name}.desktop -Patch0: %{name}-0.1.1-nonefix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel >= 0:1.2.4, SDL_image-devel, SDL_mixer-devel @@ -25,7 +24,6 @@ %prep %setup -q -%patch0 -p1 %build @@ -58,5 +56,11 @@ %{_datadir}/pixmaps/* %changelog +* Sun Oct 03 2004 Panu Matilainen 0:0.1.2-1 +- update to 0.1.2 + +* Sat May 15 2004 Panu Matilainen 0:0.1.1-0.fdr.2 +- add buildrequires libtiff-devel + * Thu May 13 2004 Panu Matilainen 0:0.1.1-0.fdr.1 - Initial RPM release. --- supertux-0.1.1-nonefix.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jan 13 13:37:38 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 08:37:38 -0500 Subject: rpms/epydoc/devel epydocgui.desktop,NONE,1.1 epydoc.spec,1.2,1.3 Message-ID: <200501131337.j0DDbcT8003154@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/epydoc/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv3144 Modified Files: epydoc.spec Added Files: epydocgui.desktop Log Message: Improvements from Ville. --- NEW FILE epydocgui.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Epydoc Comment=Python API documentation generator Exec=epydocgui Type=Application Terminal=false Categories=Application;Development; Index: epydoc.spec =================================================================== RCS file: /cvs/extras/rpms/epydoc/devel/epydoc.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- epydoc.spec 16 Nov 2004 17:37:28 -0000 1.2 +++ epydoc.spec 13 Jan 2005 13:37:36 -0000 1.3 @@ -1,15 +1,19 @@ -# $Id$ +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Summary: Edward Loper's Python API documentation generation tool Name: epydoc Version: 2.1 -Release: 2 +Release: 3 Group: Development/Tools License: MIT URL: http://epydoc.sourceforge.net/ -Source: http://dl.sf.net/epydoc/epydoc-%{version}.tar.gz +Source0: http://dl.sf.net/epydoc/epydoc-%{version}.tar.gz +Source1: epydocgui.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: python +Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") +Requires: tkinter +BuildRequires: python desktop-file-utils +BuildArch: noarch %description Epydoc is a tool for generating API documentation for Python modules, @@ -31,11 +35,18 @@ %install %{__rm} -rf %{buildroot} -%{__python} setup.py install --root=%{buildroot} +%{__python} setup.py install -O1 --skip-build --root=%{buildroot} + +desktop-file-install \ + --vendor=fedora \ + --dir=%{buildroot}%{_datadir}/applications \ + --mode=644 \ + --add-category=X-Fedora \ + %{SOURCE1} # Also install the man pages -%{__install} -D man/epydoc.1 %{buildroot}%{_mandir}/man1/epydoc.1 -%{__install} -D man/epydocgui.1 %{buildroot}%{_mandir}/man1/epydocgui.1 +%{__install} -Dpm 644 man/epydoc.1 %{buildroot}%{_mandir}/man1/epydoc.1 +%{__install} -Dpm 644 man/epydocgui.1 %{buildroot}%{_mandir}/man1/epydocgui.1 %clean @@ -47,12 +58,32 @@ %doc LICENSE.TXT README.TXT doc/ %{_bindir}/epydoc %{_bindir}/epydocgui -%{_libdir}/python?.?/site-packages/epydoc/ +%dir %{python_sitelib}/epydoc +%{python_sitelib}/epydoc/*.py +%{python_sitelib}/epydoc/*.pyc +%ghost %{python_sitelib}/epydoc/*.pyo +%dir %{python_sitelib}/epydoc/markup +%{python_sitelib}/epydoc/markup/*.py +%{python_sitelib}/epydoc/markup/*.pyc +%ghost %{python_sitelib}/epydoc/markup/*.pyo +%dir %{python_sitelib}/epydoc/test +%{python_sitelib}/epydoc/test/*.py +%{python_sitelib}/epydoc/test/*.pyc +%ghost %{python_sitelib}/epydoc/test/*.pyo +%{_datadir}/applications/*epydocgui.desktop %{_mandir}/man1/epydoc.1* %{_mandir}/man1/epydocgui.1* %changelog +* Mon Dec 20 2004 Ville Skytt?? - 2.1-3 +- Change to noarch. +- Get Python site-packages dir from distutils, should fix x86_64 build. +- Require python-abi and tkinter. +- %%ghost'ify *.pyo. +- Fix man page permissions. +- Add menu entry for epydocgui. + * Tue Nov 16 2004 Matthias Saou 2.1-2 - Bump release to provide Extras upgrade path. From fedora-extras-commits at redhat.com Thu Jan 13 14:39:56 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 09:39:56 -0500 Subject: rpms/advancecomp/devel .cvsignore, 1.2, 1.3 advancecomp.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200501131439.j0DEduAq004086@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/advancecomp/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv4080 Modified Files: .cvsignore advancecomp.spec sources Log Message: Update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/advancecomp/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:00:49 -0000 1.2 +++ .cvsignore 13 Jan 2005 14:39:54 -0000 1.3 @@ -1 +1 @@ -advancecomp-1.11.tar.gz +advancecomp-1.13.tar.gz Index: advancecomp.spec =================================================================== RCS file: /cvs/extras/rpms/advancecomp/devel/advancecomp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- advancecomp.spec 11 Nov 2004 19:21:36 -0000 1.2 +++ advancecomp.spec 13 Jan 2005 14:39:54 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Recompression utilities for .PNG, .MNG and .ZIP files Name: advancecomp -Version: 1.11 -Release: 2 +Version: 1.13 +Release: 1 License: GPL Group: Applications/Emulators URL: http://advancemame.sourceforge.net/ @@ -42,8 +42,11 @@ %changelog -* Wed Nov 10 2004 Matthias Saou 1.11-2 -- Bump release to provide Extras upgrade path. +* Mon Nov 29 2004 Matthias Saou 1.13-1 +- Update to 1.13. + +* Tue Nov 2 2004 Matthias Saou 1.12-1 +- Update to 1.12. * Tue Aug 24 2004 Matthias Saou 1.11-1 - Update to 1.11. Index: sources =================================================================== RCS file: /cvs/extras/rpms/advancecomp/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:00:49 -0000 1.2 +++ sources 13 Jan 2005 14:39:54 -0000 1.3 @@ -1 +1 @@ -e400c79e88d5d30af2017b95e2115bb1 advancecomp-1.11.tar.gz +14f9e37e25aec35133e886caaf746226 advancecomp-1.13.tar.gz From fedora-extras-commits at redhat.com Thu Jan 13 14:52:57 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 09:52:57 -0500 Subject: rpms/synergy/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 synergy.spec, 1.3, 1.4 Message-ID: <200501131452.j0DEqvco004255@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/synergy/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv4244 Modified Files: .cvsignore sources synergy.spec Log Message: Update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/synergy/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Nov 2004 02:50:29 -0000 1.2 +++ .cvsignore 13 Jan 2005 14:52:55 -0000 1.3 @@ -1 +1 @@ -synergy-1.0.14.tar.gz +synergy-1.2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/synergy/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Nov 2004 02:50:29 -0000 1.2 +++ sources 13 Jan 2005 14:52:55 -0000 1.3 @@ -1 +1 @@ -c9cc67852f4287b184578faa150acd4c synergy-1.0.14.tar.gz +6f004011141ccd3292798ec2a3aef2c2 synergy-1.2.1.tar.gz Index: synergy.spec =================================================================== RCS file: /cvs/extras/rpms/synergy/devel/synergy.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- synergy.spec 16 Nov 2004 18:35:33 -0000 1.3 +++ synergy.spec 13 Jan 2005 14:52:55 -0000 1.4 @@ -1,9 +1,7 @@ -# $Id$ - Summary: Mouse and keyboard sharing utility Name: synergy -Version: 1.0.14 -Release: 2 +Version: 1.2.1 +Release: 1 License: GPL Group: System Environment/Daemons URL: http://synergy2.sourceforge.net/ @@ -39,14 +37,18 @@ %files %defattr(-, root, root, 0755) -%doc AUTHORS BUGS COPYING ChangeLog FAQ HISTORY NEWS README TODO +%doc AUTHORS ChangeLog COPYING NEWS README doc/PORTING +%doc doc/*.html doc/*.css %doc examples/synergy.conf %{_bindir}/* %changelog -* Tue Nov 16 2004 Matthias Saou 1.0.14-3 -- Bump release to provide Extras upgrade path. +* Thu Jan 13 2005 Matthias Saou 1.2.1-1 +- Update to 1.2.1. + +* Mon Jan 3 2005 Matthias Saou 1.2.0-1 +- Update to 1.2.0. * Wed May 19 2004 Matthias Saou 1.0.14-2 - Rebuilt for Fedora Core 2. From fedora-extras-commits at redhat.com Thu Jan 13 15:32:51 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 10:32:51 -0500 Subject: rpms/kile import.log,1.4,1.5 Message-ID: <200501131532.j0DFWpuC005311@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/kile In directory cvs.fedora.redhat.com:/tmp/cvs-serv5302 Modified Files: import.log Log Message: auto-import kile-1.7.1-3 on branch devel from kile-1.7.1-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kile/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 8 Nov 2004 04:39:27 -0000 1.4 +++ import.log 13 Jan 2005 15:32:49 -0000 1.5 @@ -1,3 +1,4 @@ kile-1_6_3-0_fdr_1_rh90:HEAD:kile-1.6.3-0.fdr.1.rh90.src.rpm:1099888755 kile-1_6_3-0_fdr_1_1:HEAD:kile-1.6.3-0.fdr.1.1.src.rpm:1099888761 kile-1_6_3-0_fdr_1_2:HEAD:kile-1.6.3-0.fdr.1.2.src.rpm:1099888767 +kile-1_7_1-3:HEAD:kile-1.7.1-3.src.rpm:1105630409 From fedora-extras-commits at redhat.com Thu Jan 13 15:32:52 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 10:32:52 -0500 Subject: rpms/kile/devel kile-1.7-dt.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kile.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200501131532.j0DFWq8o005315@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/kile/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv5302/devel Modified Files: .cvsignore kile.spec sources Added Files: kile-1.7-dt.patch Log Message: auto-import kile-1.7.1-3 on branch devel from kile-1.7.1-3.src.rpm kile-1.7-dt.patch: --- NEW FILE kile-1.7-dt.patch --- --- kile-1.7/kile/kile.desktop.dt 2004-05-27 01:56:00.000000000 -0500 +++ kile-1.7/kile/kile.desktop 2004-10-18 08:09:27.000000000 -0500 @@ -51,4 +51,4 @@ GenericName[xx]=xxLaTeX Frontendxx GenericName[zh_CN]=LaTeX ?????? MimeType=text/x-tex;text/x-kilepr -Categories=Qt;KDE;Office +Categories=Qt;KDE;Office; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kile/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:39:15 -0000 1.2 +++ .cvsignore 13 Jan 2005 15:32:49 -0000 1.3 @@ -1 +1 @@ -kile-1.6.3.tar.bz2 +kile-1.7.1.tar.bz2 Index: kile.spec =================================================================== RCS file: /cvs/extras/rpms/kile/devel/kile.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kile.spec 10 Dec 2004 22:03:04 -0000 1.4 +++ kile.spec 13 Jan 2005 15:32:49 -0000 1.5 @@ -1,48 +1,62 @@ -# $Id$ +#$Id$ + +# for optionally using destkop-file-install (for fc2 mostly) +%define desktop_file 1 Name: kile -Summary: LaTeX source editor and TeX shell +Summary: (La)TeX source editor and TeX shell Epoch: 0 -Version: 1.6.3 -Release: 1%{?dist_tag} +Version: 1.7.1 +Release: 3%{?dist_tag} Group: Applications/Publishing URL: http://kile.sourceforge.net/ -Source: http://dl.sourceforge.net/sourceforge/kile/kile-1.6.3.tar.bz2 +Source: http://dl.sourceforge.net/sourceforge/kile/kile-1.7.1.tar.bz2 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +# Append ; to .desktop Categories +Patch1: kile-1.7-dt.patch + BuildRequires: gettext +BuildRequires: libtool +%{?desktop_file:BuildRequires: desktop-file-utils} -# workarounds for missing Requires in redhat's qt-devel, kdelibs-devel -# and to make fedora's buildsystem happy -BuildRequires: XFree86-devel libtool +# workarounds for missing Requires in fc1's qt-devel, kdelibs-devel +# and to make fedora.us's buildsystem happy +BuildRequires: XFree86-devel BuildRequires: libpng-devel zlib-devel libjpeg-devel BuildRequires: arts-devel libart_lgpl-devel fam-devel Requires: tetex-latex +## Optional, but recommended +#Requires: gnuplot +#Requires: xfig -BuildRequires: qt-devel >= 1:3.1 -%define qt_ver %(rpm -q --qf '%%{version}' qt-devel | cut -d. -f1,2) +BuildRequires: qt-devel >= 1:3.3 +%define qt_ver %(rpm -q --qf '%%{version}' qt-devel | cut -d. -f-2) Requires: qt >= 1:%{qt_ver} -BuildRequires: kdelibs-devel >= 6:3.1 -%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel | cut -d. -f1,2 ) +BuildRequires: kdelibs-devel >= 6:3.2 +%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel | cut -d. -f-2 ) Requires: kdelibs >= 6:%{kdelibs_ver} -%if "%{kdelibs_ver}" < "3.2" -%define desktop_file 1 -%endif - %description -Kile is a LaTeX source editor, TeX shell and GnuPlot frontend that -simplifies the creation of LaTeX documents. +Kile is a user friendly (La)TeX editor. The main features are: + * Compile, convert and view your document with one click. + * Auto-completion of (La)TeX commands + * Templates and wizards makes starting a new document very little work. + * Easy insertion of many standard tags and symbols and the option to define (an arbitrary number of) user defined tags. + * Inverse and forward search: click in the DVI viewer and jump to the corresponding LaTeX line in the editor, or jump from the editor to the corresponding page in the viewer. + * Finding chapter or sections is very easy, Kile constructs a list of all the chapter etc. in your document. You can use the list to jump to the corresponding section. + * Collect documents that belong together into a project. + * Easy insertion of citations and references when using projects. + * Advanced editing commands. %prep %setup -q -# append ; to desktop_file Categories -perl -pi -e 's at Categories(.*)Office$@Categories${1}Office\;@' */*.desktop */*/*.desktop +%{?desktop_file:%patch1 -p1 -b .dt} %build @@ -52,9 +66,9 @@ --program-prefix="%{?_program_prefix}" \ --disable-rpath \ %{?debug: --enable-debug --enable-warnings } \ - %{!?debug: --disable-dependency-tracking --disable-debug --disable-warnings --enable-final } + %{!?debug: --disable-debug --disable-warnings --enable-final } -make %{?_smp_mflags} +make %{?_smp_mflags} %install @@ -76,11 +90,6 @@ popd %if "%{?desktop_file}" == "1" -# Put desktop/applnk file back -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applnk/Office -mv $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop \ - $RPM_BUILD_ROOT%{_datadir}/applnk/Office/ - mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --delete-original --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -89,29 +98,20 @@ $RPM_BUILD_ROOT%{_datadir}/app*/*/kile.desktop %endif -## Locale stuff -# find_lang -%find_lang %{name} -# HTML stuff -for lang_dir in $RPM_BUILD_ROOT%{_docdir}/HTML/* ; do - lang=$(basename $lang_dir) - echo "%lang($lang) %doc %{_docdir}/HTML/${lang}/*" >> %{name}.lang -done +## Unpackaged/conflicting files +rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/katepart - -%files -f %{name}.lang +%files %defattr(-,root,root,-) %doc AUTHORS ChangeLog README TODO +%lang(en) %doc %{_datadir}/doc/HTML/en/* %{_bindir}/* %{_datadir}/apps/kile -%{_datadir}/apps/katepart/syntax/*.xml +%{_datadir}/apps/kconf_update/kile* +%config %{_datadir}/config.kcfg/kile.kcfg %{_datadir}/icons/*/*/*/*.png -%if "%{?desktop_file}" == "1" -%{_datadir}/applications/*.desktop -%else -%{_datadir}/applications/kde/*.desktop -%endif +%{_datadir}/applications%{!?desktop_file:/kde}/*.desktop %{_datadir}/mimelnk/*/*.desktop @@ -120,6 +120,19 @@ %changelog +* Wed Jan 12 2005 Rex Dieter 0:1.7.1-3 +- fix (katepart) conflicts with kde >= 3.2 +- update %%description + +* Mon Oct 18 2004 Rex Dieter 0:1.7.1-0.fdr.2 +- -katepart: fix conflicts with kde >= 3.3 (optional) + +* Mon Oct 18 2004 Rex Dieter 0:1.7.1-0.fdr.1 +- 1.7.1 + +* Tue Sep 28 2004 Rex Dieter 0:1.6.3-0.fdr.2 +- respin (against kde-3.3) + * Fri May 14 2004 Rex Dieter 0:1.6.3-0.fdr.1 - 1.6.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kile/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:39:15 -0000 1.2 +++ sources 13 Jan 2005 15:32:49 -0000 1.3 @@ -1 +1 @@ -6bf238c7a80fa647d8fd4ca89c0774ef kile-1.6.3.tar.bz2 +940fba9dc62e2687856885dffccf6e80 kile-1.7.1.tar.bz2 From fedora-extras-commits at redhat.com Thu Jan 13 15:34:39 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 10:34:39 -0500 Subject: rpms/kile-i18n - New directory Message-ID: <200501131534.j0DFYdqj005435@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/kile-i18n In directory cvs.fedora.redhat.com:/tmp/cvs-serv5427/kile-i18n Log Message: Directory /cvs/extras/rpms/kile-i18n added to the repository From fedora-extras-commits at redhat.com Thu Jan 13 15:34:39 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 10:34:39 -0500 Subject: rpms/kile-i18n/devel - New directory Message-ID: <200501131534.j0DFYdJh005438@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/kile-i18n/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv5427/kile-i18n/devel Log Message: Directory /cvs/extras/rpms/kile-i18n/devel added to the repository From fedora-extras-commits at redhat.com Thu Jan 13 15:35:02 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 10:35:02 -0500 Subject: rpms/kile-i18n Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501131535.j0DFZ2Om005497@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/kile-i18n In directory cvs.fedora.redhat.com:/tmp/cvs-serv5488 Added Files: Makefile import.log Log Message: Setup of module kile-i18n --- NEW FILE Makefile --- # Top level Makefile for module kile-i18n all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 13 15:35:02 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 10:35:02 -0500 Subject: rpms/kile-i18n/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501131535.j0DFZ2E9005500@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/kile-i18n/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv5488/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module kile-i18n --- NEW 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 Jan 13 15:39:03 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 10:39:03 -0500 Subject: rpms/kile-i18n import.log,1.1,1.2 Message-ID: <200501131539.j0DFd3fR005613@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/kile-i18n In directory cvs.fedora.redhat.com:/tmp/cvs-serv5602 Modified Files: import.log Log Message: auto-import kile-i18n-1.7-3 on branch devel from kile-i18n-1.7-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kile-i18n/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Jan 2005 15:35:00 -0000 1.1 +++ import.log 13 Jan 2005 15:39:01 -0000 1.2 @@ -0,0 +1 @@ +kile-i18n-1_7-3:HEAD:kile-i18n-1.7-3.src.rpm:1105630781 From fedora-extras-commits at redhat.com Thu Jan 13 15:39:03 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 10:39:03 -0500 Subject: rpms/kile-i18n/devel kile-i18n.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501131539.j0DFd3E1005617@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/kile-i18n/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv5602/devel Modified Files: .cvsignore sources Added Files: kile-i18n.spec Log Message: auto-import kile-i18n-1.7-3 on branch devel from kile-i18n-1.7-3.src.rpm --- NEW FILE kile-i18n.spec --- # $Id: koffice-i18n.spec,v 1.17 2004/10/01 20:28:01 rexdieter Exp $ Summary: i18n support for Kile Name: kile-i18n Group: Applications/Office Version: 1.7 Release: 3 Source: http://dl.sourceforge.net/sourceforge/kile/kile-i18n-1.7.tar.bz2 URL: http://kile.sourceforge.net/ License: GPL # Should be noarch, but doesn't currently work -- Rex #BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool BuildRequires: kdelibs-devel >= 6:3.2 BuildRequires: gettext Requires: kile >= 0:1.7 %description i18n support for Kile %prep %setup -q %build unset QTDIR || : ; . /etc/profile.d/qt.sh %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # Replace absolute symlinks with relative ones pushd $RPM_BUILD_ROOT%{_docdir}/HTML for lang in *; do if [ -d $lang ]; then pushd $lang for i in *; do [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common done popd fi done popd ## File lists # locale's %find_lang kile # HTML for lang_dir in $RPM_BUILD_ROOT%{_docdir}/HTML/* ; do lang=$(basename $lang_dir) echo "%lang($lang) %doc %{_docdir}/HTML/$lang/*" >> kile.lang done %files -f kile.lang %defattr(-,root,root) %clean rm -rf $RPM_BUILD_ROOT %changelog * Wed Nov 21 2004 Rex Dieter 1.7-3 - BR: gettext * Tue Nov 20 2004 Rex Dieter 1.7-0.fdr.2 - cleanup file lists * Mon Oct 18 2004 Rex Dieter 1.7-0.fdr.1 - 1.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kile-i18n/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Jan 2005 15:35:00 -0000 1.1 +++ .cvsignore 13 Jan 2005 15:39:01 -0000 1.2 @@ -0,0 +1 @@ +kile-i18n-1.7.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kile-i18n/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Jan 2005 15:35:00 -0000 1.1 +++ sources 13 Jan 2005 15:39:01 -0000 1.2 @@ -0,0 +1 @@ +6c8d6f9c20c4f67c825951a224fa641f kile-i18n-1.7.tar.bz2 From fedora-extras-commits at redhat.com Thu Jan 13 17:41:35 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 12:41:35 -0500 Subject: rpms/openoffice-extras/devel openoffice-extras.spec,1.2,1.3 Message-ID: <200501131741.j0DHfZ1h007905@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/openoffice-extras/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv7899 Modified Files: openoffice-extras.spec Log Message: Disabling build, see %prep. Index: openoffice-extras.spec =================================================================== RCS file: /cvs/extras/rpms/openoffice-extras/devel/openoffice-extras.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- openoffice-extras.spec 10 Dec 2004 22:03:07 -0000 1.2 +++ openoffice-extras.spec 13 Jan 2005 17:41:33 -0000 1.3 @@ -1,7 +1,7 @@ Summary: SOT Office presentation templates repackaged for OpenOffice.org Name: openoffice-extras Version: 1.0.2 -Release: 3 +Release: 2.fdr.2 Epoch: 0 License: GPL Group: Applications/Productivity @@ -19,6 +19,13 @@ # ----------------------------------------------------------------------------- %prep +echo " +-------------------------------------------------------------- +Package hasn't been updated or rebuilt since Red Hat Linux 9 +and probably is obsolete. => https://bugzilla.redhat.com/144736 +--------------------------------------------------------------" > /dev/null +exit 1 + %setup -q -c # ----------------------------------------------------------------------------- From fedora-extras-commits at redhat.com Thu Jan 13 18:06:32 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:06:32 -0500 Subject: rpms/kannel/devel .cvsignore, 1.2, 1.3 kannel.spec, 1.2, 1.3 sources, 1.2, 1.3 mblox_optionals_0.1.diff, 1.1, NONE Message-ID: <200501131806.j0DI6W6p008749@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/kannel/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv8742 Modified Files: .cvsignore kannel.spec sources Removed Files: mblox_optionals_0.1.diff Log Message: Update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kannel/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Nov 2004 02:47:27 -0000 1.2 +++ .cvsignore 13 Jan 2005 18:06:30 -0000 1.3 @@ -1 +1 @@ -gateway-1.3.2.tar.bz2 +gateway-1.4.0.tar.bz2 Index: kannel.spec =================================================================== RCS file: /cvs/extras/rpms/kannel/devel/kannel.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kannel.spec 9 Nov 2004 02:47:33 -0000 1.2 +++ kannel.spec 13 Jan 2005 18:06:30 -0000 1.3 @@ -1,21 +1,18 @@ -# $Id$ -# Authority: matthias - -%{?dist: %{expand: %%define %dist 1}} - -%{?rh7:%define _without_newsslcheck 1} - Summary: WAP and SMS gateway Name: kannel -Version: 1.3.2 -Release: 3.1.fc2.fr +Version: 1.4.0 +Release: 1 License: Kannel Group: System Environment/Daemons URL: http://www.kannel.org/ Source: http://www.kannel.org/download/%{version}/gateway-%{version}.tar.bz2 -Patch: mblox_optionals_0.1.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRequires: bison, byacc, flex, ImageMagick BuildRequires: libxml2-devel, openssl-devel, zlib-devel +# DB backends +BuildRequires: sqlite-devel +# For the docs... I think we need transfig too, so disable for now. +#BuildRequires: jadetex, tetex-dvips, docbook-dtds, docbook-style-dsssl %description The Kannel Open Source WAP and SMS gateway works as both an SMS gateway, for @@ -45,14 +42,12 @@ %prep %setup -n gateway-%{version} -%patch -p1 -b .mblox %build -# Fix for the openssl THREADS check, which should be OPENSSL_THREADS -%{!?_without_newsslcheck: %{__perl} -pi.orig -e 's|(defined\()THREADS\)|$1OPENSSL_THREADS)|g' configure} %configure \ - --enable-start-stop-daemon + --enable-start-stop-daemon \ + --with-sqlite %{__make} %{?_smp_mflags} @@ -98,8 +93,8 @@ %changelog -* Mon Sep 20 2004 Matthias Saou 1.3.2-3 -- Added mblox_optionals_0.1.diff patch. +* Fri Dec 10 2004 Matthias Saou 1.4.0-1 +- Update to 1.4.0. * Tue Aug 24 2004 Matthias Saou 1.3.2-2 - Really comment out all scriplets, they're not yet used. Index: sources =================================================================== RCS file: /cvs/extras/rpms/kannel/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Nov 2004 02:47:27 -0000 1.2 +++ sources 13 Jan 2005 18:06:30 -0000 1.3 @@ -1 +1 @@ -00a1fa5c7ed2fc755d14abc2b6f5ce52 gateway-1.3.2.tar.bz2 +2ef0544002be48669d7f0f29f9f470de gateway-1.4.0.tar.bz2 --- mblox_optionals_0.1.diff DELETED --- From fedora-extras-commits at redhat.com Thu Jan 13 18:08:55 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:08:55 -0500 Subject: rpms/hercules/devel hercules.spec,1.3,1.4 Message-ID: <200501131808.j0DI8tQD008817@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/hercules/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv8811 Modified Files: hercules.spec Log Message: Clean up some more. Index: hercules.spec =================================================================== RCS file: /cvs/extras/rpms/hercules/devel/hercules.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- hercules.spec 24 Dec 2004 15:23:07 -0000 1.3 +++ hercules.spec 13 Jan 2005 18:08:53 -0000 1.4 @@ -1,15 +1,9 @@ -# $Id$ -# Authority: dag -# Upstream: Jay Maynard -# Upstream: -# Distcc: 0 - %define date 20041025 Summary: Hercules S/370, ESA/390, and z/Architecture emulator Name: hercules Version: 3.02 -Release: %{?date:0.%{date}.}1.2 +Release: %{?date:0.%{date}.}1 License: QPL Group: Applications/Emulators URL: http://www.conmicro.cx/hercules/ From fedora-extras-commits at redhat.com Thu Jan 13 18:13:22 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:13:22 -0500 Subject: rpms/ucarp/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 ucarp.spec, 1.2, 1.3 Message-ID: <200501131813.j0DIDMlg008893@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/ucarp/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv8887 Modified Files: .cvsignore sources ucarp.spec Log Message: Update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ucarp/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Nov 2004 02:50:47 -0000 1.2 +++ .cvsignore 13 Jan 2005 18:13:20 -0000 1.3 @@ -1 +1 @@ -ucarp-1.0.tar.bz2 +ucarp-1.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ucarp/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Nov 2004 02:50:47 -0000 1.2 +++ sources 13 Jan 2005 18:13:20 -0000 1.3 @@ -1 +1 @@ -f40451c2d614e00121cbae0b0cbdb832 ucarp-1.0.tar.bz2 +f907752bd1654a6e8aa42e717aee9774 ucarp-1.1.tar.bz2 Index: ucarp.spec =================================================================== RCS file: /cvs/extras/rpms/ucarp/devel/ucarp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ucarp.spec 9 Nov 2004 02:50:54 -0000 1.2 +++ ucarp.spec 13 Jan 2005 18:13:20 -0000 1.3 @@ -1,13 +1,11 @@ -# $Id$ - Summary: Common Address Redundancy Protocol (CARP) for Unix Name: ucarp -Version: 1.0 -Release: 1.1.fc2.fr +Version: 1.1 +Release: 1 License: BSD Group: System Environment/Daemons URL: http://www.ucarp.org/ -Source: http://www.pureftpd.org/ucarp/ucarp-%{version}.tar.bz2 +Source0: ftp://ftp.ucarp.org/pub/ucarp/ucarp-%{version}.tar.bz2 Source1: carp.init Source2: vip-001.conf.example BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -16,7 +14,6 @@ Requires(postun): /sbin/service BuildRequires: libpcap, gettext - %description UCARP allows a couple of hosts to share common virtual IP addresses in order to provide automatic failover. It is a portable userland implementation of the @@ -98,6 +95,10 @@ %changelog +* Thu Jan 13 2005 Matthias Saou 1.1-1 +- Update to 1.1. +- Update source location. + * Fri Jul 9 2004 Matthias Saou 1.0-1 - Initial RPM release. From fedora-extras-commits at redhat.com Thu Jan 13 18:17:31 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:17:31 -0500 Subject: rpms/xmms-lirc/devel xmms-lirc.spec,1.4,1.5 Message-ID: <200501131817.j0DIHVtQ008989@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/xmms-lirc/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv8978 Modified Files: xmms-lirc.spec Log Message: Clean up, bump release. Index: xmms-lirc.spec =================================================================== RCS file: /cvs/extras/rpms/xmms-lirc/devel/xmms-lirc.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xmms-lirc.spec 9 Nov 2004 02:51:36 -0000 1.4 +++ xmms-lirc.spec 13 Jan 2005 18:17:29 -0000 1.5 @@ -1,13 +1,10 @@ -# $Id$ -# Authority: matthias - %define xmms_generaldir %(xmms-config --general-plugin-dir) %define real_name lirc-xmms-plugin -Summary: Plugin to use LIRC supported infrared devices in XMMS +Summary: X MultiMedia System control plugin to use infrared devices Name: xmms-lirc Version: 1.4 -Release: 3.1.fc2.fr +Release: 4 License: GPL Group: Applications/Multimedia URL: http://www.lirc.org/ @@ -47,6 +44,9 @@ %changelog +* Thu Jan 13 2005 Matthias Saou 1.4-4 +- Bump release for upgrade path. + * Wed May 19 2004 Matthias Saou 1.4-3 - Rebuilt for Fedora Core 2. From fedora-extras-commits at redhat.com Thu Jan 13 18:19:12 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:19:12 -0500 Subject: rpms/php-mmcache/devel php-mmcache.spec,1.3,1.4 Message-ID: <200501131819.j0DIJC22009023@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-mmcache/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv9017/devel Modified Files: php-mmcache.spec Log Message: Clean up. Index: php-mmcache.spec =================================================================== RCS file: /cvs/extras/rpms/php-mmcache/devel/php-mmcache.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- php-mmcache.spec 9 Nov 2004 02:49:10 -0000 1.3 +++ php-mmcache.spec 13 Jan 2005 18:19:10 -0000 1.4 @@ -1,5 +1,3 @@ -# $Id$ - %define php_extdir %(php-config --extension-dir || echo /usr/lib/php4) %{!?php_version:%define php_version %(php-config --version || echo bad)} @@ -8,7 +6,7 @@ Summary: PHP accelerator, optimizer, encoder and dynamic content cacher Name: php-mmcache Version: %{php_version}_%{module_version} -Release: 4.1.fc2.fr +Release: 5 License: GPL Group: Development/Languages URL: http://turck-mmcache.sourceforge.net/ @@ -83,6 +81,9 @@ %changelog +* Thu Jan 13 2005 Matthias Saou 4.x.x_2.4.6-4 +- Bump release. + * Fri May 21 2004 Matthias Saou 4.x.x_2.4.6-1 - Change the version to be phpversion_mmcacheversion since each build is tightly tied to a version, and to have an easy upgrade path. From fedora-extras-commits at redhat.com Thu Jan 13 18:21:25 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:21:25 -0500 Subject: rpms/php-pecl-mailparse/devel php-pecl-mailparse.spec,1.2,1.3 Message-ID: <200501131821.j0DILPDl009053@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-pecl-mailparse/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv9047/devel Modified Files: php-pecl-mailparse.spec Log Message: Clean up. Index: php-pecl-mailparse.spec =================================================================== RCS file: /cvs/extras/rpms/php-pecl-mailparse/devel/php-pecl-mailparse.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- php-pecl-mailparse.spec 9 Nov 2004 02:49:13 -0000 1.2 +++ php-pecl-mailparse.spec 13 Jan 2005 18:21:23 -0000 1.3 @@ -1,11 +1,9 @@ -# $Id$ - -%define php_extdir %(php-config --extension-dir) +%define php_extdir %(php-config --extension-dir || echo /usr/lib/php4) Summary: PECL package for parsing and working with email messages Name: php-pecl-mailparse Version: 2.0b -Release: 4.1.fc2.fr +Release: 5 License: PHP Group: Development/Languages URL: http://pecl.php.net/package/mailparse @@ -61,6 +59,9 @@ %changelog +* Thu Jan 13 2005 Matthias Saou 2.0b-5 +- Bump release. + * Tue Jul 27 2004 Matthias Saou 2.0b-4 - Update included mbfl source to 4.3.8 as the current 4.3.4 doesn't work anymore. From fedora-extras-commits at redhat.com Thu Jan 13 18:22:25 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:22:25 -0500 Subject: rpms/php-pecl-sqlite/devel php-pecl-sqlite.spec,1.1,1.2 Message-ID: <200501131822.j0DIMPmw009101@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-pecl-sqlite/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv9089/devel Modified Files: php-pecl-sqlite.spec Log Message: Clean up. Index: php-pecl-sqlite.spec =================================================================== RCS file: /cvs/extras/rpms/php-pecl-sqlite/devel/php-pecl-sqlite.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- php-pecl-sqlite.spec 9 Nov 2004 02:49:22 -0000 1.1 +++ php-pecl-sqlite.spec 13 Jan 2005 18:22:23 -0000 1.2 @@ -1,11 +1,9 @@ -# $Id$ - -%define php_extdir %(php-config --extension-dir) +%define php_extdir %(php-config --extension-dir || echo /usr/lib/php4) Summary: PECL package for accessing SQLite databases Name: php-pecl-sqlite Version: 1.0.2 -Release: 1.1.fc2.fr +Release: 2 License: PHP Group: Development/Languages URL: http://pecl.php.net/package/SQLite @@ -57,6 +55,9 @@ %changelog +* Thu Jan 13 2005 Matthias Saou 1.0.2-2 +- Bump release. + * Thu Jun 3 2004 Matthias Saou 1.0.2-1 - Initial RPM release. From fedora-extras-commits at redhat.com Thu Jan 13 18:23:08 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 13:23:08 -0500 Subject: rpms/qca - New directory Message-ID: <200501131823.j0DIN8Hk009163@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/qca In directory cvs.fedora.redhat.com:/tmp/cvs-serv9154/qca Log Message: Directory /cvs/extras/rpms/qca added to the repository From fedora-extras-commits at redhat.com Thu Jan 13 18:23:08 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 13:23:08 -0500 Subject: rpms/qca/devel - New directory Message-ID: <200501131823.j0DIN8ux009166@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/qca/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv9154/qca/devel Log Message: Directory /cvs/extras/rpms/qca/devel added to the repository From fedora-extras-commits at redhat.com Thu Jan 13 18:23:30 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 13:23:30 -0500 Subject: rpms/qca Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501131823.j0DINU56009228@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/qca In directory cvs.fedora.redhat.com:/tmp/cvs-serv9219 Added Files: Makefile import.log Log Message: Setup of module qca --- NEW FILE Makefile --- # Top level Makefile for module qca all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 13 18:23:30 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 13:23:30 -0500 Subject: rpms/qca/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501131823.j0DINUJl009231@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/qca/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv9219/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module qca --- NEW 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 Jan 13 18:24:03 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:24:03 -0500 Subject: rpms/python-twisted/devel python-twisted.spec,1.1,1.2 Message-ID: <200501131824.j0DIO3IV009318@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/python-twisted/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv9305 Modified Files: python-twisted.spec Log Message: Clean up. Index: python-twisted.spec =================================================================== RCS file: /cvs/extras/rpms/python-twisted/devel/python-twisted.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-twisted.spec 9 Nov 2004 02:50:01 -0000 1.1 +++ python-twisted.spec 13 Jan 2005 18:24:00 -0000 1.2 @@ -1,9 +1,7 @@ -# $Id$ - Summary: Event-driven networking framework written in Python Name: python-twisted Version: 1.3.0 -Release: 1.1.fc2.fr +Release: 2 License: LGPL Group: Applications/Internet URL: http://www.twistedmatrix.com/ From fedora-extras-commits at redhat.com Thu Jan 13 18:24:23 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 13:24:23 -0500 Subject: rpms/qca import.log,1.1,1.2 Message-ID: <200501131824.j0DIONd0009370@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/qca In directory cvs.fedora.redhat.com:/tmp/cvs-serv9361 Modified Files: import.log Log Message: auto-import qca-1.0-3 on branch devel from qca-1.0-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/qca/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Jan 2005 18:23:28 -0000 1.1 +++ import.log 13 Jan 2005 18:24:21 -0000 1.2 @@ -0,0 +1 @@ +qca-1_0-3:HEAD:qca-1.0-3.src.rpm:1105640702 From fedora-extras-commits at redhat.com Thu Jan 13 18:24:23 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 13:24:23 -0500 Subject: rpms/qca/devel qca-1.0-mach.patch, NONE, 1.1 qca.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501131824.j0DION7I009374@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/qca/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv9361/devel Modified Files: .cvsignore sources Added Files: qca-1.0-mach.patch qca.spec Log Message: auto-import qca-1.0-3 on branch devel from qca-1.0-3.src.rpm qca-1.0-mach.patch: --- NEW FILE qca-1.0-mach.patch --- --- ./qca.pro.mach 2004-11-22 11:15:24.061984966 +0100 +++ ./qca.pro 2004-11-22 11:15:31.483010203 +0100 @@ -2,6 +2,7 @@ TEMPLATE = lib CONFIG += qt thread release +CONFIG += no_fixpath TARGET = qca MOC_DIR = .moc --- NEW FILE qca.spec --- Name: qca Version: 1.0 Release: 3 Epoch: 0 Summary: Qt Cryptographic Architecture Group: System Environment/Libraries License: LGPL URL: http://delta.affinix.com/qca Source0: http://delta.affinix.com/qca/qca-1.0.tar.bz2 Patch0: qca-1.0-mach.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel %description Taking a hint from the similarly-named Java Cryptography Architecture, QCA aims to provide a straightforward and cross-platform crypto API, using Qt datatypes and conventions. QCA separates the API from the implementation, using plugins known as Providers. The advantage of this model is to allow applications to avoid linking to or explicitly depending on any particular cryptographic library. This allows one to easily change or upgrade crypto implementations without even needing to recompile the application! %package devel Summary: Qt Cryptographic Architecture - development files Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} %description devel This packages contains the development files for QCA %prep %setup -q %patch0 -p0 -b .mach perl -pi -e 's,target\.path=\$PREFIX/lib,target.path=\$PREFIX/%{_lib},g' qcextra %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh ./configure --prefix=%{_prefix} --qtdir=$QTDIR make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install INSTALL_ROOT=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING README TODO %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %{_includedir}/*.h %{_libdir}/*.so %changelog * Thu Jan 13 2005 Aurelien Bompard 0:1.0-3 - fix Category - fix build on x86_64 * Thu Jan 13 2005 Aurelien Bompard 0:1.0-0.fdr.2 - clean up comments to fix %%postun scriptlet. * Mon Nov 22 2004 Aurelien Bompard 0:1.0-0.fdr.1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qca/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Jan 2005 18:23:28 -0000 1.1 +++ .cvsignore 13 Jan 2005 18:24:21 -0000 1.2 @@ -0,0 +1 @@ +qca-1.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qca/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Jan 2005 18:23:28 -0000 1.1 +++ sources 13 Jan 2005 18:24:21 -0000 1.2 @@ -0,0 +1 @@ +ee44022eb0e5b8b5df64c62630f6e6b6 qca-1.0.tar.bz2 From fedora-extras-commits at redhat.com Thu Jan 13 18:27:49 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:27:49 -0500 Subject: rpms/rrdtool/devel rrdtool.spec,1.4,1.5 Message-ID: <200501131827.j0DIRnbc009493@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/rrdtool/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv9485 Modified Files: rrdtool.spec Log Message: Clean up. Index: rrdtool.spec =================================================================== RCS file: /cvs/extras/rpms/rrdtool/devel/rrdtool.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rrdtool.spec 9 Nov 2004 02:50:32 -0000 1.4 +++ rrdtool.spec 13 Jan 2005 18:27:47 -0000 1.5 @@ -1,25 +1,17 @@ -# $Id$ -# Authority: matthias -# Upstream: Tobi Oetiker - -%define phpextdir %(php-config --extension-dir) +%define php_extdir %(php-config --extension-dir || echo /usr/lib/php4) Summary: Round Robin Database Tool to store and display time-series data Name: rrdtool Version: 1.0.49 -Release: 1.1.fc2.fr +Release: 2 License: GPL Group: Applications/Databases URL: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/ - Source: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-%{version}.tar.gz Patch: rrdtool-1.0.48-php_config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root - -BuildRequires: gcc-c++, perl, php-devel >= 4.0, openssl-devel +BuildRequires: gcc-c++, php-devel >= 4.0, openssl-devel BuildRequires: libpng-devel, zlib-devel -Requires: perl >= %(rpm -q --qf '%%{epoch}:%%{version}' perl) -Requires: libpng, zlib %description RRD is the Acronym for Round Robin Database. RRD is a system to store and @@ -56,8 +48,10 @@ %setup %patch -b .phpfix -### FIXME: Fixes to /usr/lib(64) for x86_64 -%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' configure contrib/php4/configure Makefile.in +# Fixes to /usr/lib(64) for x86_64 +%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' \ + configure contrib/php4/configure Makefile.in + %build %configure \ @@ -91,7 +85,7 @@ # Install the php4 module %{__install} -D -m0755 contrib/php4/modules/rrdtool.so \ - %{buildroot}%{phpextdir}/rrdtool.so + %{buildroot}%{php_extdir}/rrdtool.so # Clean up the examples for inclusion as docs %{__rm} -rf contrib/php4/examples/CVS # Put the php config bit into place @@ -115,10 +109,6 @@ # This is so rpm doesn't pick up perl module dependencies automatically find examples/ contrib/ -type f -exec chmod 0644 {} \; -# Put man pages back into place... -#%{__mkdir_p} %{buildroot}%{_mandir}/ -#%{__mv} %{buildroot}%{_prefix}/man/* %{buildroot}%{_mandir}/ - # Clean up the buildroot %{__rm} -rf %{buildroot}%{_prefix}/{contrib,doc,examples,html}/ @@ -153,10 +143,13 @@ %defattr(-, root, root) %doc contrib/php4/examples contrib/php4/README %config(noreplace) %{_sysconfdir}/php.d/rrdtool.ini -%{phpextdir}/rrdtool.so +%{php_extdir}/rrdtool.so %changelog +* Thu Jan 13 2005 Matthias Saou 1.0.49-2 +- Minor cleanups. + * Thu Aug 25 2004 Dag Wieers - 1.0.49-1 - Updated to release 1.0.49. From fedora-extras-commits at redhat.com Thu Jan 13 18:33:29 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:33:29 -0500 Subject: rpms/torcs-data/devel - New directory Message-ID: <200501131833.j0DIXTtO009650@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/torcs-data/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv9640/torcs-data/devel Log Message: Directory /cvs/extras/rpms/torcs-data/devel added to the repository From fedora-extras-commits at redhat.com Thu Jan 13 18:33:29 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:33:29 -0500 Subject: rpms/torcs-data - New directory Message-ID: <200501131833.j0DIXTi1009647@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/torcs-data In directory cvs.fedora.redhat.com:/tmp/cvs-serv9640/torcs-data Log Message: Directory /cvs/extras/rpms/torcs-data added to the repository From fedora-extras-commits at redhat.com Thu Jan 13 18:33:41 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:33:41 -0500 Subject: rpms/torcs-data Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501131833.j0DIXfT3009709@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/torcs-data In directory cvs.fedora.redhat.com:/tmp/cvs-serv9700 Added Files: Makefile import.log Log Message: Setup of module torcs-data --- NEW FILE Makefile --- # Top level Makefile for module torcs-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 Thu Jan 13 18:33:41 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:33:41 -0500 Subject: rpms/torcs-data/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501131833.j0DIXfQv009712@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/torcs-data/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv9700/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module torcs-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 Thu Jan 13 18:41:24 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:41:24 -0500 Subject: rpms/torcs-data import.log,1.1,1.2 Message-ID: <200501131841.j0DIfOhc009868@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/torcs-data In directory cvs.fedora.redhat.com:/tmp/cvs-serv9859 Modified Files: import.log Log Message: auto-import torcs-data-1.2.2-1.fr on branch devel from torcs-data-1.2.2-1.fr.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/torcs-data/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Jan 2005 18:33:39 -0000 1.1 +++ import.log 13 Jan 2005 18:41:22 -0000 1.2 @@ -0,0 +1 @@ +torcs-data-1_2_2-1_fr:HEAD:torcs-data-1.2.2-1.fr.src.rpm:1105641671 From fedora-extras-commits at redhat.com Thu Jan 13 18:41:24 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:41:24 -0500 Subject: rpms/torcs-data/devel torcs-data.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501131841.j0DIfOFR009872@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/torcs-data/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv9859/devel Modified Files: .cvsignore sources Added Files: torcs-data.spec Log Message: auto-import torcs-data-1.2.2-1.fr on branch devel from torcs-data-1.2.2-1.fr.src.rpm --- NEW FILE torcs-data.spec --- # $Id: torcs-data.spec 1833 2004-08-02 23:22:28Z dag $ # Authority: matthias # Dist: nodist Summary: The Open Racing Car Simulator data files Name: torcs-data Version: 1.2.2 Release: 1.fr License: GPL Group: Amusements/Games URL: http://torcs.org/ Source0: http://dl.sf.net/torcs/TORCS-%{version}-data.tgz Source1: http://dl.sf.net/torcs/TORCS-%{version}-data-tracks-dirt.tgz Source2: http://dl.sf.net/torcs/TORCS-%{version}-data-tracks-oval.tgz Source3: http://dl.sf.net/torcs/TORCS-%{version}-data-tracks-road.tgz Source4: http://dl.sf.net/torcs/TORCS-%{version}-data-cars-extra.tgz Source5: http://dl.sf.net/torcs/TORCS-%{version}-data-cars-kcendra-gt.tgz Source6: http://dl.sf.net/torcs/TORCS-%{version}-data-cars-kcendra-roadsters.tgz Source7: http://dl.sf.net/torcs/TORCS-%{version}-data-cars-kcendra-sport.tgz Source8: http://dl.sf.net/torcs/TORCS-%{version}-data-cars-nascar.tgz Source9: http://dl.sf.net/torcs/TORCS-%{version}-data-cars-Patwo-Design.tgz Source10: http://dl.sf.net/torcs/TORCS-%{version}-data-cars-VM.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: torcs, %{name}-tracks = %{version} BuildArch: noarch %description TORCS is a 3D racing cars simulator using OpenGL. The goal is to have programmed robots drivers racing against each others. You can also drive yourself with either a wheel, keyboard or mouse. This package contains the data files needed to run the game. %package tracks-dirt Summary: The Open Racing Car Simulator additional dirt tracks Group: Amusements/Games Requires: torcs Provides: %{name}-tracks = %{version}-%{release} %description tracks-dirt TORCS is a 3D racing cars simulator using OpenGL. The goal is to have programmed robots drivers racing against each others. You can also drive yourself with either a wheel, keyboard or mouse. This package contains additional tracks for the game. %package tracks-oval Summary: The Open Racing Car Simulator additional oval tracks Group: Amusements/Games Requires: torcs Provides: %{name}-tracks = %{version}-%{release} %description tracks-oval TORCS is a 3D racing cars simulator using OpenGL. The goal is to have programmed robots drivers racing against each others. You can also drive yourself with either a wheel, keyboard or mouse. This package contains additional tracks for the game. %package tracks-road Summary: The Open Racing Car Simulator additional road tracks Group: Amusements/Games Requires: torcs Provides: %{name}-tracks = %{version}-%{release} %description tracks-road TORCS is a 3D racing cars simulator using OpenGL. The goal is to have programmed robots drivers racing against each others. You can also drive yourself with either a wheel, keyboard or mouse. This package contains additional tracks for the game. %package cars-extra Summary: The Open Racing Car Simulator additional cars Group: Amusements/Games Requires: torcs %description cars-extra TORCS is a 3D racing cars simulator using OpenGL. The goal is to have programmed robots drivers racing against each others. You can also drive yourself with either a wheel, keyboard or mouse. This package contains additional cars for the game. %package cars-kcendra-gt Summary: The Open Racing Car Simulator additional kcendra GT cars Group: Amusements/Games Requires: torcs %description cars-kcendra-gt TORCS is a 3D racing cars simulator using OpenGL. The goal is to have programmed robots drivers racing against each others. You can also drive yourself with either a wheel, keyboard or mouse. This package contains additional cars for the game. %package cars-kcendra-roadsters Summary: The Open Racing Car Simulator additional kcendra roadsters Group: Amusements/Games Requires: torcs %description cars-kcendra-roadsters TORCS is a 3D racing cars simulator using OpenGL. The goal is to have programmed robots drivers racing against each others. You can also drive yourself with either a wheel, keyboard or mouse. This package contains additional cars for the game. %package cars-kcendra-sport Summary: The Open Racing Car Simulator additional kcendra sport cars Group: Amusements/Games Requires: torcs %description cars-kcendra-sport TORCS is a 3D racing cars simulator using OpenGL. The goal is to have programmed robots drivers racing against each others. You can also drive yourself with either a wheel, keyboard or mouse. This package contains additional cars for the game. %package cars-nascar Summary: The Open Racing Car Simulator additional NASCAR cars Group: Amusements/Games Requires: torcs %description cars-nascar TORCS is a 3D racing cars simulator using OpenGL. The goal is to have programmed robots drivers racing against each others. You can also drive yourself with either a wheel, keyboard or mouse. This package contains additional cars for the game. %package cars-Patwo-Design Summary: The Open Racing Car Simulator addition Patwo Design cars Group: Amusements/Games License: Other Requires: torcs %description cars-Patwo-Design TORCS is a 3D racing cars simulator using OpenGL. The goal is to have programmed robots drivers racing against each others. You can also drive yourself with either a wheel, keyboard or mouse. This package contains additional Patwo Design cars (non free!!!). %package cars-VM Summary: The Open Racing Car Simulator additional VM cars Group: Amusements/Games Requires: torcs %description cars-VM TORCS is a 3D racing cars simulator using OpenGL. The goal is to have programmed robots drivers racing against each others. You can also drive yourself with either a wheel, keyboard or mouse. This package contains additional cars for the game. %prep %setup -T -c %{name}-%{version} # Uncompress all packages in a separate tree for source in %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE10}; do package="`basename ${source} .tgz | sed 's/TORCS-%{version}-//g'`" mkdir -p ${package}%{_datadir}/games/torcs/ ( cd ${package}%{_datadir}/games/torcs/ tar xzf %{_sourcedir}/TORCS-%{version}-${package}.tgz ) echo ${package} >> package.list done %build # List each package's files for package in `cat package.list`; do ( cd ${package} find .%{_datadir}/games/torcs -type d \ | sed s/^./\%dir\ / > ../${package}.files find .%{_datadir}/games/torcs -type f \ | sed s/^.// >> ../${package}.files ) done %install %{__rm} -rf %{buildroot} # Install all trees into the main build root mkdir -p %{buildroot} for package in `cat package.list`; do cp -a ${package}/* %{buildroot}/ done %clean %{__rm} -rf %{buildroot} %files -f data.files %defattr(-, root, root, 0755) %files tracks-dirt -f data-tracks-dirt.files %defattr(-, root, root, 0755) %files tracks-oval -f data-tracks-oval.files %defattr(-, root, root, 0755) %files tracks-road -f data-tracks-road.files %defattr(-, root, root, 0755) %files cars-extra -f data-cars-extra.files %defattr(-, root, root, 0755) %files cars-kcendra-gt -f data-cars-kcendra-gt.files %defattr(-, root, root, 0755) %files cars-kcendra-roadsters -f data-cars-kcendra-roadsters.files %defattr(-, root, root, 0755) %files cars-kcendra-sport -f data-cars-kcendra-sport.files %defattr(-, root, root, 0755) %files cars-nascar -f data-cars-nascar.files %defattr(-, root, root, 0755) %files cars-Patwo-Design -f data-cars-Patwo-Design.files %defattr(-, root, root, 0755) %files cars-VM -f data-cars-VM.files %defattr(-, root, root, 0755) %changelog * Thu Feb 26 2004 Matthias Saou 1.2.2-1.fr - Update to 1.2.1 - Added all new tracks : dirt, oval and road. - Added all new cars : kcendra-gt, kcendra-roadsters, kcendra-sport, nascar and VM. - Updated the %%setup and %%build sections to make them even more flexible. * Tue Nov 11 2003 Matthias Saou 1.2.1-4.fr - Rebuild for Fedora Core 1. * Tue May 27 2003 Matthias Saou - Added a requires on torcs for all packages. * Mon Apr 28 2003 Matthias Saou - Fixed the defattr problem, doh! * Wed Apr 23 2003 Matthias Saou - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/torcs-data/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Jan 2005 18:33:39 -0000 1.1 +++ .cvsignore 13 Jan 2005 18:41:22 -0000 1.2 @@ -0,0 +1,11 @@ +TORCS-1.2.2-data-cars-Patwo-Design.tgz +TORCS-1.2.2-data-cars-VM.tgz +TORCS-1.2.2-data-cars-extra.tgz +TORCS-1.2.2-data-cars-kcendra-gt.tgz +TORCS-1.2.2-data-cars-kcendra-roadsters.tgz +TORCS-1.2.2-data-cars-kcendra-sport.tgz +TORCS-1.2.2-data-cars-nascar.tgz +TORCS-1.2.2-data-tracks-dirt.tgz +TORCS-1.2.2-data-tracks-oval.tgz +TORCS-1.2.2-data-tracks-road.tgz +TORCS-1.2.2-data.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/torcs-data/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Jan 2005 18:33:39 -0000 1.1 +++ sources 13 Jan 2005 18:41:22 -0000 1.2 @@ -0,0 +1,11 @@ +df5706fd877d98cebf0d9977005304d4 TORCS-1.2.2-data-cars-Patwo-Design.tgz +4394bdbe9722cc8b962fea29dec9531d TORCS-1.2.2-data-cars-VM.tgz +96ff8279e7d77a40564122fa1a7a78b6 TORCS-1.2.2-data-cars-extra.tgz +858c0e05e589c88264472a27c94f2a29 TORCS-1.2.2-data-cars-kcendra-gt.tgz +7d490c510914a0cdab5939cca66f37cb TORCS-1.2.2-data-cars-kcendra-roadsters.tgz +3e574373fe582269f927b94b3d01ccfa TORCS-1.2.2-data-cars-kcendra-sport.tgz +4b20ced6ffc65357ffddb31fbc561682 TORCS-1.2.2-data-cars-nascar.tgz +630e7e53ffcd84a46175a7627438ba2b TORCS-1.2.2-data-tracks-dirt.tgz +846a977e0a147de2560b23e740ebdecb TORCS-1.2.2-data-tracks-oval.tgz +78dabde8e38aa618fcfa570a5835732e TORCS-1.2.2-data-tracks-road.tgz +241552524488396fc5cca4ff8c943709 TORCS-1.2.2-data.tgz From fedora-extras-commits at redhat.com Thu Jan 13 18:45:40 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:45:40 -0500 Subject: rpms/torcs-data/devel torcs-data.spec,1.1,1.2 Message-ID: <200501131845.j0DIjeR8009994@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/torcs-data/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv9985 Modified Files: torcs-data.spec Log Message: Clean up. Index: torcs-data.spec =================================================================== RCS file: /cvs/extras/rpms/torcs-data/devel/torcs-data.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- torcs-data.spec 13 Jan 2005 18:41:22 -0000 1.1 +++ torcs-data.spec 13 Jan 2005 18:45:38 -0000 1.2 @@ -1,12 +1,7 @@ -# $Id$ -# Authority: matthias - -# Dist: nodist - Summary: The Open Racing Car Simulator data files Name: torcs-data Version: 1.2.2 -Release: 1.fr +Release: 1 License: GPL Group: Amusements/Games URL: http://torcs.org/ @@ -248,14 +243,14 @@ %changelog -* Thu Feb 26 2004 Matthias Saou 1.2.2-1.fr +* Thu Feb 26 2004 Matthias Saou 1.2.2-1 - Update to 1.2.1 - Added all new tracks : dirt, oval and road. - Added all new cars : kcendra-gt, kcendra-roadsters, kcendra-sport, nascar and VM. - Updated the %%setup and %%build sections to make them even more flexible. -* Tue Nov 11 2003 Matthias Saou 1.2.1-4.fr +* Tue Nov 11 2003 Matthias Saou 1.2.1-4 - Rebuild for Fedora Core 1. * Tue May 27 2003 Matthias Saou From fedora-extras-commits at redhat.com Thu Jan 13 18:52:16 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:52:16 -0500 Subject: rpms/torcs/devel torcs-1.2.2-build.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 torcs.spec, 1.1, 1.2 Message-ID: <200501131852.j0DIqGjl010060@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/torcs/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv10054 Modified Files: .cvsignore sources torcs.spec Added Files: torcs-1.2.2-build.patch Log Message: Update to my own version, after approval. torcs-1.2.2-build.patch: --- NEW FILE torcs-1.2.2-build.patch --- diff -Naupr torcs-1.2.2.orig/Make-config torcs-1.2.2/Make-config --- torcs-1.2.2.orig/Make-config 2004-02-12 19:12:42.000000000 +0100 +++ torcs-1.2.2/Make-config 2004-07-23 18:09:23.050675688 +0200 @@ -47,13 +47,13 @@ INSTALL_SCRIPT = ${INSTALL_PROGRAM} mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CFLAGSD = -D_SVID_SOURCE -D_BSD_SOURCE -DSHM -CXXFLAGS = -march=i686 -Wall -Wstrict-prototypes -O3 -mieee-fp -Wall -Wstrict-prototypes -O3 -mieee-fp -march=i686 ${CFLAGSD} -CFLAGS = -march=i686 -Wall -Wstrict-prototypes -O3 -mieee-fp -Wall -Wstrict-prototypes -O3 -mieee-fp ${CFLAGSD} +CXXFLAGS = $(RPM_OPT_FLAGS) -fPIC -Wall -mieee-fp -Wall -Wstrict-prototypes ${CFLAGSD} +CFLAGS = $(RPM_OPT_FLAGS) -fPIC -Wall -mieee-fp -Wall -Wstrict-prototypes ${CFLAGSD} #EXT_LIBS = -lpthread -lplibssgaux -lplibssg -lplibsm -lplibsl -lplibsg -lplibul -lglut -lGLU -lGL -lpng -lz -ldl -lXxf86vm -lXmu -lXi -lXt -lSM -lICE -lXext -lX11 -lm EXT_LIBS = -lplibssgaux -lplibssg -lplibsm -lplibsl -lplibsg -lplibul -lglut -lGLU -lGL -lpng -lz -ldl -lXxf86vm -lXmu -lXi -lXt -lSM -lICE -lXext -lX11 -lm #LDFLAGS = -L/usr/X11R6/lib -L${EXPORTBASE}/lib -L/usr/lib -L/usr/local/lib -LDFLAGS = -L${EXPORTBASE}/lib -L/usr/X11R6/lib -L/usr/lib +LDFLAGS = -fPIC -L${EXPORTBASE}/lib -L/usr/X11R6/lib -L/usr/lib #INCFLAGS = -I${EXPORTBASE}/include -I/usr/include -I/usr/local/include INCFLAGS = -I${EXPORTBASE}/include Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/torcs/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:28:23 -0000 1.2 +++ .cvsignore 13 Jan 2005 18:52:14 -0000 1.3 @@ -1,8 +1,6 @@ -TORCS-1.2.1-data-cars-Patwo-Design.tgz -TORCS-1.2.1-data-cars-extra.tgz -TORCS-1.2.1-data-tracks-base.tgz -TORCS-1.2.1-data.tgz -TORCS-1.2.1-src-robots-K1999.tgz -TORCS-1.2.1-src-robots-base.tgz -TORCS-1.2.1-src-robots-berniw.tgz -TORCS-1.2.1-src.tgz +TORCS-1.2.2-src.tgz +TORCS-1.2.2-src-robots-base.tgz +TORCS-1.2.2-src-robots-berniw.tgz +TORCS-1.2.2-src-robots-billy.tgz +TORCS-1.2.2-src-robots-bt.tgz +TORCS-1.2.2-src-robots-K1999.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/torcs/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:28:23 -0000 1.2 +++ sources 13 Jan 2005 18:52:14 -0000 1.3 @@ -1,8 +1,6 @@ -dddb6ffec22c15a9f8c60d0c69a806cf TORCS-1.2.1-data-cars-Patwo-Design.tgz -1b96f6f9eedda8d1857f9bd112664ab6 TORCS-1.2.1-data-cars-extra.tgz -afb991a29f875e2030f2ad24d82d2c22 TORCS-1.2.1-data-tracks-base.tgz -b7c8729b122d1a3bc1fc563783828d12 TORCS-1.2.1-data.tgz -ee6a5f0099723087585d1295a2d3b48d TORCS-1.2.1-src-robots-K1999.tgz -f21e4e88c2d6982efb28798d02b1c491 TORCS-1.2.1-src-robots-base.tgz -df4588752f50eedee7aa0d6f5df74036 TORCS-1.2.1-src-robots-berniw.tgz -5e43742b252f1e96f8d93da82b8f9fbb TORCS-1.2.1-src.tgz +cf03f0623eab7f9f7d6b13ac20660515 TORCS-1.2.2-src.tgz +425b9737f951f95e4255f81b60449f94 TORCS-1.2.2-src-robots-base.tgz +7e49902b503edb9245c95ffb682bc5c1 TORCS-1.2.2-src-robots-berniw.tgz +43af2098b788aa96556c8939048ac1b3 TORCS-1.2.2-src-robots-billy.tgz +e81c9f15a8089b138113621e9e7013d1 TORCS-1.2.2-src-robots-bt.tgz +b092acfca04bd4708f9722fe0732ba75 TORCS-1.2.2-src-robots-K1999.tgz Index: torcs.spec =================================================================== RCS file: /cvs/extras/rpms/torcs/devel/torcs.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- torcs.spec 8 Nov 2004 05:28:23 -0000 1.1 +++ torcs.spec 13 Jan 2005 18:52:14 -0000 1.2 @@ -1,233 +1,154 @@ -Summary: An OpenGL 3d racing game -Name: torcs -Version: 1.2.1 -Release: 0.fdr.9.rh90 -Epoch: 0 -License: GPL -Group: Amusements/Games -URL: http://torcs.org/ -Source0: TORCS-%{version}-src.tgz -Source1: TORCS-%{version}-src-robots-base.tgz -Source2: TORCS-%{version}-src-robots-berniw.tgz -Source3: TORCS-%{version}-src-robots-K1999.tgz -Source4: TORCS-%{version}-data.tgz -Source5: TORCS-%{version}-data-tracks-base.tgz -Source6: TORCS-%{version}-data-cars-extra.tgz -Source7: TORCS-%{version}-data-cars-Patwo-Design.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -BuildRequires: XFree86-devel glut-devel zlib-devel libpng-devel desktop-file-utils -BuildRequires: plib-devel >= 0:1.6.0 -Requires: %{name}-robots %{name}-data - -%package robots-base -Summary: Base robots for torcs -Group: Amusements/Games -Provides: %{name}-robots -Requires: %{name} %{name}-data-cars-extra - -%package robots-berniw -Summary: Berniw robots for torcs -Group: Amusements/Games -Provides: %{name}-robots -Requires: %{name} - -%package robots-K1999 -Summary: K1999 robots for torcs -Group: Amusements/Games -Provides: %{name}-robots -Requires: %{name} - -%package data -Summary: Data for torcs -Group: Amusements/Games -Requires: %{name} -Requires: %{name}-robots-base - -%package data-tracks -Summary: Tracks for torcs -Group: Amusements/Games -Requires: %{name} - -%package data-cars-extra -Summary: Cars model for torcs -Group: Amusements/Games -Requires: %{name} - -%package data-cars-Patwo-Design -Summary: Cars model for torcs -Group: Amusements/Games -Requires: %{name} +%define desktop_vendor fedora + +Summary: The Open Racing Car Simulator +Name: torcs +Version: 1.2.2 +Release: 4 +License: GPL +Group: Amusements/Games +URL: http://torcs.org/ +Source: http://dl.sf.net/torcs/TORCS-%{version}-src.tgz +Source1: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-base.tgz +Source2: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-berniw.tgz +Source3: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-K1999.tgz +Source4: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-billy.tgz +Source5: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-bt.tgz +Patch: torcs-1.2.2-build.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Requires: torcs-data +%{?_without_xorg:BuildRequires: XFree86-devel, XFree86-Mesa-libGLU, XFree86-Mesa-libGL} +%{!?_without_xorg:BuildRequires: xorg-x11-devel, xorg-x11-Mesa-libGLU, xorg-x11-Mesa-libGL} +BuildRequires: gcc-c++, plib16-devel, freeglut-devel +BuildRequires: libpng-devel, libjpeg-devel, zlib-devel +BuildRequires: desktop-file-utils -#--------------------------------------------------------------------- %description -TORCS is a 3D racing cars simulator using OpenGL. The goal is to have -programmed robot drivers racing against each others. Nevertheless, a -joystick interface is present in order to drive yourself. - -%description robots-base -TORCS is a 3D racing cars simulator using OpenGL. The goal is to have -programmed robot drivers racing against each others. Nevertheless, a -joystick interface is present in order to drive yourself. -This package contains some driver bot for torcs - -%description robots-berniw -TORCS is a 3D racing cars simulator using OpenGL. The goal is to have -programmed robot drivers racing against each others. Nevertheless, a -joystick interface is present in order to drive yourself. -This package contains some driver bot for torcs - -%description robots-K1999 -TORCS is a 3D racing cars simulator using OpenGL. The goal is to have -programmed robot drivers racing against each others. Nevertheless, a -joystick interface is present in order to drive yourself. -This package contains some driver bot for torcs - -%description data -TORCS is a 3D racing cars simulator using OpenGL. The goal is to have -programmed robot drivers racing against each others. Nevertheless, a -joystick interface is present in order to drive yourself. -This package contains mandatory data for %{name} - -%description data-tracks -TORCS is a 3D racing cars simulator using OpenGL. The goal is to have -programmed robot drivers racing against each others. Nevertheless, a -joystick interface is present in order to drive yourself. -This package contains some extra tracks for %{name} - -%description data-cars-extra -TORCS is a 3D racing cars simulator using OpenGL. The goal is to have -programmed robot drivers racing against each others. Nevertheless, a -joystick interface is present in order to drive yourself. -This package contains some extra car models - -%description data-cars-Patwo-Design -TORCS is a 3D racing cars simulator using OpenGL. The goal is to have -programmed robot drivers racing against each others. Nevertheless, a -joystick interface is present in order to drive yourself. -This package contains some extra car models +TORCS is a 3D racing cars simulator using OpenGL. The goal is to have +programmed robots drivers racing against each others. You can also drive +yourself with either a wheel, keyboard or mouse. + + +%package robots +Summary: The Open Racing Car Simulator robots +Group: Amusements/Games +Requires: %{name} + +%description robots +TORCS is a 3D racing cars simulator using OpenGL. The goal is to have +programmed robots drivers racing against each others. You can also drive +yourself with either a wheel, keyboard or mouse. + +This package contains the robots who can race on their own. + -#--------------------------------------------------------------------- %prep -%setup -q -b 1 -b 2 -b 3 +%setup -a 1 -a 2 -a 3 -a 4 -a 5 +%patch -p1 -b .build +# Put the drivers back where they belong +%{__mv} %{name}-%{version}/src/drivers/* src/drivers/ + -#--------------------------------------------------------------------- %build %configure -# Race conditions. -make +%{__make} %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags}" + -#--------------------------------------------------------------------- %install -rm -rf $RPM_BUILD_ROOT -%makeinstall -for i in %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} -do - tar zvxf $i -C $RPM_BUILD_ROOT/%{_datadir}/games/%{name} |\ - sed 's:^\.:%{_datadir}/games/%{name}:g' |\ - sed 's:^\(.\+/\)$:%%dir \1:g' > ${i##*/}.list -done +%{__rm} -rf %{buildroot} +%{__make} install DESTDIR=%{buildroot} -install -m 644 -D Ticon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png -cat > %{name}.desktop << EOF +%{__install} -m 644 -D Ticon.png %{buildroot}%{_datadir}/pixmaps/%{name}.png + +%{__cat} > %{name}.desktop << EOF [Desktop Entry] Name=TORCS -Comment=An OpenGL 3d racing game -Exec=%{name} -Icon=%{name}.png +Comment=The Open Racing Car Simulator +Exec=torcs +Icon=torcs.png Terminal=false Type=Application Encoding=UTF-8 +Categories=Application;Game; EOF -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install --vendor fedora \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Fedora \ - --add-category Application \ - --add-category Game \ - %{name}.desktop +%{__mkdir_p} %{buildroot}%{_datadir}/applications +desktop-file-install --vendor %{desktop_vendor} \ + --dir %{buildroot}%{_datadir}/applications \ + %{name}.desktop + +# We need this for proper automatic stripping to take place +find %{buildroot}%{_libdir}/%{name} -name '*.so' | xargs %{__chmod} +x + -#--------------------------------------------------------------------- %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} + -#--------------------------------------------------------------------- %files -%defattr(-,root,root,-) -%doc COPYING CHANGELOG.html -%{_bindir}/gennmtab -%{_bindir}/%{name} -%{_libdir}/lib*.so -%dir %{_datadir}/games +%defattr(-, root, root, 0755) +%doc CHANGELOG.html COPYING README.linux TODO.html +%{_bindir}/* +%dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/drivers +%{_libdir}/%{name}/drivers/human +%{_libdir}/%{name}/lib +%{_libdir}/%{name}/modules +%{_libdir}/%{name}/setup_linux.sh +%{_libdir}/%{name}/*-bin +%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop %dir %{_datadir}/games/%{name} -%dir %{_datadir}/games/%{name}/drivers -%dir %{_datadir}/games/%{name}/tracks -%{_datadir}/games/%{name}/%{name} %{_datadir}/games/%{name}/config -%{_datadir}/games/%{name}/modules -%{_datadir}/games/%{name}/setup_linux.sh -%{_datadir}/games/%{name}/telemetry +%dir %{_datadir}/games/%{name}/drivers %{_datadir}/games/%{name}/drivers/human +%{_datadir}/games/%{name}/results +%{_datadir}/games/%{name}/telemetry %{_datadir}/pixmaps/%{name}.png -%{_datadir}/applications/*%{name}.desktop -%files robots-base -%defattr(-,root,root,-) -%{_datadir}/games/%{name}/drivers/tita -%{_datadir}/games/%{name}/drivers/tanhoj -%{_datadir}/games/%{name}/drivers/lliaw -%{_datadir}/games/%{name}/drivers/inferno* -%{_datadir}/games/%{name}/drivers/damned -%{_datadir}/games/%{name}/drivers/cylos1 - -%files robots-berniw -%defattr(-,root,root,-) -%{_datadir}/games/%{name}/drivers/berniw2 -%{_datadir}/games/%{name}/drivers/berniw - -%files robots-K1999 -%defattr(-,root,root,-) -%{_datadir}/games/%{name}/drivers/K1999 - -%files data -f TORCS-%{version}-data.tgz.list -%defattr(-,root,root,-) - -%files data-tracks -f TORCS-%{version}-data-tracks-base.tgz.list -%defattr(-,root,root,-) -%files data-cars-extra -f TORCS-%{version}-data-cars-extra.tgz.list -%defattr(-,root,root,-) +%files robots +%defattr(-, root, root, 0755) +%dir %{_libdir}/%{name} +%{_libdir}/%{name}/drivers +# Easier this way, since we package them all-minus-one in ;-) +%exclude %{_libdir}/%{name}/drivers/human +%dir %{_datadir}/games/%{name} +%{_datadir}/games/%{name}/drivers +%exclude %{_datadir}/games/%{name}/drivers/human -%files data-cars-Patwo-Design -f TORCS-%{version}-data-cars-Patwo-Design.tgz.list -%defattr(-,root,root,-) -#--------------------------------------------------------------------- %changelog -* Mon Jul 7 2003 Dams 0:1.2.1-0.fdr.9 -- Added missing directories - -* Sat Jun 28 2003 Dams 0:1.2.1-0.fdr.8 -- removed ugliness in SourceX tags - -* Fri Jun 27 2003 Dams 0:1.2.1-0.fdr.7 -- Added missing dep - -* Thu Jun 26 2003 Dams 0:1.2.1-0.fdr.6 -- Removed URL in Source tags. -- Added Encoding for the desktop entry -- buildroot -> RPM_BUILD_ROOT +* Fri Nov 5 2004 Matthias Saou 1.2.2-4 +- Add +x chmod'ing to .so files in order to get them stripped properly. -* Thu Jun 26 2003 Dams 0:1.2.1-0.fdr.5 -- data now requires robots-base package +* Mon Oct 25 2004 Matthias Saou 1.2.2-3 +- Remove un-needed /sbin/ldconfig calls. -* Thu May 1 2003 Dams 0:1.2.1-0.fdr.4 -- Added dir entry in main package +* Fri Jul 23 2004 Matthias Saou 1.2.2-3 +- Change build dependency of plib to compat package plib16-devel as + rebuilding against 1.8 is not currently possible. +- Add patch for -fPIC to fix x86_64 build (hmm, doesn't work). + +* Thu May 20 2004 Matthias Saou 1.2.2-2 +- Rebuild for Fedora Core 2. +- Change XFree86 deps to xorg-x11 and glut to freeglut. + +* Thu Feb 26 2004 Matthias Saou 1.2.2-1 +- Update to 1.2.2. +- No longer require compat-libstdc++-devel for building. +- This version broke %%makeinstall, so switch to DESTDIR method. +- Re-enabled K1999 build, it works again. +- Added new robots : billy and bt. + +* Tue Jan 13 2004 Matthias Saou 1.2.1-4 +- Work around the XFree86 dependency problem by adding XFree86-Mesa-libGLU. + +* Tue Dec 2 2003 Matthias Saou 1.2.1-3 +- Rebuild for Fedora Core 1. +- Disabled build of the K1999 driver (strstream.h seems obsolete). -* Fri Apr 25 2003 Dams 0:1.2.1-0.fdr.3 -- Added dir entries according to discussion on bugzilla entry #203 +* Tue May 27 2003 Matthias Saou +- Added a torcs requirement to the robots package. -* Fri Apr 25 2003 Dams 0:1.2.1-0.fdr.2 -- Stole Desktop entry from Freshrpms spec file +* Wed Apr 23 2003 Matthias Saou +- Initial RPM release. -* Wed Apr 23 2003 Dams -- Initial build. From fedora-extras-commits at redhat.com Thu Jan 13 19:33:03 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 13 Jan 2005 14:33:03 -0500 Subject: rpms/liferea import.log,1.7,1.8 Message-ID: <200501131933.j0DJX3ju010978@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/liferea In directory cvs.fedora.redhat.com:/tmp/cvs-serv10969 Modified Files: import.log Log Message: auto-import liferea-0.6.4-0.fdr.1.b.2 on branch FC-2 from liferea-0.6.4-0.fdr.1.b.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/liferea/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 12 Jan 2005 20:05:46 -0000 1.7 +++ import.log 13 Jan 2005 19:33:01 -0000 1.8 @@ -4,3 +4,4 @@ liferea-0_5_3-0_fdr_3_c_2:HEAD:liferea-0.5.3-0.fdr.3.c.2.src.rpm:1099889383 liferea-0_5_3-0_fdr_4_c_2:HEAD:liferea-0.5.3-0.fdr.4.c.2.src.rpm:1099889386 liferea-0_6_4-1_b:HEAD:liferea-0.6.4-1.b.src.rpm:1105560383 +liferea-0_6_4-0_fdr_1_b_2:FC-2:liferea-0.6.4-0.fdr.1.b.2.src.rpm:1105644774 From fedora-extras-commits at redhat.com Thu Jan 13 19:33:03 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 13 Jan 2005 14:33:03 -0500 Subject: rpms/liferea/FC-2 .cvsignore, 1.2, 1.3 liferea.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200501131933.j0DJX3ar010982@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/liferea/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv10969/FC-2 Modified Files: .cvsignore liferea.spec sources Log Message: auto-import liferea-0.6.4-0.fdr.1.b.2 on branch FC-2 from liferea-0.6.4-0.fdr.1.b.2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-2/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:49:13 -0000 1.2 +++ .cvsignore 13 Jan 2005 19:33:01 -0000 1.3 @@ -1 +1 @@ -liferea-0.5.3b.tar.gz +liferea-0.6.4b.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-2/liferea.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- liferea.spec 25 Nov 2004 06:15:04 -0000 1.5 +++ liferea.spec 13 Jan 2005 19:33:01 -0000 1.6 @@ -1,13 +1,13 @@ Name: liferea -Version: 0.6.1 -Release: 0.fdr.1.2 +Version: 0.6.4 +Release: 0.fdr.1.b.2 Epoch: 0 Summary: An RSS/RDF feed reader. Group: Applications/Internet License: GPL URL: http://liferea.sourceforge.net/ -Source0: http://download.sourceforge.net/liferea/liferea-0.6.1.tar.gz +Source0: http://download.sourceforge.net/liferea/liferea-0.6.4b.tar.gz Source2: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -31,7 +31,7 @@ %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{version}b %build @@ -83,6 +83,9 @@ %changelog +* Wed Jan 12 2005 Brian Pepple - 0:0.6.4-0.fdr.1.b +- Updated to 0.6.4b. + * Mon Nov 1 2004 Brian Pepple - 0:0.6.1-0.fdr.1 - Updated to 0.6.1. - Added %exclude *.la Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-2/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 25 Nov 2004 06:15:04 -0000 1.3 +++ sources 13 Jan 2005 19:33:01 -0000 1.4 @@ -1 +1 @@ -a9a03cdeeb2a57c96dd8e7718917e787 liferea-0.6.1.tar.gz +d45086ee3fc098cc9ca146bece0ddf9f liferea-0.6.4b.tar.gz From ville.skytta at iki.fi Thu Jan 13 19:44:20 2005 From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=) Date: Thu, 13 Jan 2005 21:44:20 +0200 Subject: /cvs/extras/tags/liferea: Permission denied In-Reply-To: <200501131933.j0DJX3ar010982@cvs.fedora.redhat.com> References: <200501131933.j0DJX3ar010982@cvs.fedora.redhat.com> Message-ID: <1105645460.524.7.camel@bobcat.mine.nu> On Thu, 2005-01-13 at 14:33 -0500, Ville Skytta wrote: > Author: scop > > Update of /cvs/extras/rpms/liferea/FC-2 > In directory cvs.fedora.redhat.com:/tmp/cvs-serv10969/FC-2 > > Modified Files: > .cvsignore liferea.spec sources > Log Message: > auto-import liferea-0.6.4-0.fdr.1.b.2 on branch FC-2 from liferea-0.6.4-0.fdr.1.b.2.src.rpm While importing this, I got: [...] Source upload succeeded. Don't forget to commit the new ./sources file M sources M .cvsignore cvs commit... Commit Complete /cvs/extras/CVSROOT/tag-check: line 156: /cvs/extras/tags/liferea: Permission denied Tagging 'liferea-0_6_4-0_fdr_1_b_2' complete. I didn't notice any breakage from this, but perhaps someone wants to take a look at what's causing the error. From fedora-extras-commits at redhat.com Thu Jan 13 19:51:11 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 13 Jan 2005 14:51:11 -0500 Subject: rpms/perl-Test-Pod-Coverage - New directory Message-ID: <200501131951.j0DJpBX5011214@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Test-Pod-Coverage In directory cvs.fedora.redhat.com:/tmp/cvs-serv11207/perl-Test-Pod-Coverage Log Message: Directory /cvs/extras/rpms/perl-Test-Pod-Coverage added to the repository From fedora-extras-commits at redhat.com Thu Jan 13 19:51:11 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 13 Jan 2005 14:51:11 -0500 Subject: rpms/perl-Test-Pod-Coverage/devel - New directory Message-ID: <200501131951.j0DJpBJe011217@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Test-Pod-Coverage/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv11207/perl-Test-Pod-Coverage/devel Log Message: Directory /cvs/extras/rpms/perl-Test-Pod-Coverage/devel added to the repository From fedora-extras-commits at redhat.com Thu Jan 13 19:51:29 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 13 Jan 2005 14:51:29 -0500 Subject: rpms/perl-Test-Pod-Coverage Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501131951.j0DJpTlM011279@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Test-Pod-Coverage In directory cvs.fedora.redhat.com:/tmp/cvs-serv11270 Added Files: Makefile import.log Log Message: Setup of module perl-Test-Pod-Coverage --- NEW FILE Makefile --- # Top level Makefile for module perl-Test-Pod-Coverage all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 13 19:51:29 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 13 Jan 2005 14:51:29 -0500 Subject: rpms/perl-Test-Pod-Coverage/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501131951.j0DJpT4Z011282@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Test-Pod-Coverage/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv11270/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Test-Pod-Coverage --- NEW 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 Jan 13 19:51:58 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 13 Jan 2005 14:51:58 -0500 Subject: rpms/perl-Test-Pod-Coverage import.log,1.1,1.2 Message-ID: <200501131951.j0DJpwS3011379@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Test-Pod-Coverage In directory cvs.fedora.redhat.com:/tmp/cvs-serv11369 Modified Files: import.log Log Message: auto-import perl-Test-Pod-Coverage-1.06-1 on branch devel from perl-Test-Pod-Coverage-1.06-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Jan 2005 19:51:27 -0000 1.1 +++ import.log 13 Jan 2005 19:51:56 -0000 1.2 @@ -0,0 +1 @@ +perl-Test-Pod-Coverage-1_06-1:HEAD:perl-Test-Pod-Coverage-1.06-1.src.rpm:1105645910 From fedora-extras-commits at redhat.com Thu Jan 13 19:51:58 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 13 Jan 2005 14:51:58 -0500 Subject: rpms/perl-Test-Pod-Coverage/devel perl-Test-Pod-Coverage.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501131951.j0DJpwsa011382@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Test-Pod-Coverage/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv11369/devel Modified Files: .cvsignore sources Added Files: perl-Test-Pod-Coverage.spec Log Message: auto-import perl-Test-Pod-Coverage-1.06-1 on branch devel from perl-Test-Pod-Coverage-1.06-1.src.rpm --- NEW FILE perl-Test-Pod-Coverage.spec --- %{!?perl_vendorlib: %define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)} Name: perl-Test-Pod-Coverage Version: 1.06 Release: 1 Epoch: 0 Summary: Check for pod coverage in your distribution Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Test-Pod-Coverage/ Source0: http://www.cpan.org/authors/id/P/PE/PETDANCE/Test-Pod-Coverage-1.06.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 BuildRequires: perl(Pod::Coverage) BuildRequires: perl(Test::More), perl(Test::Pod), perl(Test::Builder::Tester) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Checks for POD coverage in files for your distribution. %prep %setup -q -n Test-Pod-Coverage-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check || : make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes %{perl_vendorlib}/Test/ %{_mandir}/man3/*.3* %changelog * Thu Jun 24 2004 Jose Pedro Oliveira - 0:1.06-1 - Update to 1.06. * Wed Jun 02 2004 Jose Pedro Oliveira - 0:1.04-0.fdr.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Jan 2005 19:51:27 -0000 1.1 +++ .cvsignore 13 Jan 2005 19:51:56 -0000 1.2 @@ -0,0 +1 @@ +Test-Pod-Coverage-1.06.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Jan 2005 19:51:27 -0000 1.1 +++ sources 13 Jan 2005 19:51:56 -0000 1.2 @@ -0,0 +1 @@ +2e9991d4ac04149179fa60f621b3f42f Test-Pod-Coverage-1.06.tar.gz From fedora-extras-commits at redhat.com Fri Jan 14 09:41:51 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:41:51 -0500 Subject: rpms/proj - New directory Message-ID: <200501140941.j0E9fpe4024590@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/proj In directory cvs.fedora.redhat.com:/tmp/cvs-serv24583/proj Log Message: Directory /cvs/extras/rpms/proj added to the repository From fedora-extras-commits at redhat.com Fri Jan 14 09:41:51 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:41:51 -0500 Subject: rpms/proj/devel - New directory Message-ID: <200501140941.j0E9fpf2024593@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/proj/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24583/proj/devel Log Message: Directory /cvs/extras/rpms/proj/devel added to the repository From fedora-extras-commits at redhat.com Fri Jan 14 09:42:10 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:42:10 -0500 Subject: rpms/proj Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501140942.j0E9gAoT024656@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/proj In directory cvs.fedora.redhat.com:/tmp/cvs-serv24647 Added Files: Makefile import.log Log Message: Setup of module proj --- NEW FILE Makefile --- # Top level Makefile for module proj all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 14 09:42:10 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:42:10 -0500 Subject: rpms/proj/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501140942.j0E9gACI024659@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/proj/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24647/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module proj --- NEW 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 Jan 14 09:45:23 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:45:23 -0500 Subject: rpms/proj import.log,1.1,1.2 Message-ID: <200501140945.j0E9jNTQ024773@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/proj In directory cvs.fedora.redhat.com:/tmp/cvs-serv24764 Modified Files: import.log Log Message: auto-import proj-4.4.8-4 on branch devel from proj-4.4.8-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/proj/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Jan 2005 09:42:08 -0000 1.1 +++ import.log 14 Jan 2005 09:45:21 -0000 1.2 @@ -0,0 +1 @@ +proj-4_4_8-4:HEAD:proj-4.4.8-4.src.rpm:1105695966 From fedora-extras-commits at redhat.com Fri Jan 14 09:45:23 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:45:23 -0500 Subject: rpms/proj/devel proj.copyright, NONE, 1.1 proj.copyright.patch, NONE, 1.1 proj.spec, NONE, 1.1 proj.test_scripts.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501140945.j0E9jNca024777@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/proj/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24764/devel Modified Files: .cvsignore sources Added Files: proj.copyright proj.copyright.patch proj.spec proj.test_scripts.patch Log Message: auto-import proj-4.4.8-4 on branch devel from proj-4.4.8-4.src.rpm --- NEW FILE proj.copyright --- This package was debianized by Peter S Galbraith psg at debian.org on Sun, 24 Oct 1999 14:13:26 -0400. It was downloaded from ftp://ftp.remotesensing.org/pub/proj/proj-4.4.5.tar.gz Web page: http://www.remotesensing.org/proj Old Web pages: http://kai.er.usgs.gov/ftp/mapgenproj.html http://www.vectaport.com/ivmaps/projinfo.html Version 4.3.3 was authored by: Gerald (Jerry) Ian Evenden email: gie at kai.er.usgs.gov gevenden at capecod.net phone: (508)563-6766 P.O. Box 1027 N.Falmouth, MA 02556-1027 Proj is a U.S. Government work and is not eligible for U.S. copyright protection. This is free software. Here's what Jerry replied when I asked what the license was: `The software was developed by the USGS and has no copyright nor license. Do with it what you will. :-)' Maintenance of proj has been taken up by Frank Warmerdam under the following license: All source, data files and other contents of the PROJ.4 package are available under the following terms. Note that the PROJ 4.3 and earlier was "public domain" as is common with US government work, but apparently this is not a well defined legal term in many countries. I am placing everything under the following MIT style license because I believe it is effectively the same as public domain, allowing anyone to use the code as they wish, including making proprietary derivatives. Though I have put my own name as copyright holder, I don't mean to imply I did the work. Essentially all work was done by Gerald Evenden. -------------- Copyright (c) 2000, Frank Warmerdam Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. proj.copyright.patch: --- NEW FILE proj.copyright.patch --- --- proj.copyright 2004-08-13 10:28:21.000000000 -0700 +++ proj.copyright.fedora 2004-08-13 10:39:08.000000000 -0700 @@ -1,3 +1,15 @@ +This package was created for Fedora by David M. Kaplan dmkaplan at ucdavis.edu on +Fri Aug 13 10:31:34 PDT 2004. + +It was downloaded from ftp://ftp.remotesensing.org/pub/proj/proj-4.4.8.tar.gz + +Below is the version of the copyright that appeared with the Debian +version of this package. It explains the complete history of this +package, including the transfer of the license from a governmental +"public domain" license to an MIT-style license. + +==================Original Debian copyright file below====================== + This package was debianized by Peter S Galbraith psg at debian.org on Sun, 24 Oct 1999 14:13:26 -0400. --- NEW FILE proj.spec --- Name: proj Version: 4.4.8 Release: 4 Epoch: 0 Summary: Cartographic projection software (PROJ.4) Group: Applications/Engineering License: MIT URL: http://www.remotesensing.org/proj/ Source0: ftp://ftp.remotesensing.org/pub/proj/proj-4.4.8.tar.gz Source1: ftp://ftp.remotesensing.org/pub/proj/proj-nad27-1.1.tar.gz Source2: http://packages.debian.org/changelogs/pool/main/p/proj/proj_4.4.8-3/proj.copyright Patch0: proj.copyright.patch Patch1: proj.test_scripts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %package devel Summary: Development files for PROJ.4 Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} %package nad Summary: US and Canadian datum shift grids for PROJ.4 Group: Applications/Engineering Requires: %{name} = %{epoch}:%{version}-%{release} %description Proj and invproj perform respective forward and inverse transformation of cartographic data to or from cartesian data with a wide range of selectable projection functions. Proj docs: http://www.remotesensing.org/dl/new_docs/ %description devel This package contains libproj and the appropriate header files and man pages. %description nad This package contains additional US and Canadian datum shift grids. %prep %setup -q # Prepare copyright cp %{SOURCE2} ./ %patch0 -p0 -b .buildroot %patch1 -p1 -b .buildroot cp proj.copyright COPYING # Prepare nad cd nad gzip -dc %{SOURCE1} | tar -xvvf - cd .. %build %configure make OPTIMIZE="$RPM_OPT_FLAGS" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT %makeinstall install -p -m 0644 nad/pj_out27.dist nad/pj_out83.dist nad/td_out.dist $RPM_BUILD_ROOT%{_datadir}/%{name} install -p -m 0755 nad/test27 nad/test83 nad/testvarious $RPM_BUILD_ROOT%{_datadir}/%{name} %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc NEWS AUTHORS COPYING README ChangeLog %{_bindir}/* %{_mandir}/man1/*.1* %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %{_mandir}/man3/*.3* %{_includedir}/*.h %{_libdir}/*.so %{_libdir}/*.a %exclude %{_libdir}/libproj.la %files nad %defattr(-,root,root,-) %doc nad/README %attr(0755,root,root) %{_datadir}/%{name}/test27 %attr(0755,root,root) %{_datadir}/%{name}/test83 %attr(0755,root,root) %{_datadir}/%{name}/testvarious %{_datadir}/%{name} %changelog * Wed Dec 29 2004 David Kaplan - 0:4.4.8-4 - Added testvarious to nad distribution * Wed Dec 29 2004 David Kaplan - 0:4.4.8-0.fdr.3 - Added patch for test scripts so that they will work in installed rpm * Wed Dec 29 2004 David Kaplan - 0:4.4.8-0.fdr.2 - Fixed permissions on nad27 and nad83 - Included test27 and test83 in the nad rpm and made them executable * Fri Aug 13 2004 David M. Kaplan 0:4.4.8-0.fdr.1 - Updated to version 4.4.8 of library. - Changed license file so that it agrees with Debian version. - Updated web addresses of packages. * Wed Aug 11 2004 David M. Kaplan 0:4.4.7-0.fdr.3 - Removed the "Requires(post,postun)" * Tue Dec 30 2003 David M. Kaplan 0:4.4.7-0.fdr.2 - proj-nad now owns %{_datadir}/%{name} * Wed Oct 29 2003 Steve Arnold - Basically re-wrote previous spec file from scratch so as - to comply with both Fedora and RedHat 9 packaging guidelines. - Split files into proj, proj-devel, and proj-nad (additional grids) - and adjusted the EXE path in the test scripts. proj.test_scripts.patch: --- NEW FILE proj.test_scripts.patch --- diff -Naur proj-4.4.8.orig/nad/test27 proj-4.4.8/nad/test27 --- proj-4.4.8.orig/nad/test27 2004-12-29 13:00:31.428068481 -0800 +++ proj-4.4.8/nad/test27 2004-12-29 13:00:55.742384745 -0800 @@ -8,7 +8,7 @@ # Mercator due to greater precision of meridinal distance function. # OUT=proj_out27 -EXE=../src/proj +EXE=proj INIT_FILE=./nad27 # echo "doing tests into file ${OUT}, please wait" diff -Naur proj-4.4.8.orig/nad/test83 proj-4.4.8/nad/test83 --- proj-4.4.8.orig/nad/test83 2004-12-29 13:00:31.421069541 -0800 +++ proj-4.4.8/nad/test83 2004-12-29 13:01:04.976985631 -0800 @@ -8,7 +8,7 @@ # Mercator due to greater precision of meridinal distance function. # OUT=proj_out83 -EXE=../src/proj +EXE=proj INIT_FILE=./nad83 # echo "doing tests into file ${OUT}, please wait" diff -Naur proj-4.4.8.orig/nad/testvarious proj-4.4.8/nad/testvarious --- proj-4.4.8.orig/nad/testvarious 2004-12-29 13:00:31.420069693 -0800 +++ proj-4.4.8/nad/testvarious 2004-12-29 13:35:39.314658254 -0800 @@ -3,7 +3,7 @@ # # OUT=td_out -EXE=../src/cs2cs +EXE=cs2cs # echo "doing tests into file ${OUT}, please wait" rm -f ${OUT} Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/proj/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jan 2005 09:42:08 -0000 1.1 +++ .cvsignore 14 Jan 2005 09:45:21 -0000 1.2 @@ -0,0 +1,2 @@ +proj-4.4.8.tar.gz +proj-nad27-1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/proj/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jan 2005 09:42:08 -0000 1.1 +++ sources 14 Jan 2005 09:45:21 -0000 1.2 @@ -0,0 +1,2 @@ +1bdfb7bf5df081d029828ed47b780519 proj-4.4.8.tar.gz +66537aa24ad729d43db383abe2bf7707 proj-nad27-1.1.tar.gz From fedora-extras-commits at redhat.com Fri Jan 14 09:46:14 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:46:14 -0500 Subject: rpms/shapelib - New directory Message-ID: <200501140946.j0E9kEP3024895@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/shapelib In directory cvs.fedora.redhat.com:/tmp/cvs-serv24886/shapelib Log Message: Directory /cvs/extras/rpms/shapelib added to the repository From fedora-extras-commits at redhat.com Fri Jan 14 09:46:14 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:46:14 -0500 Subject: rpms/shapelib/devel - New directory Message-ID: <200501140946.j0E9kEaW024898@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/shapelib/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24886/shapelib/devel Log Message: Directory /cvs/extras/rpms/shapelib/devel added to the repository From fedora-extras-commits at redhat.com Fri Jan 14 09:46:35 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:46:35 -0500 Subject: rpms/shapelib Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501140946.j0E9kZE7024959@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/shapelib In directory cvs.fedora.redhat.com:/tmp/cvs-serv24950 Added Files: Makefile import.log Log Message: Setup of module shapelib --- NEW FILE Makefile --- # Top level Makefile for module shapelib all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 14 09:46:35 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:46:35 -0500 Subject: rpms/shapelib/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501140946.j0E9kZsG024962@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/shapelib/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24950/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module shapelib --- NEW 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 Jan 14 09:47:30 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:47:30 -0500 Subject: rpms/shapelib import.log,1.1,1.2 Message-ID: <200501140947.j0E9lUU2025061@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/shapelib In directory cvs.fedora.redhat.com:/tmp/cvs-serv25052 Modified Files: import.log Log Message: auto-import shapelib-1.2.10-5 on branch devel from shapelib-1.2.10-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/shapelib/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Jan 2005 09:46:33 -0000 1.1 +++ import.log 14 Jan 2005 09:47:27 -0000 1.2 @@ -0,0 +1 @@ +shapelib-1_2_10-5:HEAD:shapelib-1.2.10-5.src.rpm:1105696087 From fedora-extras-commits at redhat.com Fri Jan 14 09:47:30 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:47:30 -0500 Subject: rpms/shapelib/devel shapelib-1.2.10.patch, NONE, 1.1 shapelib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501140947.j0E9lUdZ025065@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/shapelib/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25052/devel Modified Files: .cvsignore sources Added Files: shapelib-1.2.10.patch shapelib.spec Log Message: auto-import shapelib-1.2.10-5 on branch devel from shapelib-1.2.10-5.src.rpm shapelib-1.2.10.patch: --- NEW FILE shapelib-1.2.10.patch --- diff -Naur shapelib-1.2.10.orig/Makefile shapelib-1.2.10/Makefile --- shapelib-1.2.10.orig/Makefile 2003-04-07 06:03:22.000000000 -0700 +++ shapelib-1.2.10/Makefile 2004-08-12 10:41:15.000000000 -0700 @@ -1,5 +1,9 @@ +bindir = /usr/local/bin +libdir = /usr/local/lib +includedir = /usr/local/include #LINKOPT = /usr/local/lib/libdbmalloc.a +CC = gcc CFLAGS = -g default: all @@ -99,21 +103,21 @@ 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 @@ -126,17 +130,23 @@ rm -fr .libs/libshp.lax (cd .libs && rm -f libshp.la && ln -s ../libshp.la libshp.la) -lib_install: +lib_install: cp .libs/libshp.la .libs/libshp.lai - /bin/sh ./mkinstalldirs /usr/local/lib - /bin/sh ./libtool --mode=install /usr/bin/install -c libshp.la /usr/local/lib/libshp.la - /usr/bin/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) - /usr/bin/install -c .libs/libshp.la /usr/local/lib/libshp.la - /usr/bin/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 - /usr/bin/install -c -m 644 shapefil.h /usr/local/include/libshp/shapefil.h + mkdir -p $(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 + mkdir -p $(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 diff -Naur shapelib-1.2.10.orig/contrib/Makefile shapelib-1.2.10/contrib/Makefile --- shapelib-1.2.10.orig/contrib/Makefile 2003-04-07 06:03:22.000000000 -0700 +++ shapelib-1.2.10/contrib/Makefile 2004-08-12 10:59:35.000000000 -0700 @@ -1,11 +1,14 @@ +bindir = /usr/local/bin #LINKOPT = /usr/local/lib/libdbmalloc.a #CFLAGS = -g # Endian: define either _LITTLE_ENDIAN or _BIG_ENDIAN +CC = gcc ENDIAN = -D_LITTLE_ENDIAN -CFLAGS = -g -I.. -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2 +EXTRACFLAGS = -g +CFLAGS = $(EXTRACFLAGS) -I.. -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2 SHPOBJ = ../shpopen.o ../dbfopen.o @@ -32,7 +35,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) @@ -57,3 +60,7 @@ testproj: tests/shpproj.sh + +install: all + install dbfcat dbfinfo shpcat shpcentrd shpdata shpdxf shpfix shpinfo shpwkb shpproj \ + $(bindir) --- NEW FILE shapelib.spec --- # This RPM will possibly fail on PowerPCs, but I am ignoring this. Summary: API in "C" for Shapefile handling Name: shapelib Version: 1.2.10 Release: 5 Epoch: 0 URL: http://shapelib.maptools.org/ Source: http://shapelib.maptools.org/dl/shapelib-%{version}.tar.gz Patch0: shapelib-%{version}.patch License: LGPL/MIT Group: Development/Libraries Buildrequires: libtool BuildRequires: proj-devel >= 0:4.4.1 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %package devel Summary: Development files for shapelib Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} %description The Shapefile C Library provides the ability to write simple C programs for reading, writing and updating (to a limited extent) ESRI Shapefiles, and the associated attribute file (.dbf). %description devel This package contains libshp and the appropriate header files. %prep %setup -q -T -b 0 %patch -p1 -b .buildroot %build make %{?_smp_mflags} libdir=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" lib make %{?_smp_mflags} libdir=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" all cd contrib make %{?_smp_mflags} libdir=%{_libdir} EXTRACFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT %makeinstall cd contrib %makeinstall %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root) %{_bindir}/* %{_libdir}/*.so.* %doc LICENSE.LGPL README README.tree dbf_api.html shapelib.html shp_api.html %doc contrib/doc/shpproj.txt stream1.sh stream1.out stream2.sh %doc stream2.out makeshape.sh stream3.out ChangeLog %files devel %defattr(-,root,root,-) %{_includedir}/* %{_libdir}/*.so %{_libdir}/*.a %exclude %{_libdir}/libshp.la %changelog * Wed Dec 15 2004 David M. Kaplan 0:1.2.10-5 - Patched patch and spec file according to suggestions of Michael Schwendt - In particular, this separates the building from the installing in the rpm. * Thu Aug 12 2004 David M. Kaplan 0:1.2.10-0.fdr.4 - Moved RPM_OPT_FLAGS out of make files. - Removed backup files from patch. - Made sure that make was using the appropriate libdir. * Mon Dec 22 2003 David M. Kaplan 0:1.2.10-0.fdr.3 - Added url tag, changed copyright to license and changed permissions on patch file. * Mon Dec 22 2003 David M. Kaplan 0:1.2.10-0.fdr.2 - Add source URL - Removed proj requirement as it is automatically detected. - Added epoch to proj-devel requirement - Fixed %post and %postun - Changed group to Development/Libraries, although this appears to be only somewhat satisfactory. - Removed "which make" * Wed Nov 5 2003 David M. Kaplan 0:1.2.10-0.fdr.1 - Updated to 1.2.10 release - Major changes to spec for Fedora - Changes to Makefile patch for Fedora - Split off devel package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/shapelib/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jan 2005 09:46:33 -0000 1.1 +++ .cvsignore 14 Jan 2005 09:47:28 -0000 1.2 @@ -0,0 +1 @@ +shapelib-1.2.10.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/shapelib/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jan 2005 09:46:33 -0000 1.1 +++ sources 14 Jan 2005 09:47:28 -0000 1.2 @@ -0,0 +1 @@ +4d96bd926167193d27bf14d56e2d484e shapelib-1.2.10.tar.gz From fedora-extras-commits at redhat.com Fri Jan 14 09:48:19 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:48:19 -0500 Subject: rpms/netcdf - New directory Message-ID: <200501140948.j0E9mJcv025180@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/netcdf In directory cvs.fedora.redhat.com:/tmp/cvs-serv25173/netcdf Log Message: Directory /cvs/extras/rpms/netcdf added to the repository From fedora-extras-commits at redhat.com Fri Jan 14 09:48:19 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:48:19 -0500 Subject: rpms/netcdf/devel - New directory Message-ID: <200501140948.j0E9mJY0025183@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/netcdf/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25173/netcdf/devel Log Message: Directory /cvs/extras/rpms/netcdf/devel added to the repository From fedora-extras-commits at redhat.com Fri Jan 14 09:48:39 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:48:39 -0500 Subject: rpms/netcdf Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501140948.j0E9mdwS025244@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/netcdf In directory cvs.fedora.redhat.com:/tmp/cvs-serv25235 Added Files: Makefile import.log Log Message: Setup of module netcdf --- NEW FILE Makefile --- # Top level Makefile for module netcdf all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 14 09:48:39 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:48:39 -0500 Subject: rpms/netcdf/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501140948.j0E9mdCG025247@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/netcdf/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25235/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module netcdf --- NEW 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 Jan 14 09:50:51 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:50:51 -0500 Subject: rpms/netcdf import.log,1.1,1.2 Message-ID: <200501140950.j0E9opnt025348@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/netcdf In directory cvs.fedora.redhat.com:/tmp/cvs-serv25339 Modified Files: import.log Log Message: auto-import netcdf-3.5.1-0.fdr.8 on branch devel from netcdf-3.5.1-0.fdr.8.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/netcdf/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Jan 2005 09:48:37 -0000 1.1 +++ import.log 14 Jan 2005 09:50:48 -0000 1.2 @@ -0,0 +1 @@ +netcdf-3_5_1-0_fdr_8:HEAD:netcdf-3.5.1-0.fdr.8.src.rpm:1105696292 From fedora-extras-commits at redhat.com Fri Jan 14 09:50:51 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:50:51 -0500 Subject: rpms/netcdf/devel netcdf-mandir.patch, NONE, 1.1 netcdf.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501140950.j0E9opRS025353@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/netcdf/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25339/devel Modified Files: .cvsignore sources Added Files: netcdf-mandir.patch netcdf.spec Log Message: auto-import netcdf-3.5.1-0.fdr.8 on branch devel from netcdf-3.5.1-0.fdr.8.src.rpm netcdf-mandir.patch: --- NEW FILE netcdf-mandir.patch --- --- netcdf-3.5.1/src/macros.make.in 2001-07-11 12:30:33.000000000 -0400 +++ netcdf-3.5.1/src/macros.make.in.new 2004-07-14 20:24:39.805458165 -0400 @@ -15,7 +15,7 @@ INCDIR = $(exec_prefix)/include LIBDIR = $(exec_prefix)/lib BINDIR = $(exec_prefix)/bin -MANDIR = $(prefix)/man +MANDIR = $(prefix)/share/man # Preprocessing: --- NEW FILE netcdf.spec --- Name: netcdf Version: 3.5.1 Release: 0.fdr.8 Epoch: 0 Summary: Libraries for the Unidata network Common Data Form (NetCDF) Group: Applications/Engineering License: NetCDF URL: http://my.unidata.ucar.edu/content/software/netcdf/index.html Source0: ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-3.5.1.tar.Z Patch0: netcdf-mandir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-g77 %description NetCDF (network Common Data Form) is an interface for array-oriented data access and a freely-distributed collection of software libraries for C, Fortran, C++, and perl that provides an implementation of the interface. The NetCDF library also defines a machine-independent format for representing scientific data. Together, the interface, library, and format support the creation, access, and sharing of scientific data. The NetCDF software was developed at the Unidata Program Center in Boulder, Colorado. NetCDF data is: o Self-Describing: A NetCDF file includes information about the data it contains. o Network-transparent: A NetCDF file is represented in a form that can be accessed by computers with different ways of storing integers, characters, and floating-point numbers. o Direct-access: A small subset of a large dataset may be accessed efficiently, without first reading through all the preceding data. o Appendable: Data can be appended to a NetCDF dataset along one dimension without copying the dataset or redefining its structure. The structure of a NetCDF dataset can be changed, though this sometimes causes the dataset to be copied. o Sharable: One writer and multiple readers may simultaneously access the same NetCDF file. %prep %setup -q %patch0 -p1 %build cd src %ifarch x86_64 mv macros.make.in OLD_macros.make.in cat OLD_macros.make.in | \ sed -e 's|exec_prefix)/lib|exec_prefix)/lib64|' > macros.make.in %endif export CPPFLAGS="-DNDEBUG -Df2cFortran -fPIC" export CFLAGS="$RPM_OPT_FLAGS -Df2cFortran -fPIC" %configure # WARNING! # The parallel build was tested and it does NOT work. # make %{?_smp_mflags} make %install rm -rf $RPM_BUILD_ROOT mkdir $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_prefix} mkdir -p $RPM_BUILD_ROOT/%{_datadir} mkdir -p $RPM_BUILD_ROOT/%{_mandir} cd src %makeinstall rm -rf $RPM_BUILD_ROOT/%{_mandir}/man3f %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc src/COPYRIGHT src/README src/COMPATIBILITY %{_bindir}/* %{_libdir}/*.a %{_includedir}/* %{_mandir}/*/* %changelog * Sun Aug 1 2004 Ed Hill - 0:3.5.1-0.fdr.8 - added -fPIC so x86_64 build works with nco package * Fri Jul 30 2004 Ed Hill - 0:3.5.1-0.fdr.7 - fix typo in the x86_64 build and now works on x86_64 * Thu Jul 15 2004 Ed Hill - 0:3.5.1-0.fdr.6 - fix license * Thu Jul 15 2004 Ed Hill - 0:3.5.1-0.fdr.5 - fix (hopefully?) x86_64 /usr/lib64 handling * Thu Jul 15 2004 Ed Hill - 0:3.5.1-0.fdr.4 - replace paths with macros * Thu Jul 15 2004 Ed Hill - 0:3.5.1-0.fdr.3 - fix spelling * Thu Jul 15 2004 Ed Hill - 0:3.5.1-0.fdr.2 - removed "--prefix=/usr" from %configure * Wed Jul 14 2004 Ed Hill - 0:3.5.1-0.fdr.1 - Remove unnecessary parts and cleanup for submission * Wed Jul 14 2004 Ed Hill - 0:3.5.1-0.fdr.0 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/netcdf/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jan 2005 09:48:37 -0000 1.1 +++ .cvsignore 14 Jan 2005 09:50:49 -0000 1.2 @@ -0,0 +1 @@ +netcdf-3.5.1.tar.Z Index: sources =================================================================== RCS file: /cvs/extras/rpms/netcdf/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jan 2005 09:48:37 -0000 1.1 +++ sources 14 Jan 2005 09:50:49 -0000 1.2 @@ -0,0 +1 @@ +52972e8765394010d2507a9a1dc02a56 netcdf-3.5.1.tar.Z From fedora-extras-commits at redhat.com Fri Jan 14 09:52:46 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:52:46 -0500 Subject: rpms/netcdf import.log,1.2,1.3 Message-ID: <200501140952.j0E9qk2c025468@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/netcdf In directory cvs.fedora.redhat.com:/tmp/cvs-serv25459 Modified Files: import.log Log Message: auto-import netcdf-3.6.0-0.2.beta6 on branch devel from netcdf-3.6.0-0.2.beta6.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/netcdf/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 14 Jan 2005 09:50:48 -0000 1.2 +++ import.log 14 Jan 2005 09:52:44 -0000 1.3 @@ -1 +1,2 @@ netcdf-3_5_1-0_fdr_8:HEAD:netcdf-3.5.1-0.fdr.8.src.rpm:1105696292 +netcdf-3_6_0-0_2_beta6:HEAD:netcdf-3.6.0-0.2.beta6.src.rpm:1105696408 From fedora-extras-commits at redhat.com Fri Jan 14 09:52:46 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:52:46 -0500 Subject: rpms/netcdf/devel .cvsignore, 1.2, 1.3 netcdf.spec, 1.1, 1.2 sources, 1.2, 1.3 netcdf-mandir.patch, 1.1, NONE Message-ID: <200501140952.j0E9qkCN025472@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/netcdf/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25459/devel Modified Files: .cvsignore netcdf.spec sources Removed Files: netcdf-mandir.patch Log Message: auto-import netcdf-3.6.0-0.2.beta6 on branch devel from netcdf-3.6.0-0.2.beta6.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/netcdf/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Jan 2005 09:50:49 -0000 1.2 +++ .cvsignore 14 Jan 2005 09:52:44 -0000 1.3 @@ -1 +1 @@ -netcdf-3.5.1.tar.Z +netcdf-3_6_0-beta6.tar.gz Index: netcdf.spec =================================================================== RCS file: /cvs/extras/rpms/netcdf/devel/netcdf.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- netcdf.spec 14 Jan 2005 09:50:49 -0000 1.1 +++ netcdf.spec 14 Jan 2005 09:52:44 -0000 1.2 @@ -1,28 +1,31 @@ Name: netcdf -Version: 3.5.1 -Release: 0.fdr.8 +Version: 3.6.0 +Release: 0.2.beta6 Epoch: 0 -Summary: Libraries for the Unidata network Common Data Form (NetCDF) +Summary: Libraries for the Unidata network Common Data Form (NetCDF v3) Group: Applications/Engineering License: NetCDF URL: http://my.unidata.ucar.edu/content/software/netcdf/index.html -Source0: ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-3.5.1.tar.Z -Patch0: netcdf-mandir.patch +Source0: ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-3_6_0-beta6.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-g77 +%package devel +Summary: Development files for netcdf-3 +Group: Development/Libraries +#Requires: %{name} = %{epoch}:%{version}-%{release} %description -NetCDF (network Common Data Form) is an interface for array-oriented -data access and a freely-distributed collection of software libraries -for C, Fortran, C++, and perl that provides an implementation of the -interface. The NetCDF library also defines a machine-independent -format for representing scientific data. Together, the interface, -library, and format support the creation, access, and sharing of -scientific data. The NetCDF software was developed at the Unidata -Program Center in Boulder, Colorado. +NetCDF-3 (network Common Data Form ver3) is an interface for +array-oriented data access and a freely-distributed collection of +software libraries for C, Fortran, C++, and perl that provides an +implementation of the interface. The NetCDF library also defines a +machine-independent format for representing scientific data. Together, +the interface, library, and format support the creation, access, and +sharing of scientific data. The NetCDF software was developed at the +Unidata Program Center in Boulder, Colorado. NetCDF data is: @@ -45,21 +48,25 @@ o Sharable: One writer and multiple readers may simultaneously access the same NetCDF file. +%description devel +This package contains the netCDF-3 header files, static libs, and man +pages. + %prep -%setup -q -%patch0 -p1 +cd $RPM_BUILD_DIR +rm -rf netcdf-3_6_0-beta6* +/usr/bin/gzip -dc $RPM_SOURCE_DIR/netcdf-3_6_0-beta6.tar.gz | tar -xf - +cd netcdf-3_6_0-beta6 +[ `/usr/bin/id -u` = '0' ] && /bin/chown -Rhf root . +[ `/usr/bin/id -u` = '0' ] && /bin/chgrp -Rhf root . +/bin/chmod -Rf a+rX,u+w,g-w,o-w . %build -cd src -%ifarch x86_64 - mv macros.make.in OLD_macros.make.in - cat OLD_macros.make.in | \ - sed -e 's|exec_prefix)/lib|exec_prefix)/lib64|' > macros.make.in -%endif -export CPPFLAGS="-DNDEBUG -Df2cFortran -fPIC" -export CFLAGS="$RPM_OPT_FLAGS -Df2cFortran -fPIC" +cd $RPM_BUILD_DIR/netcdf-3_6_0-beta6/src +export FC="g77" +export CPPFLAGS="-fPIC" %configure # WARNING! # The parallel build was tested and it does NOT work. @@ -69,12 +76,15 @@ %install rm -rf $RPM_BUILD_ROOT mkdir $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{_prefix} +mkdir -p $RPM_BUILD_ROOT/%{_includedir}/netcdf-3 +mkdir -p $RPM_BUILD_ROOT/%{_libdir}/netcdf-3 mkdir -p $RPM_BUILD_ROOT/%{_datadir} mkdir -p $RPM_BUILD_ROOT/%{_mandir} -cd src -%makeinstall -rm -rf $RPM_BUILD_ROOT/%{_mandir}/man3f +cd $RPM_BUILD_DIR/netcdf-3_6_0-beta6/src +%makeinstall INCDIR=${RPM_BUILD_ROOT}%{_includedir}/netcdf-3 \ + LIBDIR=${RPM_BUILD_ROOT}%{_libdir}/netcdf-3 \ + MANDIR=$RPM_BUILD_ROOT/%{_mandir} +rm -rf $RPM_BUILD_ROOT/%{_mandir}/man3f* %clean rm -rf $RPM_BUILD_ROOT @@ -82,14 +92,47 @@ %files %defattr(-,root,root,-) -%doc src/COPYRIGHT src/README src/COMPATIBILITY +%doc $RPM_BUILD_DIR/netcdf-3_6_0-beta6/src/COPYRIGHT $RPM_BUILD_DIR/netcdf-3_6_0-beta6/src/README $RPM_BUILD_DIR/netcdf-3_6_0-beta6/src/COMPATIBILITY %{_bindir}/* -%{_libdir}/*.a -%{_includedir}/* -%{_mandir}/*/* +%{_mandir}/man1/* + +%files devel +%defattr(-,root,root,-) +%{_includedir}/netcdf-3 +%{_libdir}/netcdf-3 +%{_mandir}/man3/* %changelog +* Sun Dec 12 2004 Ed Hill - 0:3.6.0-0.2.beta6 +- fix naming scheme for pre-releases (per Michael Schwendt) + +* Sat Dec 11 2004 Ed Hill - 0:3.6.0beta6-0.fdr.2 +- For Fortran, use only g77 (ignore gfortran, even if its installed) + +* Tue Dec 7 2004 Ed Hill - 0:3.6.0beta6-0.fdr.1 +- remove "BuildRequires: gcc4-gfortran" + +* Sat Dec 4 2004 Ed Hill - 0:3.6.0beta6-0.fdr.0 +- upgrade to 3.6.0beta6 +- create separate devel package that does *not* depend upon + the non-devel package and put the headers/libs in "netcdf-3" + subdirs for easy co-existance with upcoming netcdf-4 + +* Thu Dec 2 2004 Ed Hill - 0:3.5.1-0.fdr.12 +- remove unneeded %configure flags + +* Wed Dec 1 2004 Ed Hill - 0:3.5.1-0.fdr.11 +- headers in /usr/include/netcdf, libs in /usr/lib/netcdf + +* Mon Oct 4 2004 Ed Hill - 0:3.5.1-0.fdr.10 +- Put headers in their own directory but leave the libraries in the + %{_libdir} -- there are only two libs and the majority of other + "*-devel" packages follow this pattern + +* Sun Oct 3 2004 Michael Schwendt - 0:3.5.1-0.fdr.9 +- add patch to install lib and headers into own tree + * Sun Aug 1 2004 Ed Hill - 0:3.5.1-0.fdr.8 - added -fPIC so x86_64 build works with nco package Index: sources =================================================================== RCS file: /cvs/extras/rpms/netcdf/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Jan 2005 09:50:49 -0000 1.2 +++ sources 14 Jan 2005 09:52:44 -0000 1.3 @@ -1 +1 @@ -52972e8765394010d2507a9a1dc02a56 netcdf-3.5.1.tar.Z +6c914f05c3327dd91d05322b143f7e9b netcdf-3_6_0-beta6.tar.gz --- netcdf-mandir.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jan 14 10:10:05 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 05:10:05 -0500 Subject: rpms/netcdf/devel netcdf.spec,1.2,1.3 Message-ID: <200501141010.j0EAA5st026353@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/netcdf/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv26347 Modified Files: netcdf.spec Log Message: Apply fedora.us bug 1874 comment 64 Index: netcdf.spec =================================================================== RCS file: /cvs/extras/rpms/netcdf/devel/netcdf.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- netcdf.spec 14 Jan 2005 09:52:44 -0000 1.2 +++ netcdf.spec 14 Jan 2005 10:10:03 -0000 1.3 @@ -54,13 +54,7 @@ %prep -cd $RPM_BUILD_DIR -rm -rf netcdf-3_6_0-beta6* -/usr/bin/gzip -dc $RPM_SOURCE_DIR/netcdf-3_6_0-beta6.tar.gz | tar -xf - -cd netcdf-3_6_0-beta6 -[ `/usr/bin/id -u` = '0' ] && /bin/chown -Rhf root . -[ `/usr/bin/id -u` = '0' ] && /bin/chgrp -Rhf root . -/bin/chmod -Rf a+rX,u+w,g-w,o-w . +%setup -q -n netcdf-3_6_0-beta6 %build From fedora-extras-commits at redhat.com Fri Jan 14 20:00:31 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 15:00:31 -0500 Subject: rpms/bittorrent/devel bittorrent.spec,1.5,1.6 Message-ID: <200501142000.j0EK0VBm001620@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/bittorrent/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv1614 Modified Files: bittorrent.spec Log Message: Fix #143136, x86_64. Index: bittorrent.spec =================================================================== RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- bittorrent.spec 10 Dec 2004 22:03:01 -0000 1.5 +++ bittorrent.spec 14 Jan 2005 20:00:29 -0000 1.6 @@ -2,7 +2,7 @@ Name: bittorrent Version: 3.4.1 -Release: 2.a +Release: 3.a Epoch: 0 Summary: BitTorrent swarming network file transfer tool @@ -13,7 +13,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel -Requires: python, %{python_sitelib} +Requires: python +Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") + BuildArch: noarch %description @@ -79,6 +81,9 @@ %changelog +* Wed Dec 22 2004 Michael Schwendt - 0:3.4.1-3.a +- x86_64: Fix python dependency, replace with python-abi dependency. + * Mon Mar 29 2004 Marius L. J??hndal - 0:3.4.1-0.fdr.2.a - Changed Requires wxPythonGTK to wxPython (bug 1416). - Converted spec file to UTF-8. From fedora-extras-commits at redhat.com Fri Jan 14 20:15:10 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 15:15:10 -0500 Subject: rpms/python-sqlite/devel python-sqlite.spec,1.1,1.2 Message-ID: <200501142015.j0EKFAxR002380@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/python-sqlite/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv2374 Modified Files: python-sqlite.spec Log Message: Fixes, so fedora.us #2000 can be squashed. Index: python-sqlite.spec =================================================================== RCS file: /cvs/extras/rpms/python-sqlite/devel/python-sqlite.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-sqlite.spec 31 Dec 2004 18:19:21 -0000 1.1 +++ python-sqlite.spec 14 Jan 2005 20:15:08 -0000 1.2 @@ -1,10 +1,12 @@ +%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + Name: python-sqlite Version: 0.5.0 -Release: 0.fdr.1.3 -Summary: Python bindings for sqlite. +Release: 1 +Summary: Python bindings for SQLite Group: Development/Libraries -License: GPL +License: Freely distributable URL: http://pysqlite.sf.net/ Source: http://dl.sf.net/pysqlite/pysqlite-%{version}.tar.gz @@ -14,6 +16,8 @@ BuildRequires: python-devel BuildRequires: sqlite-devel +Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") + %description This packages allows you to use sqlite with python. sqlite is a simple database engine. @@ -21,13 +25,15 @@ %prep %setup -n pysqlite rm -f doc/rest/.*swp +chmod -x doc/rest/* LICENSE README %build +%{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT -python ./setup.py install \ - --prefix="$RPM_BUILD_ROOT/%{_prefix}" +%{__python} setup.py install -O1 --skip-build \ + --root %{buildroot} --prefix="%{_prefix}" %clean rm -rf $RPM_BUILD_ROOT @@ -35,9 +41,21 @@ %files %defattr(-, root, root, 0755) %doc LICENSE README doc/ examples/ -%{_libdir}/python*/site-packages/* +%{python_sitearch}/*sqlite*.so +%dir %{python_sitearch}/sqlite +%{python_sitearch}/sqlite/*.py +%{python_sitearch}/sqlite/*.pyc +%ghost %{python_sitearch}/sqlite/*.pyo %changelog +* Tue Dec 28 2004 Michael Schwendt - 0.5.0-1 +- Fix build: install into arch-dependent python sitelib, + compile without including buildroot paths, build and ghost + optimized files. +- Add python-abi dependency. +- Fix licence and %%doc permissions. +- Bump release, drop 0.fdr. prefix. + * Thu Sep 02 2004 Thomas Vander Stichele - 0.5.0-0.fdr.1 - package copied from Dag From wtogami at redhat.com Sat Jan 15 08:14:08 2005 From: wtogami at redhat.com (Warren Togami) Date: Fri, 14 Jan 2005 22:14:08 -1000 Subject: APPROVED: abcde, cd-discid, convmv Message-ID: <41E8D0D0.8020006@redhat.com> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 abcde cd-discid convmv Pass my inspection and approved for adding to Fedora Extras. nphilipp at redhat.com will be responsible for these packages. PUBLISH APPROVED by wtogami at redhat.com on Fri Jan 14th, 2004 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) iD4DBQFB6NBEa93+jlSirPERAuXXAJi8yAWVIAMWKKtc4xR+/BWiz1xzAJ4ogu3G UViwpWtrqtTFphTS4LFc3Q== =K5L5 -----END PGP SIGNATURE----- From fedora-extras-commits at redhat.com Sat Jan 15 08:16:29 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:16:29 -0500 Subject: rpms/abcde - New directory Message-ID: <200501150816.j0F8GTFv017021@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/abcde In directory cvs.fedora.redhat.com:/tmp/cvs-serv17006/abcde Log Message: Directory /cvs/extras/rpms/abcde added to the repository From fedora-extras-commits at redhat.com Sat Jan 15 08:16:29 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:16:29 -0500 Subject: rpms/abcde/devel - New directory Message-ID: <200501150816.j0F8GTsw017024@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/abcde/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17006/abcde/devel Log Message: Directory /cvs/extras/rpms/abcde/devel added to the repository From fedora-extras-commits at redhat.com Sat Jan 15 08:16:46 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:16:46 -0500 Subject: rpms/abcde Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501150816.j0F8GkkK017105@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/abcde In directory cvs.fedora.redhat.com:/tmp/cvs-serv17090 Added Files: Makefile import.log Log Message: Setup of module abcde --- NEW FILE Makefile --- # Top level Makefile for module abcde all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 15 08:16:46 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:16:46 -0500 Subject: rpms/abcde/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501150816.j0F8Gk2H017108@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/abcde/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17090/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module abcde --- NEW 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 Jan 15 08:17:26 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:17:26 -0500 Subject: rpms/abcde import.log,1.1,1.2 Message-ID: <200501150817.j0F8HQov017293@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/abcde In directory cvs.fedora.redhat.com:/tmp/cvs-serv17278 Modified Files: import.log Log Message: auto-import abcde-2.2.0-1 on branch devel from abcde-2.2.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/abcde/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 Jan 2005 08:16:44 -0000 1.1 +++ import.log 15 Jan 2005 08:17:24 -0000 1.2 @@ -0,0 +1 @@ +abcde-2_2_0-1:HEAD:abcde-2.2.0-1.src.rpm:1105777038 From fedora-extras-commits at redhat.com Sat Jan 15 08:17:26 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:17:26 -0500 Subject: rpms/abcde/devel abcde-2.1.19-genre.patch, NONE, 1.1 abcde-2.1.19-inst.patch, NONE, 1.1 abcde-2.1.19-vi.patch, NONE, 1.1 abcde.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501150817.j0F8HQX2017297@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/abcde/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17278/devel Modified Files: .cvsignore sources Added Files: abcde-2.1.19-genre.patch abcde-2.1.19-inst.patch abcde-2.1.19-vi.patch abcde.spec Log Message: auto-import abcde-2.2.0-1 on branch devel from abcde-2.2.0-1.src.rpm abcde-2.1.19-genre.patch: --- NEW FILE abcde-2.1.19-genre.patch --- --- abcde-2.1.19/cddb-tool.genre 2003-12-06 22:28:53.000000000 +0100 +++ abcde-2.1.19/cddb-tool 2004-04-14 13:08:37.901055971 +0200 @@ -122,7 +122,7 @@ DARTISTALBUM=$(grep ^DTITLE= "$CDDBFILE" | cut -f2- -d= | tr -d \\n | sed 's- / -~-g' | tr -d \[:cntrl:\]) DARTIST=$(echo "$DARTISTALBUM" | cut -f1 -d~ | sed 's,\\,\\\\,g;s,\([\"\$\`]\),\\\1,g' | tr -d \[:cntrl:\]) DALBUM=$(echo "$DARTISTALBUM" | cut -f2 -d~ | sed 's,\\,\\\\,g;s,\([\"\$\`]\),\\\1,g' | tr -d \[:cntrl:\]) - CDDBGENRE=$(grep '^#CATEGORY=' "$CDDBFILE" | cut -f2- -d=) + CDDBGENRE=$(grep '^#CATEGORY=' "$CDDBFILE" | cut -f2- -d= | tr -d \[:cntrl:\]) if grep "^DYEAR" "$CDDBFILE" 2>&1 > /dev/null ; then CDYEAR=$(grep "^DYEAR" "$CDDBFILE" | cut -f2- -d= | tr -d \[:cntrl:\]) elif grep YEAR "$CDDBFILE" 2>&1 > /dev/null ; then @@ -192,7 +192,7 @@ FILE="$1" ADDRESS="$2" DISCID=$(grep ^DISCID= "$FILE" | cut -f2 -d= | tr -d \[:cntrl:\]) - CDDBGENRE=$(grep '^#CATEGORY=' "$FILE" | cut -f2- -d=) + CDDBGENRE=$(grep '^#CATEGORY=' "$FILE" | cut -f2- -d= | tr -d \[:cntrl:\]) grep -v "^#CATEGORY=" "$FILE" | mail -s "cddb $CDDBGENRE $DISCID" "$ADDRESS" ;; abcde-2.1.19-inst.patch: --- NEW FILE abcde-2.1.19-inst.patch --- --- abcde-2.1.19/Makefile.inst 2004-04-09 20:12:15.000000000 +0200 +++ abcde-2.1.19/Makefile 2004-04-14 13:06:31.680708323 +0200 @@ -14,13 +14,13 @@ install: $(INSTALL) -d -m 755 $(bindir) - $(INSTALL) -m 755 -o 0 abcde $(bindir) - $(INSTALL) -m 755 -o 0 cddb-tool $(bindir) + $(INSTALL) -m 755 abcde $(bindir) + $(INSTALL) -m 755 cddb-tool $(bindir) $(INSTALL) -d -m 755 $(mandir) - $(INSTALL) -m 644 -o 0 abcde.1 $(mandir) - $(INSTALL) -m 644 -o 0 cddb-tool.1 $(mandir) + $(INSTALL) -m 644 abcde.1 $(mandir) + $(INSTALL) -m 644 cddb-tool.1 $(mandir) $(INSTALL) -d -m 755 $(etcdir) - $(INSTALL) -m 644 -o 0 abcde.conf $(etcdir) + $(INSTALL) -m 644 abcde.conf $(etcdir) tarball: @cd .. && tar czvf abcde_$(VERSION).orig.tar.gz \ abcde-2.1.19-vi.patch: --- NEW FILE abcde-2.1.19-vi.patch --- --- abcde-2.1.19/abcde.vi 2004-04-09 20:12:15.000000000 +0200 +++ abcde-2.1.19/abcde 2004-04-14 13:03:40.296108335 +0200 @@ -1270,8 +1270,12 @@ eval $(echo "$EDITOR") "$CDDBDATA" fi # If that fails, check for a vi + elif [ -x /usr/bin/vim ]; then + /usr/bin/vim "$CDDBDATA" elif [ -x /usr/bin/vi ]; then /usr/bin/vi "$CDDBDATA" + elif [ -x /bin/vi ]; then + /bin/vi "$CDDBDATA" # nano should be on all (modern, i.e., sarge) debian systems elif [ -x /usr/bin/nano ]; then /usr/bin/nano "$CDDBDATA" --- NEW FILE abcde.spec --- Summary: A Better CD Encoder Name: abcde Version: 2.2.0 Release: 1 License: GPL & Artistic Group: Applications/Multimedia Source: http://www.hispalinux.es/~data/files/abcde_%{version}.orig.tar.gz Patch0: abcde-2.1.19-vi.patch Patch1: abcde-2.1.19-inst.patch Patch2: abcde-2.1.19-genre.patch URL: http://www.hispalinux.es/~data/abcde.php BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: cd-discid %description abcde is a frontend command-line utility (actually, a shell script) that grabs tracks off a CD, encodes them to ogg or mp3 format, and tags them, all in one go. %prep %setup -q %patch0 -p1 -b .vi %patch1 -p1 -b .inst %patch2 -p1 -b .genre %install rm -rf $RPM_BUILD_ROOT %makeinstall etcdir=$RPM_BUILD_ROOT%{_sysconfdir} mandir=$RPM_BUILD_ROOT%{_mandir}/man1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr (-, root, root, -) %doc changelog COPYING README TODO %config(noreplace) %{_sysconfdir}/abcde.conf %{_bindir}/* %{_mandir}/man1/* %changelog * Fri Jan 14 2005 Nils Philippsen - version 2.2.0 * Wed Apr 14 2004 Nils Philippsen - version 2.1.19 * Tue May 21 2002 Nils Philippsen - version 2.0.3 - update rh, genre patches * Wed Apr 25 2001 Nils Philippsen - version 1.9.9 - configuration now uses freedb.org per default, no need to patch - various artist media can have a different output file name (than single artist ones) - fix newlines with CR in parsing cddb genre * Tue Jan 09 2001 Nils Philippsen - version 1.9.7 - initial build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcde/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Jan 2005 08:16:44 -0000 1.1 +++ .cvsignore 15 Jan 2005 08:17:24 -0000 1.2 @@ -0,0 +1 @@ +abcde_2.2.0.orig.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcde/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Jan 2005 08:16:44 -0000 1.1 +++ sources 15 Jan 2005 08:17:24 -0000 1.2 @@ -0,0 +1 @@ +e21dd33ab3b4eca6758976120d8a4f22 abcde_2.2.0.orig.tar.gz From fedora-extras-commits at redhat.com Sat Jan 15 08:18:34 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:18:34 -0500 Subject: rpms/cd-discid - New directory Message-ID: <200501150818.j0F8IYsb017481@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/cd-discid In directory cvs.fedora.redhat.com:/tmp/cvs-serv17468/cd-discid Log Message: Directory /cvs/extras/rpms/cd-discid added to the repository From fedora-extras-commits at redhat.com Sat Jan 15 08:18:34 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:18:34 -0500 Subject: rpms/cd-discid/devel - New directory Message-ID: <200501150818.j0F8IYp2017484@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/cd-discid/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17468/cd-discid/devel Log Message: Directory /cvs/extras/rpms/cd-discid/devel added to the repository From fedora-extras-commits at redhat.com Sat Jan 15 08:18:51 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:18:51 -0500 Subject: rpms/cd-discid Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501150818.j0F8IpmZ017563@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/cd-discid In directory cvs.fedora.redhat.com:/tmp/cvs-serv17548 Added Files: Makefile import.log Log Message: Setup of module cd-discid --- NEW FILE Makefile --- # Top level Makefile for module cd-discid all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 15 08:18:51 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:18:51 -0500 Subject: rpms/cd-discid/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501150818.j0F8IpsM017566@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/cd-discid/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17548/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module cd-discid --- NEW 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 Jan 15 08:19:22 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:19:22 -0500 Subject: rpms/cd-discid import.log,1.1,1.2 Message-ID: <200501150819.j0F8JMew017698@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/cd-discid In directory cvs.fedora.redhat.com:/tmp/cvs-serv17682 Modified Files: import.log Log Message: auto-import cd-discid-0.9-1 on branch devel from cd-discid-0.9-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/cd-discid/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 Jan 2005 08:18:49 -0000 1.1 +++ import.log 15 Jan 2005 08:19:20 -0000 1.2 @@ -0,0 +1 @@ +cd-discid-0_9-1:HEAD:cd-discid-0.9-1.src.rpm:1105777154 From fedora-extras-commits at redhat.com Sat Jan 15 08:19:22 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:19:22 -0500 Subject: rpms/cd-discid/devel cd-discid.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501150819.j0F8JMUi017701@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/cd-discid/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17682/devel Modified Files: .cvsignore sources Added Files: cd-discid.spec Log Message: auto-import cd-discid-0.9-1 on branch devel from cd-discid-0.9-1.src.rpm --- NEW FILE cd-discid.spec --- Summary: utility to get CDDB discid information Name: cd-discid Version: 0.9 Release: 1 Group: Applications/Multimedia License: GPL Source: http://www.hispalinux.es/~data/files/cd-discid/cd-discid_%{version}.orig.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %description cd-discid is a backend utility to get CDDB discid information from a CD-ROM disc. It was originally designed for cdgrab, but can be used for any purpose requiring CDDB data. %prep %setup -q %build make cd-discid %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} install -m 0755 cd-discid $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 install -m 0444 cd-discid $RPM_BUILD_ROOT%{_mandir}/man1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr (-, root, root) %doc changelog COPYING README %{_bindir}/* %{_mandir}/man1/* %changelog * Wed Apr 14 2004 Nils Philippsen - version 0.9 * Tue May 21 2002 Nils Philippsen - version 0.7 * Wed Apr 25 2001 Nils Philippsen - version 0.6 * Tue Jan 09 2001 Nils Philippsen - version 0.4 - initial build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cd-discid/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Jan 2005 08:18:49 -0000 1.1 +++ .cvsignore 15 Jan 2005 08:19:20 -0000 1.2 @@ -0,0 +1 @@ +cd-discid_0.9.orig.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/cd-discid/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Jan 2005 08:18:49 -0000 1.1 +++ sources 15 Jan 2005 08:19:20 -0000 1.2 @@ -0,0 +1 @@ +64677b8b63d1db0db015043f5455171a cd-discid_0.9.orig.tar.gz From fedora-extras-commits at redhat.com Sat Jan 15 08:20:12 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:20:12 -0500 Subject: rpms/convmv - New directory Message-ID: <200501150820.j0F8KCV6017865@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/convmv In directory cvs.fedora.redhat.com:/tmp/cvs-serv17852/convmv Log Message: Directory /cvs/extras/rpms/convmv added to the repository From fedora-extras-commits at redhat.com Sat Jan 15 08:20:12 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:20:12 -0500 Subject: rpms/convmv/devel - New directory Message-ID: <200501150820.j0F8KCQv017868@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/convmv/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17852/convmv/devel Log Message: Directory /cvs/extras/rpms/convmv/devel added to the repository From fedora-extras-commits at redhat.com Sat Jan 15 08:20:29 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:20:29 -0500 Subject: rpms/convmv Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501150820.j0F8KTeO017945@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/convmv In directory cvs.fedora.redhat.com:/tmp/cvs-serv17930 Added Files: Makefile import.log Log Message: Setup of module convmv --- NEW FILE Makefile --- # Top level Makefile for module convmv all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 15 08:20:29 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:20:29 -0500 Subject: rpms/convmv/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501150820.j0F8KTvr017948@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/convmv/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17930/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module convmv --- NEW 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 Jan 15 08:20:57 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:20:57 -0500 Subject: rpms/convmv import.log,1.1,1.2 Message-ID: <200501150820.j0F8Kvhn018077@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/convmv In directory cvs.fedora.redhat.com:/tmp/cvs-serv18062 Modified Files: import.log Log Message: auto-import convmv-1.08-1 on branch devel from convmv-1.08-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/convmv/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 Jan 2005 08:20:27 -0000 1.1 +++ import.log 15 Jan 2005 08:20:55 -0000 1.2 @@ -0,0 +1 @@ +convmv-1_08-1:HEAD:convmv-1.08-1.src.rpm:1105777250 From fedora-extras-commits at redhat.com Sat Jan 15 08:20:57 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:20:57 -0500 Subject: rpms/convmv/devel convmv.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501150820.j0F8Kv5H018081@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/convmv/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv18062/devel Modified Files: .cvsignore sources Added Files: convmv.spec Log Message: auto-import convmv-1.08-1 on branch devel from convmv-1.08-1.src.rpm --- NEW FILE convmv.spec --- Summary: Convert filename encodings. Name: convmv Version: 1.08 Release: 1 Group: Applications/System License: GPL URL: http://j3e.de/linux/convmv Source: http://j3e.de/linux/convmv/convmv-%{version}.tar.gz BuildRequires: /usr/bin/md5sum BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %description This package contains the tool convmv with which you can convert the encodings of filenames, e.g. from Latin1 to UTF-8. %prep %setup -q %build md5sum -c MD5sums make PREFIX=%{_prefix} make test %install rm -rf %{buildroot} make PREFIX=%{_prefix} DESTDIR=%{buildroot} install %clean rm -rf %{buildroot} %files %defattr(-, root, root) %doc CREDITS Changes GPL2 TODO testsuite.tar %{_bindir}/convmv %{_mandir}/man*/* %changelog * Fri Jan 14 2005 Nils Philippsen - version 1.08 * Sat Feb 07 2004 Nils Philippsen - version 1.07 - initial build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/convmv/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Jan 2005 08:20:27 -0000 1.1 +++ .cvsignore 15 Jan 2005 08:20:55 -0000 1.2 @@ -0,0 +1 @@ +convmv-1.08.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/convmv/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Jan 2005 08:20:27 -0000 1.1 +++ sources 15 Jan 2005 08:20:55 -0000 1.2 @@ -0,0 +1 @@ +40707f82b1a9631fe715f68f94431d3a convmv-1.08.tar.gz From fedora-extras-commits at redhat.com Sat Jan 15 09:22:42 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 04:22:42 -0500 Subject: rpms/convmv/devel convmv.spec,1.1,1.2 Message-ID: <200501150922.j0F9MgCQ019748@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/convmv/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv19735 Modified Files: convmv.spec Log Message: remove testsuite.tar from doc Index: convmv.spec =================================================================== RCS file: /cvs/extras/rpms/convmv/devel/convmv.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- convmv.spec 15 Jan 2005 08:20:55 -0000 1.1 +++ convmv.spec 15 Jan 2005 09:22:40 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Convert filename encodings. Name: convmv Version: 1.08 -Release: 1 +Release: 2 Group: Applications/System License: GPL URL: http://j3e.de/linux/convmv @@ -31,11 +31,14 @@ %files %defattr(-, root, root) -%doc CREDITS Changes GPL2 TODO testsuite.tar +%doc CREDITS Changes GPL2 TODO %{_bindir}/convmv %{_mandir}/man*/* %changelog +* Fri Jan 14 2005 Warren Togami +- remove testsuite.tar from doc + * Fri Jan 14 2005 Nils Philippsen - version 1.08 From fedora-extras-commits at redhat.com Sat Jan 15 09:42:45 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 15 Jan 2005 04:42:45 -0500 Subject: rpms/grisbi import.log,1.2,1.3 Message-ID: <200501150942.j0F9gjbL019884@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/grisbi In directory cvs.fedora.redhat.com:/tmp/cvs-serv19875 Modified Files: import.log Log Message: auto-import grisbi-0.5.5-0.fdr.1.2 on branch FC-2 from grisbi-0.5.5-0.fdr.1.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/grisbi/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 8 Nov 2004 04:30:07 -0000 1.2 +++ import.log 15 Jan 2005 09:42:43 -0000 1.3 @@ -1 +1,2 @@ grisbi-0_5_0-0_fdr_3_2:HEAD:grisbi-0.5.0-0.fdr.3.2.src.rpm:1099888207 +grisbi-0_5_5-0_fdr_1_2:FC-2:grisbi-0.5.5-0.fdr.1.2.src.rpm:1105782157 From fedora-extras-commits at redhat.com Sat Jan 15 09:42:45 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 15 Jan 2005 04:42:45 -0500 Subject: rpms/grisbi/FC-2 grisbi-0.5.5-htmlview.diff, NONE, 1.1 .cvsignore, 1.2, 1.3 grisbi.desktop, 1.1, 1.2 grisbi.spec, 1.1, 1.2 sources, 1.2, 1.3 grisbi-0.5-htmlview.patch, 1.1, NONE Message-ID: <200501150942.j0F9gjRp019888@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/grisbi/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv19875/FC-2 Modified Files: .cvsignore grisbi.desktop grisbi.spec sources Added Files: grisbi-0.5.5-htmlview.diff Removed Files: grisbi-0.5-htmlview.patch Log Message: auto-import grisbi-0.5.5-0.fdr.1.2 on branch FC-2 from grisbi-0.5.5-0.fdr.1.2.src.rpm grisbi-0.5.5-htmlview.diff: --- NEW FILE grisbi-0.5.5-htmlview.diff --- --- src/constants.h.old 2004-11-26 11:48:47.000000000 +0100 +++ src/constants.h 2004-11-27 16:55:59.067842048 +0100 @@ -112,6 +112,6 @@ #endif /* quelques chaines de configuration*/ -#define ETAT_WWW_BROWSER "mozilla" +#define ETAT_WWW_BROWSER "htmlview" #endif // !_CONSTANTS_H Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/grisbi/FC-2/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:30:07 -0000 1.2 +++ .cvsignore 15 Jan 2005 09:42:43 -0000 1.3 @@ -1 +1 @@ -grisbi-0.5.0.tar.bz2 +grisbi-0.5.5.tar.bz2 Index: grisbi.desktop =================================================================== RCS file: /cvs/extras/rpms/grisbi/FC-2/grisbi.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- grisbi.desktop 8 Nov 2004 04:30:07 -0000 1.1 +++ grisbi.desktop 15 Jan 2005 09:42:43 -0000 1.2 @@ -1,6 +1,10 @@ [Desktop Entry] Name=Grisbi Comment=Personal finances manager +Comment[fr]=Gestionnaire de finances personnelles +Comment[br]=Program a gonterezh an ti +Comment[hu]=Szem??lyi p??nz??gyi menedzser +Comment[it]=Software di contabilit?? personale Exec=grisbi Icon=grisbi.png Terminal=false Index: grisbi.spec =================================================================== RCS file: /cvs/extras/rpms/grisbi/FC-2/grisbi.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- grisbi.spec 8 Nov 2004 04:30:07 -0000 1.1 +++ grisbi.spec 15 Jan 2005 09:42:43 -0000 1.2 @@ -1,22 +1,23 @@ +%define GRISBI_HELP_DIR %{_datadir}/doc/%{name}/help Name: grisbi -Version: 0.5.0 -Release: 0.fdr.3.2 -Epoch: 0 +Version: 0.5.5 +Release: 0.fdr.1.2 +Epoch: 0 Summary: Personal finances manager Group: Applications/Productivity License: GPL Url: http://www.grisbi.org -Source0: http://dl.sf.net/grisbi/grisbi-0.5.0.tar.bz2 -Source1: grisbi.desktop -Patch0: grisbi-0.5-htmlview.patch +Source0: http://dl.sf.net/grisbi/%{name}-%{version}.tar.bz2 +Source1: %{name}.desktop +Patch0: %{name}-%{version}-htmlview.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel, libxml2-devel, glib2-devel, gettext -BuildRequires: desktop-file-utils, libofx-devel -Requires: htmlview +BuildRequires: desktop-file-utils, libofx-devel +Requires: htmlview # for report generation -Requires: tetex-unicode, tetex-dvips +Requires: tetex-unicode, tetex-dvips %description Grisbi is a very functional personal financial management program @@ -32,7 +33,7 @@ %prep %setup -q -%patch0 -p0 -b .htmlview +%patch0 %build %configure @@ -42,6 +43,12 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +for lang in C de fr +do + mv $RPM_BUILD_ROOT%{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.html $RPM_BUILD_ROOT%{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.bin.html + touch $RPM_BUILD_ROOT%{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.html +done + mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -54,6 +61,22 @@ %find_lang %{name} +%post +if [ $1 -eq 1 ] ; then + for lang in C de fr + do + alternatives --install %{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.html grisbi-manuel-${lang} %{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.bin.html 10 || : + done +fi + +%postun +if [ $1 -eq 0 ] ; then + for lang in C de fr + do + alternatives --remove grisbi-manuel-${lang} %{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.bin.html || : + done +fi + %clean rm -rf $RPM_BUILD_ROOT @@ -61,20 +84,63 @@ %defattr(644,root,root,755) %doc AUTHORS COPYING NEWS OLDNEWS README ABOUT-NLS %attr(755,root,root) %{_bindir}/* -%{_datadir}/applications/*.desktop -%{_datadir}/doc/grisbi -%{_datadir}/mime-info/%name.* +%{_datadir}/applications/* +%{_datadir}/mime-info/%{name}.* %{_datadir}/pixmaps/* +%dir %{_datadir}/doc/%{name} +%dir %{_datadir}/doc/%{name}/help +%dir %{_datadir}/doc/%{name}/help/C +%dir %{_datadir}/doc/%{name}/help/de +%dir %{_datadir}/doc/%{name}/help/fr +%{_datadir}/doc/%{name}/help/C/*.gif +%{_datadir}/doc/%{name}/help/C/grisbi-manuel.bin.html +%{_datadir}/doc/%{name}/help/C/quickstart.html +%{_datadir}/doc/%{name}/help/C/translation.html +%{_datadir}/doc/%{name}/help/C/topic.dat +%{_datadir}/doc/%{name}/help/de/*.gif +%{_datadir}/doc/%{name}/help/de/grisbi-manuel.bin.html +%{_datadir}/doc/%{name}/help/de/quickstart.html +%{_datadir}/doc/%{name}/help/de/translation.html +%{_datadir}/doc/%{name}/help/de/topic.dat +%{_datadir}/doc/%{name}/help/fr/*.gif +%{_datadir}/doc/%{name}/help/fr/grisbi-manuel.bin.html +%{_datadir}/doc/%{name}/help/fr/quickstart.html +%{_datadir}/doc/%{name}/help/fr/translation.html +%{_datadir}/doc/%{name}/help/fr/topic.dat %{_mandir}/man1/* +%ghost %{_datadir}/doc/%{name}/help/C/grisbi-manuel.html +%ghost %{_datadir}/doc/%{name}/help/de/grisbi-manuel.html +%ghost %{_datadir}/doc/%{name}/help/fr/grisbi-manuel.html %changelog +* Mon Jan 10 2005 Alain Portal 0:0.5.5-0.fdr.1 + - New version + - Fix alternatives setup +* Sat Nov 27 2004 Alain Portal 0:0.5.3-0.fdr.1 + - New version +* Tue Nov 2 2004 Alain Portal 0:0.5.2-0.fdr.4 + - Rename htmlview patch + - Force scriplet to return 0 +* Fri Oct 29 2004 Alain Portal 0:0.5.2-0.fdr.3 + - Patch to fix bugs #468, #470 +* Fri Oct 22 2004 Alain Portal 0:0.5.2-0.fdr.2 + - %{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.html should be owned by the + package. + - Improve %post and %postun scripts depends upon whe are installing or + upgrading. +* Fri Oct 15 2004 Alain Portal 0:0.5.2-0.fdr.1 + - New version +* Wed Sep 15 2004 Alain Portal 0:0.5.1-0.fdr.2 + - Use "alternatives" to manage separate documentation package +* Sat Jul 31 2004 Alain Portal 0:0.5.1-0.fdr.1 + - New version + - Patches to fix some compilation warnings + - Add %post and %preun scripts to manage separate documentation package * Fri Jul 23 2004 Aurelien Bompard 0:0.5.0-0.fdr.3 -- Fix typo in summary -- Change category to "Office" -- Change Terminal=0 to Terminal=false in desktop file - + - Fix typo in summary + - Change category to "Office" + - Change Terminal=0 to Terminal=false in desktop file * Tue Jun 01 2004 Aurelien Bompard 0:0.5.0-0.fdr.2 -- BR: libofx-devel to enable OFX import - + - BR: libofx-devel to enable OFX import * Mon May 31 2004 Aurelien Bompard 0:0.5.0-0.fdr.1 -- Initial Fedora RPM + - Initial Fedora RPM Index: sources =================================================================== RCS file: /cvs/extras/rpms/grisbi/FC-2/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:30:07 -0000 1.2 +++ sources 15 Jan 2005 09:42:43 -0000 1.3 @@ -1 +1 @@ -ceccf6799317686fe53f61730241f7e1 grisbi-0.5.0.tar.bz2 +09b06382f9bb5a4124c40296c5eba6d5 grisbi-0.5.5.tar.bz2 --- grisbi-0.5-htmlview.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jan 15 09:44:38 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 15 Jan 2005 04:44:38 -0500 Subject: rpms/grisbi import.log,1.3,1.4 Message-ID: <200501150944.j0F9ic4v020021@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/grisbi In directory cvs.fedora.redhat.com:/tmp/cvs-serv20012 Modified Files: import.log Log Message: auto-import grisbi-0.5.5-1 on branch devel from grisbi-0.5.5-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/grisbi/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 15 Jan 2005 09:42:43 -0000 1.3 +++ import.log 15 Jan 2005 09:44:36 -0000 1.4 @@ -1,2 +1,3 @@ grisbi-0_5_0-0_fdr_3_2:HEAD:grisbi-0.5.0-0.fdr.3.2.src.rpm:1099888207 grisbi-0_5_5-0_fdr_1_2:FC-2:grisbi-0.5.5-0.fdr.1.2.src.rpm:1105782157 +grisbi-0_5_5-1:HEAD:grisbi-0.5.5-1.src.rpm:1105782268 From fedora-extras-commits at redhat.com Sat Jan 15 09:44:38 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 15 Jan 2005 04:44:38 -0500 Subject: rpms/grisbi/devel grisbi-0.5.5-htmlview.diff, NONE, 1.1 .cvsignore, 1.3, 1.4 grisbi.spec, 1.2, 1.3 sources, 1.3, 1.4 constants.h.htmlview, 1.1, NONE grisbi-0.5.2-20041029-etats_calculs.c.diff, 1.1, NONE grisbi-0.5.2-20041029-operations_liste.c.diff, 1.1, NONE Message-ID: <200501150944.j0F9icY0020025@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/grisbi/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv20012/devel Modified Files: .cvsignore grisbi.spec sources Added Files: grisbi-0.5.5-htmlview.diff Removed Files: constants.h.htmlview grisbi-0.5.2-20041029-etats_calculs.c.diff grisbi-0.5.2-20041029-operations_liste.c.diff Log Message: auto-import grisbi-0.5.5-1 on branch devel from grisbi-0.5.5-1.src.rpm grisbi-0.5.5-htmlview.diff: --- NEW FILE grisbi-0.5.5-htmlview.diff --- --- src/constants.h.old 2004-11-26 11:48:47.000000000 +0100 +++ src/constants.h 2004-11-27 16:55:59.067842048 +0100 @@ -112,6 +112,6 @@ #endif /* quelques chaines de configuration*/ -#define ETAT_WWW_BROWSER "mozilla" +#define ETAT_WWW_BROWSER "htmlview" #endif // !_CONSTANTS_H Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/grisbi/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 25 Nov 2004 05:45:52 -0000 1.3 +++ .cvsignore 15 Jan 2005 09:44:36 -0000 1.4 @@ -1 +1 @@ -grisbi-0.5.2.tar.bz2 +grisbi-0.5.5.tar.bz2 Index: grisbi.spec =================================================================== RCS file: /cvs/extras/rpms/grisbi/devel/grisbi.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- grisbi.spec 25 Nov 2004 05:45:52 -0000 1.2 +++ grisbi.spec 15 Jan 2005 09:44:36 -0000 1.3 @@ -1,7 +1,7 @@ %define GRISBI_HELP_DIR %{_datadir}/doc/%{name}/help Name: grisbi -Version: 0.5.2 -Release: 4 +Version: 0.5.5 +Release: 1 Epoch: 0 Summary: Personal finances manager @@ -10,9 +10,7 @@ Url: http://www.grisbi.org Source0: http://dl.sf.net/grisbi/%{name}-%{version}.tar.bz2 Source1: %{name}.desktop -Patch0: constants.h.htmlview -Patch1: %{name}-%{version}-20041029-etats_calculs.c.diff -Patch2: %{name}-%{version}-20041029-operations_liste.c.diff +Patch0: %{name}-%{version}-htmlview.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel, libxml2-devel, glib2-devel, gettext @@ -36,8 +34,6 @@ %prep %setup -q %patch0 -%patch1 -p1 -%patch2 -p1 %build %configure @@ -47,7 +43,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -for lang in C fr +for lang in C de fr do mv $RPM_BUILD_ROOT%{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.html $RPM_BUILD_ROOT%{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.bin.html touch $RPM_BUILD_ROOT%{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.html @@ -67,14 +63,18 @@ %post if [ $1 -eq 1 ] ; then - alternatives --install %{GRISBI_HELP_DIR}/fr/grisbi-manuel.html grisbi-manuel-fr %{GRISBI_HELP_DIR}/fr/grisbi-manuel.bin.html 10 - alternatives --install %{GRISBI_HELP_DIR}/C/grisbi-manuel.html grisbi-manuel %{GRISBI_HELP_DIR}/C/grisbi-manuel.bin.html 10 + for lang in C de fr + do + alternatives --install %{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.html grisbi-manuel-${lang} %{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.bin.html 10 || : + done fi %postun if [ $1 -eq 0 ] ; then - alternatives --remove grisbi-manuel %{GRISBI_HELP_DIR}/C/grisbi-manuel.bin.html - alternatives --remove grisbi-manuel-fr %{GRISBI_HELP_DIR}/fr/grisbi-manuel.bin.html + for lang in C de fr + do + alternatives --remove grisbi-manuel-${lang} %{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.bin.html || : + done fi %clean @@ -89,50 +89,58 @@ %{_datadir}/pixmaps/* %dir %{_datadir}/doc/%{name} %dir %{_datadir}/doc/%{name}/help -%dir %{_datadir}/doc/%{name}/help/fr %dir %{_datadir}/doc/%{name}/help/C -%{_datadir}/doc/%{name}/help/fr/*.gif -%{_datadir}/doc/%{name}/help/fr/grisbi-manuel.bin.html -%{_datadir}/doc/%{name}/help/fr/quickstart.html -%{_datadir}/doc/%{name}/help/fr/translation.html -%{_datadir}/doc/%{name}/help/fr/topic.dat +%dir %{_datadir}/doc/%{name}/help/de +%dir %{_datadir}/doc/%{name}/help/fr %{_datadir}/doc/%{name}/help/C/*.gif %{_datadir}/doc/%{name}/help/C/grisbi-manuel.bin.html %{_datadir}/doc/%{name}/help/C/quickstart.html %{_datadir}/doc/%{name}/help/C/translation.html %{_datadir}/doc/%{name}/help/C/topic.dat +%{_datadir}/doc/%{name}/help/de/*.gif +%{_datadir}/doc/%{name}/help/de/grisbi-manuel.bin.html +%{_datadir}/doc/%{name}/help/de/quickstart.html +%{_datadir}/doc/%{name}/help/de/translation.html +%{_datadir}/doc/%{name}/help/de/topic.dat +%{_datadir}/doc/%{name}/help/fr/*.gif +%{_datadir}/doc/%{name}/help/fr/grisbi-manuel.bin.html +%{_datadir}/doc/%{name}/help/fr/quickstart.html +%{_datadir}/doc/%{name}/help/fr/translation.html +%{_datadir}/doc/%{name}/help/fr/topic.dat %{_mandir}/man1/* %ghost %{_datadir}/doc/%{name}/help/C/grisbi-manuel.html +%ghost %{_datadir}/doc/%{name}/help/de/grisbi-manuel.html %ghost %{_datadir}/doc/%{name}/help/fr/grisbi-manuel.html %changelog -* Fri Oct 29 2004 Alain Portal 0:0.5.2-4 +* Mon Jan 10 2005 Alain Portal 0:0.5.5-1 + - New version + - Fix alternatives setup +* Sat Nov 27 2004 Alain Portal 0:0.5.3-0.fdr.1 + - New version +* Tue Nov 2 2004 Alain Portal 0:0.5.2-0.fdr.4 + - Rename htmlview patch + - Force scriplet to return 0 +* Fri Oct 29 2004 Alain Portal 0:0.5.2-0.fdr.3 - Patch to fix bugs #468, #470 - * Fri Oct 22 2004 Alain Portal 0:0.5.2-0.fdr.2 - %{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.html should be owned by the package. - Improve %post and %postun scripts depends upon whe are installing or upgrading. - * Fri Oct 15 2004 Alain Portal 0:0.5.2-0.fdr.1 - New version - * Wed Sep 15 2004 Alain Portal 0:0.5.1-0.fdr.2 - Use "alternatives" to manage separate documentation package - * Sat Jul 31 2004 Alain Portal 0:0.5.1-0.fdr.1 - New version - Patches to fix some compilation warnings - Add %post and %preun scripts to manage separate documentation package - * Fri Jul 23 2004 Aurelien Bompard 0:0.5.0-0.fdr.3 -- Fix typo in summary -- Change category to "Office" -- Change Terminal=0 to Terminal=false in desktop file - + - Fix typo in summary + - Change category to "Office" + - Change Terminal=0 to Terminal=false in desktop file * Tue Jun 01 2004 Aurelien Bompard 0:0.5.0-0.fdr.2 -- BR: libofx-devel to enable OFX import - + - BR: libofx-devel to enable OFX import * Mon May 31 2004 Aurelien Bompard 0:0.5.0-0.fdr.1 -- Initial Fedora RPM + - Initial Fedora RPM Index: sources =================================================================== RCS file: /cvs/extras/rpms/grisbi/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 25 Nov 2004 05:45:52 -0000 1.3 +++ sources 15 Jan 2005 09:44:36 -0000 1.4 @@ -1 +1 @@ -5d496c64973452f2cf35def2d1e57b01 grisbi-0.5.2.tar.bz2 +09b06382f9bb5a4124c40296c5eba6d5 grisbi-0.5.5.tar.bz2 --- constants.h.htmlview DELETED --- --- grisbi-0.5.2-20041029-etats_calculs.c.diff DELETED --- --- grisbi-0.5.2-20041029-operations_liste.c.diff DELETED --- From fedora-extras-commits at redhat.com Sat Jan 15 09:53:23 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 15 Jan 2005 04:53:23 -0500 Subject: rpms/kile import.log,1.5,1.6 Message-ID: <200501150953.j0F9rNdI020152@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/kile In directory cvs.fedora.redhat.com:/tmp/cvs-serv20143 Modified Files: import.log Log Message: auto-import kile-1.7.1-0.fdr.3.2 on branch FC-2 from kile-1.7.1-0.fdr.3.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kile/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 13 Jan 2005 15:32:49 -0000 1.5 +++ import.log 15 Jan 2005 09:53:21 -0000 1.6 @@ -2,3 +2,4 @@ kile-1_6_3-0_fdr_1_1:HEAD:kile-1.6.3-0.fdr.1.1.src.rpm:1099888761 kile-1_6_3-0_fdr_1_2:HEAD:kile-1.6.3-0.fdr.1.2.src.rpm:1099888767 kile-1_7_1-3:HEAD:kile-1.7.1-3.src.rpm:1105630409 +kile-1_7_1-0_fdr_3_2:FC-2:kile-1.7.1-0.fdr.3.2.src.rpm:1105782794 From fedora-extras-commits at redhat.com Sat Jan 15 09:53:23 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 15 Jan 2005 04:53:23 -0500 Subject: rpms/kile/FC-2 kile-1.7-dt.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kile.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200501150953.j0F9rNvO020156@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/kile/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv20143/FC-2 Modified Files: .cvsignore kile.spec sources Added Files: kile-1.7-dt.patch Log Message: auto-import kile-1.7.1-0.fdr.3.2 on branch FC-2 from kile-1.7.1-0.fdr.3.2.src.rpm kile-1.7-dt.patch: --- NEW FILE kile-1.7-dt.patch --- --- kile-1.7/kile/kile.desktop.dt 2004-05-27 01:56:00.000000000 -0500 +++ kile-1.7/kile/kile.desktop 2004-10-18 08:09:27.000000000 -0500 @@ -51,4 +51,4 @@ GenericName[xx]=xxLaTeX Frontendxx GenericName[zh_CN]=LaTeX ?????? MimeType=text/x-tex;text/x-kilepr -Categories=Qt;KDE;Office +Categories=Qt;KDE;Office; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kile/FC-2/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:39:15 -0000 1.2 +++ .cvsignore 15 Jan 2005 09:53:21 -0000 1.3 @@ -1 +1 @@ -kile-1.6.3.tar.bz2 +kile-1.7.1.tar.bz2 Index: kile.spec =================================================================== RCS file: /cvs/extras/rpms/kile/FC-2/kile.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kile.spec 8 Nov 2004 04:39:27 -0000 1.3 +++ kile.spec 15 Jan 2005 09:53:21 -0000 1.4 @@ -1,48 +1,62 @@ -# $Id$ +#$Id$ + +# for optionally using destkop-file-install (for fc2 mostly) +%define desktop_file 1 Name: kile -Summary: LaTeX source editor and TeX shell +Summary: (La)TeX source editor and TeX shell Epoch: 0 -Version: 1.6.3 -Release: 0.fdr.1%{?dist_tag}.2 +Version: 1.7.1 +Release: 0.fdr.3%{?dist_tag}.2 Group: Applications/Publishing URL: http://kile.sourceforge.net/ -Source: http://dl.sourceforge.net/sourceforge/kile/kile-1.6.3.tar.bz2 +Source: http://dl.sourceforge.net/sourceforge/kile/kile-1.7.1.tar.bz2 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +# Append ; to .desktop Categories +Patch1: kile-1.7-dt.patch + BuildRequires: gettext +BuildRequires: libtool +%{?desktop_file:BuildRequires: desktop-file-utils} -# workarounds for missing Requires in redhat's qt-devel, kdelibs-devel -# and to make fedora's buildsystem happy -BuildRequires: XFree86-devel libtool +# workarounds for missing Requires in fc1's qt-devel, kdelibs-devel +# and to make fedora.us's buildsystem happy +BuildRequires: XFree86-devel BuildRequires: libpng-devel zlib-devel libjpeg-devel BuildRequires: arts-devel libart_lgpl-devel fam-devel Requires: tetex-latex +## Optional, but recommended +#Requires: gnuplot +#Requires: xfig -BuildRequires: qt-devel >= 1:3.1 -%define qt_ver %(rpm -q --qf '%%{version}' qt-devel | cut -d. -f1,2) +BuildRequires: qt-devel >= 1:3.3 +%define qt_ver %(rpm -q --qf '%%{version}' qt-devel | cut -d. -f-2) Requires: qt >= 1:%{qt_ver} -BuildRequires: kdelibs-devel >= 6:3.1 -%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel | cut -d. -f1,2 ) +BuildRequires: kdelibs-devel >= 6:3.2 +%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel | cut -d. -f-2 ) Requires: kdelibs >= 6:%{kdelibs_ver} -%if "%{kdelibs_ver}" < "3.2" -%define desktop_file 1 -%endif - %description -Kile is a LaTeX source editor, TeX shell and GnuPlot frontend that -simplifies the creation of LaTeX documents. +Kile is a user friendly (La)TeX editor. The main features are: + * Compile, convert and view your document with one click. + * Auto-completion of (La)TeX commands + * Templates and wizards makes starting a new document very little work. + * Easy insertion of many standard tags and symbols and the option to define (an arbitrary number of) user defined tags. + * Inverse and forward search: click in the DVI viewer and jump to the corresponding LaTeX line in the editor, or jump from the editor to the corresponding page in the viewer. + * Finding chapter or sections is very easy, Kile constructs a list of all the chapter etc. in your document. You can use the list to jump to the corresponding section. + * Collect documents that belong together into a project. + * Easy insertion of citations and references when using projects. + * Advanced editing commands. %prep %setup -q -# append ; to desktop_file Categories -perl -pi -e 's at Categories(.*)Office$@Categories${1}Office\;@' */*.desktop */*/*.desktop +%{?desktop_file:%patch1 -p1 -b .dt} %build @@ -52,9 +66,9 @@ --program-prefix="%{?_program_prefix}" \ --disable-rpath \ %{?debug: --enable-debug --enable-warnings } \ - %{!?debug: --disable-dependency-tracking --disable-debug --disable-warnings --enable-final } + %{!?debug: --disable-debug --disable-warnings --enable-final } -make %{?_smp_mflags} +make %{?_smp_mflags} %install @@ -76,11 +90,6 @@ popd %if "%{?desktop_file}" == "1" -# Put desktop/applnk file back -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applnk/Office -mv $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop \ - $RPM_BUILD_ROOT%{_datadir}/applnk/Office/ - mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --delete-original --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -89,29 +98,20 @@ $RPM_BUILD_ROOT%{_datadir}/app*/*/kile.desktop %endif -## Locale stuff -# find_lang -%find_lang %{name} -# HTML stuff -for lang_dir in $RPM_BUILD_ROOT%{_docdir}/HTML/* ; do - lang=$(basename $lang_dir) - echo "%lang($lang) %doc %{_docdir}/HTML/${lang}/*" >> %{name}.lang -done +## Unpackaged/conflicting files +rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/katepart - -%files -f %{name}.lang +%files %defattr(-,root,root,-) %doc AUTHORS ChangeLog README TODO +%lang(en) %doc %{_datadir}/doc/HTML/en/* %{_bindir}/* %{_datadir}/apps/kile -%{_datadir}/apps/katepart/syntax/*.xml +%{_datadir}/apps/kconf_update/kile* +%config %{_datadir}/config.kcfg/kile.kcfg %{_datadir}/icons/*/*/*/*.png -%if "%{?desktop_file}" == "1" -%{_datadir}/applications/*.desktop -%else -%{_datadir}/applications/kde/*.desktop -%endif +%{_datadir}/applications%{!?desktop_file:/kde}/*.desktop %{_datadir}/mimelnk/*/*.desktop @@ -120,6 +120,19 @@ %changelog +* Wed Jan 12 2005 Rex Dieter 0:1.7.1-0.fdr.3 +- fix (katepart) conflicts with kde >= 3.2 +- update %%description + +* Mon Oct 18 2004 Rex Dieter 0:1.7.1-0.fdr.2 +- -katepart: fix conflicts with kde >= 3.3 (optional) + +* Mon Oct 18 2004 Rex Dieter 0:1.7.1-0.fdr.1 +- 1.7.1 + +* Tue Sep 28 2004 Rex Dieter 0:1.6.3-0.fdr.2 +- respin (against kde-3.3) + * Fri May 14 2004 Rex Dieter 0:1.6.3-0.fdr.1 - 1.6.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kile/FC-2/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:39:15 -0000 1.2 +++ sources 15 Jan 2005 09:53:21 -0000 1.3 @@ -1 +1 @@ -6bf238c7a80fa647d8fd4ca89c0774ef kile-1.6.3.tar.bz2 +940fba9dc62e2687856885dffccf6e80 kile-1.7.1.tar.bz2 From fedora-extras-commits at redhat.com Sat Jan 15 09:55:33 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 15 Jan 2005 04:55:33 -0500 Subject: rpms/xtide import.log,1.6,1.7 Message-ID: <200501150955.j0F9tXOk020288@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xtide In directory cvs.fedora.redhat.com:/tmp/cvs-serv20279 Modified Files: import.log Log Message: auto-import xtide-2.8-0.fdr.1.2 on branch FC-2 from xtide-2.8-0.fdr.1.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xtide/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 8 Jan 2005 23:07:00 -0000 1.6 +++ import.log 15 Jan 2005 09:55:31 -0000 1.7 @@ -3,3 +3,4 @@ xtide-2_6_4-0_fdr_4_2:HEAD:xtide-2.6.4-0.fdr.4.2.src.rpm:1099892204 xtide-2_8-1:HEAD:xtide-2.8-1.src.rpm:1105165649 xtide-2_8-2:HEAD:xtide-2.8-2.src.rpm:1105225646 +xtide-2_8-0_fdr_1_2:FC-2:xtide-2.8-0.fdr.1.2.src.rpm:1105782923 From fedora-extras-commits at redhat.com Sat Jan 15 09:55:33 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 15 Jan 2005 04:55:33 -0500 Subject: rpms/xtide/FC-2 xtide-2.8.for_x86_64.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xtide.spec, 1.3, 1.4 xtide-2.6.4.patch, 1.1, NONE Message-ID: <200501150955.j0F9tX69020292@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xtide/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv20279/FC-2 Modified Files: .cvsignore sources xtide.spec Added Files: xtide-2.8.for_x86_64.patch Removed Files: xtide-2.6.4.patch Log Message: auto-import xtide-2.8-0.fdr.1.2 on branch FC-2 from xtide-2.8-0.fdr.1.2.src.rpm xtide-2.8.for_x86_64.patch: --- NEW FILE xtide-2.8.for_x86_64.patch --- diff -Naur xtide-2.8.orig/Makefile.in xtide-2.8/Makefile.in --- xtide-2.8.orig/Makefile.in 2004-12-17 18:21:28.000000000 -0800 +++ xtide-2.8/Makefile.in 2004-12-17 18:14:39.000000000 -0800 @@ -15,7 +15,7 @@ CXX = @CXX@ CC = @CC@ CXXFLAGS = @extracxxflags@ @DEFS@ -I at includedir@ -Ilibtcd -I$(XROOT)/include @normalcxxflags@ -c -LDFLAGS = @extraldflags@ -L at libdir@ -L$(XROOT)/lib @normalldflags@ -o +LDFLAGS = @extraldflags@ -L at libdir@ -L$(XROOT)/lib64 @normalldflags@ -o # Extra switches and libs determined by configure.in extraswitches=@extraswitches@ diff -Naur xtide-2.8.orig/configure xtide-2.8/configure --- xtide-2.8.orig/configure 2004-12-17 18:21:28.000000000 -0800 +++ xtide-2.8/configure 2004-12-17 18:23:57.000000000 -0800 @@ -2602,6 +2602,12 @@ break fi done +for dir in "/usr/X11R6" "/usr/openwin" "/usr/contrib/X11R6" "/usr"; do + if test -r "$dir/lib64/libXaw.so" -o -r "$dir/lib64/libXaw.a" -o -r "$dir/lib64/libXaw.dll.a"; then + xroot="$dir" + break + fi +done echo "$as_me:$LINENO: result: $xroot" >&5 echo "${ECHO_T}$xroot" >&6 if test "$xroot" = "NOT FOUND"; then diff -Naur xtide-2.8.orig/configure.in xtide-2.8/configure.in --- xtide-2.8.orig/configure.in 2004-12-17 18:21:28.000000000 -0800 +++ xtide-2.8/configure.in 2004-12-17 18:19:50.000000000 -0800 @@ -54,6 +54,12 @@ break fi done +for dir in "/usr/X11R6" "/usr/openwin" "/usr/contrib/X11R6" "/usr"; do + if test -r "$dir/lib64/libXaw.so" -o -r "$dir/lib64/libXaw.a" -o -r "$dir/lib64/libXaw.dll.a"; then + xroot="$dir" + break + fi +done AC_MSG_RESULT($xroot) if test "$xroot" = "NOT FOUND"; then AC_MSG_WARN(Type 'make tide' or 'make xttpd' to compile without X11.) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xtide/FC-2/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:36:19 -0000 1.2 +++ .cvsignore 15 Jan 2005 09:55:31 -0000 1.3 @@ -1,2 +1,2 @@ -harmonics.tcd.gz -xtide-2.6.4.tar.gz +harmonics-dwf-2004-12-10-v2.tcd.gz +xtide-2.8.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xtide/FC-2/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:36:19 -0000 1.2 +++ sources 15 Jan 2005 09:55:31 -0000 1.3 @@ -1,2 +1,2 @@ -d632604083928ab97deacfab76c2d50e harmonics.tcd.gz -6b0d5f99586a6356dbfa498629d8f793 xtide-2.6.4.tar.gz +cc55cdf906c9cb5e7938731391f486e0 harmonics-dwf-2004-12-10-v2.tcd.gz +17e34e7d7fc1dcf7b564b2970f821d0e xtide-2.8.tar.gz Index: xtide.spec =================================================================== RCS file: /cvs/extras/rpms/xtide/FC-2/xtide.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xtide.spec 8 Nov 2004 05:36:44 -0000 1.3 +++ xtide.spec 15 Jan 2005 09:55:31 -0000 1.4 @@ -1,17 +1,16 @@ Summary: A program for calculating tide all over the world Name: xtide -Version: 2.6.4 -Release: 0.fdr.4.2 +Version: 2.8 +Release: 0.fdr.1.2 Epoch: 0 URL: http://www.flaterco.com/xtide/ Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.gz -Source1: ftp://harmonics.unh.edu/xtide/harmonics.tcd.gz +Source1: ftp://ftp.flaterco.com/xtide/harmonics-dwf-2004-12-10-v2.tcd.gz Source2: %{name}.desktop -Patch0: %{name}-%{version}.patch +Patch0: %{name}-%{version}.for_x86_64.patch License: GPL Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# BuildRequires: wget BuildRequires: libpng-devel BuildRequires: XFree86-devel BuildRequires: zlib-devel @@ -58,23 +57,23 @@ %prep %setup -q -T -b 0 -%patch -p1 -b .buildroot + +%ifarch x86_64 +%patch0 -p1 -b .buildroot +%endif + cp %{SOURCE1} ./ cp %{SOURCE2} ./ %build %configure -# Generates xml parsing routines. Requires bison and flex. -./do_xml.sh - make %{?_smp_mflags} -# # Get harmonics file -# wget ftp://anonymous:$USER%40$HOSTNAME at harmonics.unh.edu/xtide/harmonics.tcd.gz - # Unzip harmonics file -gunzip harmonics.tcd.gz +gunzip harmonics-dwf-2004-12-10-v2.tcd.gz + +echo "%{_datadir}/%{name}/harmonics-dwf-2004-12-10-v2.tcd" > %{name}.conf %install rm -rf $RPM_BUILD_ROOT @@ -83,11 +82,11 @@ # Install harmonics file. mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name} -cp harmonics.tcd ${RPM_BUILD_ROOT}%{_datadir}/%{name}/ +install -m 644 harmonics-dwf-2004-12-10-v2.tcd ${RPM_BUILD_ROOT}%{_datadir}/%{name}/ # Add configuration file mkdir ${RPM_BUILD_ROOT}%{_sysconfdir} -echo "%{_datadir}/%{name}/harmonics.tcd" > ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}.conf +install -m 644 %{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}.conf # Add desktop entry mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications @@ -112,7 +111,7 @@ %dir %{_datadir}/%{name} # TCD file -%config(missingok) %{_datadir}/%{name}/harmonics.tcd +%config(missingok) %{_datadir}/%{name}/harmonics-dwf-2004-12-10-v2.tcd # Config file %config(noreplace) %{_sysconfdir}/* @@ -125,6 +124,14 @@ %{_sbindir}/* %changelog +* Fri Dec 17 2004 David M. Kaplan 0:2.8-0.fdr.1 +- Made a small hack that should make it compile on x86_64 systems. + +* Wed Dec 15 2004 David M. Kaplan 0:2.8-0.fdr.0 +- Updated to version 2.8 +- Cleaned up spec file because much of the tricks to get it to work + are no longer necessary. + * Mon Dec 8 2003 David M. Kaplan 0:2.6.4-0.fdr.4 - Removed 644 permissions. --- xtide-2.6.4.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jan 15 09:56:56 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 15 Jan 2005 04:56:56 -0500 Subject: rpms/xtide import.log,1.7,1.8 Message-ID: <200501150956.j0F9uuCl020423@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xtide In directory cvs.fedora.redhat.com:/tmp/cvs-serv20414 Modified Files: import.log Log Message: auto-import xtide-2.8-0.fdr.1.1 on branch FC-1 from xtide-2.8-0.fdr.1.1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xtide/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 15 Jan 2005 09:55:31 -0000 1.7 +++ import.log 15 Jan 2005 09:56:54 -0000 1.8 @@ -4,3 +4,4 @@ xtide-2_8-1:HEAD:xtide-2.8-1.src.rpm:1105165649 xtide-2_8-2:HEAD:xtide-2.8-2.src.rpm:1105225646 xtide-2_8-0_fdr_1_2:FC-2:xtide-2.8-0.fdr.1.2.src.rpm:1105782923 +xtide-2_8-0_fdr_1_1:FC-1:xtide-2.8-0.fdr.1.1.src.rpm:1105783000 From fedora-extras-commits at redhat.com Sat Jan 15 09:56:56 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 15 Jan 2005 04:56:56 -0500 Subject: rpms/xtide/FC-1 xtide-2.8.for_x86_64.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xtide.spec, 1.2, 1.3 xtide-2.6.4.patch, 1.1, NONE Message-ID: <200501150956.j0F9uuQC020429@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xtide/FC-1 In directory cvs.fedora.redhat.com:/tmp/cvs-serv20414/FC-1 Modified Files: .cvsignore sources xtide.spec Added Files: xtide-2.8.for_x86_64.patch Removed Files: xtide-2.6.4.patch Log Message: auto-import xtide-2.8-0.fdr.1.1 on branch FC-1 from xtide-2.8-0.fdr.1.1.src.rpm xtide-2.8.for_x86_64.patch: --- NEW FILE xtide-2.8.for_x86_64.patch --- diff -Naur xtide-2.8.orig/Makefile.in xtide-2.8/Makefile.in --- xtide-2.8.orig/Makefile.in 2004-12-17 18:21:28.000000000 -0800 +++ xtide-2.8/Makefile.in 2004-12-17 18:14:39.000000000 -0800 @@ -15,7 +15,7 @@ CXX = @CXX@ CC = @CC@ CXXFLAGS = @extracxxflags@ @DEFS@ -I at includedir@ -Ilibtcd -I$(XROOT)/include @normalcxxflags@ -c -LDFLAGS = @extraldflags@ -L at libdir@ -L$(XROOT)/lib @normalldflags@ -o +LDFLAGS = @extraldflags@ -L at libdir@ -L$(XROOT)/lib64 @normalldflags@ -o # Extra switches and libs determined by configure.in extraswitches=@extraswitches@ diff -Naur xtide-2.8.orig/configure xtide-2.8/configure --- xtide-2.8.orig/configure 2004-12-17 18:21:28.000000000 -0800 +++ xtide-2.8/configure 2004-12-17 18:23:57.000000000 -0800 @@ -2602,6 +2602,12 @@ break fi done +for dir in "/usr/X11R6" "/usr/openwin" "/usr/contrib/X11R6" "/usr"; do + if test -r "$dir/lib64/libXaw.so" -o -r "$dir/lib64/libXaw.a" -o -r "$dir/lib64/libXaw.dll.a"; then + xroot="$dir" + break + fi +done echo "$as_me:$LINENO: result: $xroot" >&5 echo "${ECHO_T}$xroot" >&6 if test "$xroot" = "NOT FOUND"; then diff -Naur xtide-2.8.orig/configure.in xtide-2.8/configure.in --- xtide-2.8.orig/configure.in 2004-12-17 18:21:28.000000000 -0800 +++ xtide-2.8/configure.in 2004-12-17 18:19:50.000000000 -0800 @@ -54,6 +54,12 @@ break fi done +for dir in "/usr/X11R6" "/usr/openwin" "/usr/contrib/X11R6" "/usr"; do + if test -r "$dir/lib64/libXaw.so" -o -r "$dir/lib64/libXaw.a" -o -r "$dir/lib64/libXaw.dll.a"; then + xroot="$dir" + break + fi +done AC_MSG_RESULT($xroot) if test "$xroot" = "NOT FOUND"; then AC_MSG_WARN(Type 'make tide' or 'make xttpd' to compile without X11.) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xtide/FC-1/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:36:19 -0000 1.2 +++ .cvsignore 15 Jan 2005 09:56:54 -0000 1.3 @@ -1,2 +1,2 @@ -harmonics.tcd.gz -xtide-2.6.4.tar.gz +harmonics-dwf-2004-12-10-v2.tcd.gz +xtide-2.8.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xtide/FC-1/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:36:19 -0000 1.2 +++ sources 15 Jan 2005 09:56:54 -0000 1.3 @@ -1,2 +1,2 @@ -d632604083928ab97deacfab76c2d50e harmonics.tcd.gz -6b0d5f99586a6356dbfa498629d8f793 xtide-2.6.4.tar.gz +cc55cdf906c9cb5e7938731391f486e0 harmonics-dwf-2004-12-10-v2.tcd.gz +17e34e7d7fc1dcf7b564b2970f821d0e xtide-2.8.tar.gz Index: xtide.spec =================================================================== RCS file: /cvs/extras/rpms/xtide/FC-1/xtide.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xtide.spec 8 Nov 2004 05:36:38 -0000 1.2 +++ xtide.spec 15 Jan 2005 09:56:54 -0000 1.3 @@ -1,17 +1,16 @@ Summary: A program for calculating tide all over the world Name: xtide -Version: 2.6.4 -Release: 0.fdr.4.1 +Version: 2.8 +Release: 0.fdr.1.1 Epoch: 0 URL: http://www.flaterco.com/xtide/ Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.gz -Source1: ftp://harmonics.unh.edu/xtide/harmonics.tcd.gz +Source1: ftp://ftp.flaterco.com/xtide/harmonics-dwf-2004-12-10-v2.tcd.gz Source2: %{name}.desktop -Patch0: %{name}-%{version}.patch +Patch0: %{name}-%{version}.for_x86_64.patch License: GPL Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# BuildRequires: wget BuildRequires: libpng-devel BuildRequires: XFree86-devel BuildRequires: zlib-devel @@ -58,23 +57,23 @@ %prep %setup -q -T -b 0 -%patch -p1 -b .buildroot + +%ifarch x86_64 +%patch0 -p1 -b .buildroot +%endif + cp %{SOURCE1} ./ cp %{SOURCE2} ./ %build %configure -# Generates xml parsing routines. Requires bison and flex. -./do_xml.sh - make %{?_smp_mflags} -# # Get harmonics file -# wget ftp://anonymous:$USER%40$HOSTNAME at harmonics.unh.edu/xtide/harmonics.tcd.gz - # Unzip harmonics file -gunzip harmonics.tcd.gz +gunzip harmonics-dwf-2004-12-10-v2.tcd.gz + +echo "%{_datadir}/%{name}/harmonics-dwf-2004-12-10-v2.tcd" > %{name}.conf %install rm -rf $RPM_BUILD_ROOT @@ -83,11 +82,11 @@ # Install harmonics file. mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name} -cp harmonics.tcd ${RPM_BUILD_ROOT}%{_datadir}/%{name}/ +install -m 644 harmonics-dwf-2004-12-10-v2.tcd ${RPM_BUILD_ROOT}%{_datadir}/%{name}/ # Add configuration file mkdir ${RPM_BUILD_ROOT}%{_sysconfdir} -echo "%{_datadir}/%{name}/harmonics.tcd" > ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}.conf +install -m 644 %{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}.conf # Add desktop entry mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications @@ -112,7 +111,7 @@ %dir %{_datadir}/%{name} # TCD file -%config(missingok) %{_datadir}/%{name}/harmonics.tcd +%config(missingok) %{_datadir}/%{name}/harmonics-dwf-2004-12-10-v2.tcd # Config file %config(noreplace) %{_sysconfdir}/* @@ -125,6 +124,14 @@ %{_sbindir}/* %changelog +* Fri Dec 17 2004 David M. Kaplan 0:2.8-0.fdr.1 +- Made a small hack that should make it compile on x86_64 systems. + +* Wed Dec 15 2004 David M. Kaplan 0:2.8-0.fdr.0 +- Updated to version 2.8 +- Cleaned up spec file because much of the tricks to get it to work + are no longer necessary. + * Mon Dec 8 2003 David M. Kaplan 0:2.6.4-0.fdr.4 - Removed 644 permissions. --- xtide-2.6.4.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jan 15 09:59:01 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 15 Jan 2005 04:59:01 -0500 Subject: rpms/xtide import.log,1.8,1.9 Message-ID: <200501150959.j0F9x1rF020559@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xtide In directory cvs.fedora.redhat.com:/tmp/cvs-serv20548 Modified Files: import.log Log Message: auto-import xtide-2.8-0.fdr.1.rh90 on branch RHL-9 from xtide-2.8-0.fdr.1.rh90.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xtide/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 15 Jan 2005 09:56:54 -0000 1.8 +++ import.log 15 Jan 2005 09:58:59 -0000 1.9 @@ -5,3 +5,4 @@ xtide-2_8-2:HEAD:xtide-2.8-2.src.rpm:1105225646 xtide-2_8-0_fdr_1_2:FC-2:xtide-2.8-0.fdr.1.2.src.rpm:1105782923 xtide-2_8-0_fdr_1_1:FC-1:xtide-2.8-0.fdr.1.1.src.rpm:1105783000 +xtide-2_8-0_fdr_1_rh90:RHL-9:xtide-2.8-0.fdr.1.rh90.src.rpm:1105783131 From fedora-extras-commits at redhat.com Sat Jan 15 09:59:01 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 15 Jan 2005 04:59:01 -0500 Subject: rpms/xtide/RHL-9 xtide-2.8.for_x86_64.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xtide.spec, 1.1, 1.2 xtide-2.6.4.patch, 1.1, NONE Message-ID: <200501150959.j0F9x1MW020567@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xtide/RHL-9 In directory cvs.fedora.redhat.com:/tmp/cvs-serv20548/RHL-9 Modified Files: .cvsignore sources xtide.spec Added Files: xtide-2.8.for_x86_64.patch Removed Files: xtide-2.6.4.patch Log Message: auto-import xtide-2.8-0.fdr.1.rh90 on branch RHL-9 from xtide-2.8-0.fdr.1.rh90.src.rpm xtide-2.8.for_x86_64.patch: --- NEW FILE xtide-2.8.for_x86_64.patch --- diff -Naur xtide-2.8.orig/Makefile.in xtide-2.8/Makefile.in --- xtide-2.8.orig/Makefile.in 2004-12-17 18:21:28.000000000 -0800 +++ xtide-2.8/Makefile.in 2004-12-17 18:14:39.000000000 -0800 @@ -15,7 +15,7 @@ CXX = @CXX@ CC = @CC@ CXXFLAGS = @extracxxflags@ @DEFS@ -I at includedir@ -Ilibtcd -I$(XROOT)/include @normalcxxflags@ -c -LDFLAGS = @extraldflags@ -L at libdir@ -L$(XROOT)/lib @normalldflags@ -o +LDFLAGS = @extraldflags@ -L at libdir@ -L$(XROOT)/lib64 @normalldflags@ -o # Extra switches and libs determined by configure.in extraswitches=@extraswitches@ diff -Naur xtide-2.8.orig/configure xtide-2.8/configure --- xtide-2.8.orig/configure 2004-12-17 18:21:28.000000000 -0800 +++ xtide-2.8/configure 2004-12-17 18:23:57.000000000 -0800 @@ -2602,6 +2602,12 @@ break fi done +for dir in "/usr/X11R6" "/usr/openwin" "/usr/contrib/X11R6" "/usr"; do + if test -r "$dir/lib64/libXaw.so" -o -r "$dir/lib64/libXaw.a" -o -r "$dir/lib64/libXaw.dll.a"; then + xroot="$dir" + break + fi +done echo "$as_me:$LINENO: result: $xroot" >&5 echo "${ECHO_T}$xroot" >&6 if test "$xroot" = "NOT FOUND"; then diff -Naur xtide-2.8.orig/configure.in xtide-2.8/configure.in --- xtide-2.8.orig/configure.in 2004-12-17 18:21:28.000000000 -0800 +++ xtide-2.8/configure.in 2004-12-17 18:19:50.000000000 -0800 @@ -54,6 +54,12 @@ break fi done +for dir in "/usr/X11R6" "/usr/openwin" "/usr/contrib/X11R6" "/usr"; do + if test -r "$dir/lib64/libXaw.so" -o -r "$dir/lib64/libXaw.a" -o -r "$dir/lib64/libXaw.dll.a"; then + xroot="$dir" + break + fi +done AC_MSG_RESULT($xroot) if test "$xroot" = "NOT FOUND"; then AC_MSG_WARN(Type 'make tide' or 'make xttpd' to compile without X11.) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xtide/RHL-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:36:19 -0000 1.2 +++ .cvsignore 15 Jan 2005 09:58:59 -0000 1.3 @@ -1,2 +1,2 @@ -harmonics.tcd.gz -xtide-2.6.4.tar.gz +harmonics-dwf-2004-12-10-v2.tcd.gz +xtide-2.8.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xtide/RHL-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:36:19 -0000 1.2 +++ sources 15 Jan 2005 09:58:59 -0000 1.3 @@ -1,2 +1,2 @@ -d632604083928ab97deacfab76c2d50e harmonics.tcd.gz -6b0d5f99586a6356dbfa498629d8f793 xtide-2.6.4.tar.gz +cc55cdf906c9cb5e7938731391f486e0 harmonics-dwf-2004-12-10-v2.tcd.gz +17e34e7d7fc1dcf7b564b2970f821d0e xtide-2.8.tar.gz Index: xtide.spec =================================================================== RCS file: /cvs/extras/rpms/xtide/RHL-9/xtide.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xtide.spec 8 Nov 2004 05:36:19 -0000 1.1 +++ xtide.spec 15 Jan 2005 09:58:59 -0000 1.2 @@ -1,17 +1,16 @@ Summary: A program for calculating tide all over the world Name: xtide -Version: 2.6.4 -Release: 0.fdr.4.rh90 +Version: 2.8 +Release: 0.fdr.1.rh90 Epoch: 0 URL: http://www.flaterco.com/xtide/ Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.gz -Source1: ftp://harmonics.unh.edu/xtide/harmonics.tcd.gz +Source1: ftp://ftp.flaterco.com/xtide/harmonics-dwf-2004-12-10-v2.tcd.gz Source2: %{name}.desktop -Patch0: %{name}-%{version}.patch +Patch0: %{name}-%{version}.for_x86_64.patch License: GPL Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# BuildRequires: wget BuildRequires: libpng-devel BuildRequires: XFree86-devel BuildRequires: zlib-devel @@ -58,23 +57,23 @@ %prep %setup -q -T -b 0 -%patch -p1 -b .buildroot + +%ifarch x86_64 +%patch0 -p1 -b .buildroot +%endif + cp %{SOURCE1} ./ cp %{SOURCE2} ./ %build %configure -# Generates xml parsing routines. Requires bison and flex. -./do_xml.sh - make %{?_smp_mflags} -# # Get harmonics file -# wget ftp://anonymous:$USER%40$HOSTNAME at harmonics.unh.edu/xtide/harmonics.tcd.gz - # Unzip harmonics file -gunzip harmonics.tcd.gz +gunzip harmonics-dwf-2004-12-10-v2.tcd.gz + +echo "%{_datadir}/%{name}/harmonics-dwf-2004-12-10-v2.tcd" > %{name}.conf %install rm -rf $RPM_BUILD_ROOT @@ -83,11 +82,11 @@ # Install harmonics file. mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name} -cp harmonics.tcd ${RPM_BUILD_ROOT}%{_datadir}/%{name}/ +install -m 644 harmonics-dwf-2004-12-10-v2.tcd ${RPM_BUILD_ROOT}%{_datadir}/%{name}/ # Add configuration file mkdir ${RPM_BUILD_ROOT}%{_sysconfdir} -echo "%{_datadir}/%{name}/harmonics.tcd" > ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}.conf +install -m 644 %{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}.conf # Add desktop entry mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications @@ -112,7 +111,7 @@ %dir %{_datadir}/%{name} # TCD file -%config(missingok) %{_datadir}/%{name}/harmonics.tcd +%config(missingok) %{_datadir}/%{name}/harmonics-dwf-2004-12-10-v2.tcd # Config file %config(noreplace) %{_sysconfdir}/* @@ -125,6 +124,14 @@ %{_sbindir}/* %changelog +* Fri Dec 17 2004 David M. Kaplan 0:2.8-0.fdr.1 +- Made a small hack that should make it compile on x86_64 systems. + +* Wed Dec 15 2004 David M. Kaplan 0:2.8-0.fdr.0 +- Updated to version 2.8 +- Cleaned up spec file because much of the tricks to get it to work + are no longer necessary. + * Mon Dec 8 2003 David M. Kaplan 0:2.6.4-0.fdr.4 - Removed 644 permissions. --- xtide-2.6.4.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jan 15 11:10:45 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 15 Jan 2005 06:10:45 -0500 Subject: rpms/lft/devel .cvsignore,1.2,1.3 lft.spec,1.5,1.6 sources,1.2,1.3 Message-ID: <200501151110.j0FBAjnk022003@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lft/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv21997 Modified Files: .cvsignore lft.spec sources Log Message: Update to 2.3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lft/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:40:48 -0000 1.2 +++ .cvsignore 15 Jan 2005 11:10:43 -0000 1.3 @@ -1 +1 @@ -lft-2.2.tar.gz +lft-2.3.tar.gz Index: lft.spec =================================================================== RCS file: /cvs/extras/rpms/lft/devel/lft.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lft.spec 10 Dec 2004 22:03:04 -0000 1.5 +++ lft.spec 15 Jan 2005 11:10:43 -0000 1.6 @@ -1,15 +1,17 @@ Name: lft -Version: 2.2 -Release: 2 +Version: 2.3 +Release: 1 Epoch: 0 Summary: Alternate traceroute tool Group: Applications/Internet -License: MainNerve Public License -URL: http://www.mainnerve.com/lft/ -Source0: http://mainnerve.com/lft/lft-2.2.tar.gz +License: VOSTROM Public License +URL: http://oppleman.com/lft/ +# http://oppleman.com/dl/?file=lft-2.3.tar.gz +Source0: %{name}-%{version}.tar.gz Patch0: %{name}-install.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + BuildRequires: libpcap Obsoletes: fft @@ -19,43 +21,39 @@ and goes through many configurations of packet-filter based firewalls. More importantly, LFT implements numerous other features including AS number lookups, loose source routing, netblock name -lookups, et al. Though LFT has been around since 1998, its development -effort has just recently resumed. +lookups, et al. -# ----------------------------------------------------------------------------- %prep %setup -q %patch0 -p0 -# ----------------------------------------------------------------------------- %build %configure make %{?_smp_mflags} -# ----------------------------------------------------------------------------- %install rm -rf $RPM_BUILD_ROOT -%makeinstall +%makeinstall # no DESTDIR support -# ----------------------------------------------------------------------------- %clean rm -rf $RPM_BUILD_ROOT -# ----------------------------------------------------------------------------- %files %defattr(0644,root,root,0755) %doc CHANGELOG COPYING README TODO lft-manpage.html %attr(4755,root,root) %{_bindir}/lft -%{_mandir}/*/* +%{_mandir}/man8/lft.8* -# ----------------------------------------------------------------------------- %changelog +* Sat Jan 15 2005 Ville Skytt?? - 0:2.3-1 +- Update to 2.3. + * Sat Jul 12 2003 Ville Skytt?? - 0:2.2-0.fdr.2 - Fix stale patch issue (bug 311). Index: sources =================================================================== RCS file: /cvs/extras/rpms/lft/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:40:48 -0000 1.2 +++ sources 15 Jan 2005 11:10:43 -0000 1.3 @@ -1 +1 @@ -75d2a4f0e224733156a668ca04881c4b lft-2.2.tar.gz +8ec24dd3bf27d6b736e82ab8ec3b902f lft-2.3.tar.gz From fedora-extras-commits at redhat.com Mon Jan 17 09:43:11 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Mon, 17 Jan 2005 04:43:11 -0500 Subject: rpms/imlib2/devel imlib2-1.2.0-configure-xlib64.patch, NONE, 1.1 imlib2.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200501170943.j0H9hBdn005893@cvs.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/imlib2/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv5887 Modified Files: imlib2.spec sources Added Files: imlib2-1.2.0-configure-xlib64.patch Log Message: imlib2: updates spec file (1.2.0). fix for x86_64 build imlib2-1.2.0-configure-xlib64.patch: --- NEW FILE imlib2-1.2.0-configure-xlib64.patch --- --- configure.old 2005-01-09 18:36:09.314185880 +0100 +++ configure 2005-01-09 18:37:15.840072408 +0100 @@ -20262,7 +20262,7 @@ if test "x$have_x" = "xyes"; then x_dir="/usr/X11R6"; x_cflags="-I"$x_dir"/include" - x_libs="-L"$x_dir"/lib -lX11 -lXext" + x_libs="-L"$x_dir"/lib64 -lX11 -lXext" echo "$as_me:$LINENO: result: enabling X11 support" >&5 echo "${ECHO_T}enabling X11 support" >&6 Index: imlib2.spec =================================================================== RCS file: /cvs/extras/rpms/imlib2/devel/imlib2.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- imlib2.spec 10 Dec 2004 22:03:04 -0000 1.6 +++ imlib2.spec 17 Jan 2005 09:43:09 -0000 1.7 @@ -1,15 +1,19 @@ Summary: A graphic library for file loading, saving, rendering, and manipulation Name: imlib2 -Version: 1.1.2 -Release: 1 +Version: 1.2.0 +Release: 3 Epoch: 0 License: BSD Group: System Environment/Libraries URL: http://www.enlightenment.org/pages/imlib2.html Source0: http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz +Patch0: imlib2-1.2.0-configure-xlib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: XFree86-devel libjpeg-devel libpng-devel libtiff-devel BuildRequires: libungif-devel freetype-devel libtool bzip2-devel +%ifarch x86_64 +BuildRequires: perl +%endif %package devel Summary: Development package for %{name} @@ -39,33 +43,45 @@ %prep %setup -q +%ifarch x86_64 +%patch0 -b .patch0 +%endif # ----------------------------------------------------------------------------- %build %configure \ -%ifarch %{ix86} x86_64 ia64 + --x-libraries=%{_prefix}/X11R6/%{_lib} \ + --with-pic \ +%ifarch %{ix86} ia64 --enable-mmx +%else + --disable-mmx +%endif +%ifarch x86_64 +# fix hardcoded rpath im Makefiles on x86_64 due to freetype-config --libs +# returning "-L/usr/lib64 -Wl,--rpath -Wl,/usr/lib64 -lfreetype -lz": +perl -pi.orig -e 's|-Wl,--rpath -Wl,/usr/lib64||g;' Makefile */Makefile */*/Makefile imlib2-config %endif -make %{?_smp_mflags} -make -C demo +make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool # ----------------------------------------------------------------------------- %install rm -rf $RPM_BUILD_ROOT __doc -make install DESTDIR=$RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -C demo +make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool cp -a doc __doc rm -f __doc/Makefile* rm -f \ - $RPM_BUILD_ROOT%{_libdir}/libImlib2.la \ - $RPM_BUILD_ROOT%{_libdir}/imlib2_loaders/*/*.*a \ + $RPM_BUILD_ROOT%{_libdir}/imlib2/{loaders,filters}/*.*a \ $RPM_BUILD_ROOT%{_bindir}/{color_spaces,imlib2,*test} +# ship .la files due to a bug in kdelibs (see changelog): +# $RPM_BUILD_ROOT%{_libdir}/libImlib2.la \ + # ----------------------------------------------------------------------------- %clean @@ -79,22 +95,56 @@ %files %defattr(-,root,root,-) %doc COPYING AUTHORS README ChangeLog TODO __doc/* -%{_bindir}/imconvert %{_bindir}/imlib2_view +%{_bindir}/imlib2_bumpmap +%{_bindir}/imlib2_colorspace +%{_bindir}/imlib2_conv +%{_bindir}/imlib2_poly +%{_bindir}/imlib2_show %{_libdir}/libImlib2.so.* -%{_libdir}/imlib2_loaders +%{_datadir}/imlib2/data/ +%dir %{_libdir}/imlib2/filters/ +%{_libdir}/imlib2/filters/*.so +%dir %{_libdir}/imlib2/loaders/ +%{_libdir}/imlib2/loaders/*.so %files devel %defattr(-,root,root,-) %{_bindir}/imlib2-config %{_includedir}/Imlib2.h %{_libdir}/libImlib2.a +%{_libdir}/libImlib2.la %{_libdir}/libImlib2.so %{_libdir}/pkgconfig/imlib2.pc # ----------------------------------------------------------------------------- %changelog +* Fri Jan 14 2005 Thorsten Leemhuis - 0:1.1.2-0.fdr.1 - Update to 1.1.2, fixes CAN-2004-0802. - Enable MMX on all ix86, x86_64 and ia64, it seems runtime-detected. Index: sources =================================================================== RCS file: /cvs/extras/rpms/imlib2/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:35:58 -0000 1.3 +++ sources 17 Jan 2005 09:43:09 -0000 1.4 @@ -1 +1 @@ -3389bad516032c951fda4fe620df0cef imlib2-1.1.2.tar.gz +853fb77100ee3c3ca944f52c892ab49b imlib2-1.2.0.tar.gz From fedora-extras-commits at redhat.com Mon Jan 17 11:24:06 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 17 Jan 2005 06:24:06 -0500 Subject: rpms/gpgme03/devel gpgme03.spec,1.6,1.7 Message-ID: <200501171124.j0HBO6mu007690@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gpgme03/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv7684 Modified Files: gpgme03.spec Log Message: Help preparing the road to GPGME 1.0 migration. This change gets rid of dependency on newpg. Index: gpgme03.spec =================================================================== RCS file: /cvs/extras/rpms/gpgme03/devel/gpgme03.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gpgme03.spec 6 Jan 2005 18:17:16 -0000 1.6 +++ gpgme03.spec 17 Jan 2005 11:24:04 -0000 1.7 @@ -1,7 +1,7 @@ Summary: GnuPG Made Easy interface library Name: gpgme03 Version: 0.3.16 -Release: 6 +Release: 7 Epoch: 0 License: GPL Group: Applications/System @@ -10,8 +10,8 @@ Patch1: gpgme-0.3.16-underquoted.patch URL: http://www.gnupg.org/related_software/gpgme/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gnupg >= 0:1.2.0, %{_bindir}/gpgsm -Requires: gnupg >= 0:1.2.0, %{_bindir}/gpgsm +BuildRequires: gnupg >= 0:1.2.0 +Requires: gnupg >= 0:1.2.0 %description GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier @@ -37,7 +37,7 @@ %build -%configure --with-pth=no +%configure --with-pth=no --without-gpgsm make %{?_smp_mflags} @@ -84,6 +84,10 @@ %changelog +* Sun Jan 16 2005 Michael Schwendt - 0.3.16-7 +- Disable GPGSM, remove /usr/bin/gpgsm dependency. + None of our GPGME 0.3.x API users need this. + * Thu Jan 6 2005 Michael Schwendt - 0.3.16-6 - Fix underquoted definition in gpgme.m4. From fedora-extras-commits at redhat.com Mon Jan 17 11:28:07 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 17 Jan 2005 06:28:07 -0500 Subject: rpms/cryptplug/devel cryptplug.spec, 1.5, NONE Makefile, 1.2, NONE sources, 1.3, NONE Message-ID: <200501171128.j0HBS7bM007761@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/cryptplug/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv7755 Removed Files: cryptplug.spec Makefile sources Log Message: As discussed on fedora-devel-list, package is obsolete. KMail in FC3, for instance, uses GPGME >= 0.4.5 instead. --- cryptplug.spec DELETED --- --- Makefile DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon Jan 17 12:11:48 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 17 Jan 2005 07:11:48 -0500 Subject: rpms/kannel/devel kannel-1.4.0-depend.patch, NONE, 1.1 kannel.spec, 1.3, 1.4 Message-ID: <200501171211.j0HCBmiM008568@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/kannel/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv8562 Modified Files: kannel.spec Added Files: kannel-1.4.0-depend.patch Log Message: Fix for FC3's gcc, at last. kannel-1.4.0-depend.patch: --- NEW FILE kannel-1.4.0-depend.patch --- # # improve resistence against broken gcc -MM behaviour # (observed with gcc 3.4.1) # 2005-01-12 stefan.radman at ctbto.org # --- Makefile.in.orig 2004-08-24 21:50:09.000000000 +0000 +++ Makefile.in 2005-01-13 16:23:56.123117718 +0000 @@ -311,7 +311,7 @@ depend .depend: wmlscript/wsgram.h gw-config.h for dir in $(srcdirs); do \ - $(MKDEPEND) $$dir/*.c | sed "s:^[^ ]:$$dir/&:"; done > .depend + $(MKDEPEND) $$dir/*.c | sed -e "s:^ *:\t:" -e "s:^[^\t#]:$$dir/&:" -e "s:^#.*::"; done > .depend include .depend libgw.a: $(gwobjs) Index: kannel.spec =================================================================== RCS file: /cvs/extras/rpms/kannel/devel/kannel.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kannel.spec 13 Jan 2005 18:06:30 -0000 1.3 +++ kannel.spec 17 Jan 2005 12:11:46 -0000 1.4 @@ -1,14 +1,16 @@ Summary: WAP and SMS gateway Name: kannel Version: 1.4.0 -Release: 1 +Release: 3 License: Kannel Group: System Environment/Daemons URL: http://www.kannel.org/ Source: http://www.kannel.org/download/%{version}/gateway-%{version}.tar.bz2 +Patch: kannel-1.4.0-depend.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: bison, byacc, flex, ImageMagick BuildRequires: libxml2-devel, openssl-devel, zlib-devel +BuildRequires: pcre-devel # DB backends BuildRequires: sqlite-devel # For the docs... I think we need transfig too, so disable for now. @@ -42,6 +44,7 @@ %prep %setup -n gateway-%{version} +%patch -p0 -b .depend %build @@ -93,8 +96,16 @@ %changelog +* Mon Jan 17 2005 Matthias Saou 1.4.0-3 +- Added Stefan Radman's patch for kannel bug #173 to fix .depend problem. + * Fri Dec 10 2004 Matthias Saou 1.4.0-1 - Update to 1.4.0. +- Remove the obsolete OpenSSL workaround. + +* Thu Nov 4 2004 Matthias Saou 1.3.2-4 +- Added pcre support, doc building (almost) and sqlite backend... + it still fails with a corrupt first line of .depend on FC3, though. * Tue Aug 24 2004 Matthias Saou 1.3.2-2 - Really comment out all scriplets, they're not yet used. From fedora-extras-commits at redhat.com Mon Jan 17 20:00:22 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 15:00:22 -0500 Subject: rpms/bash-completion/devel .cvsignore, 1.4, 1.5 bash-completion.spec, 1.4, 1.5 sources, 1.4, 1.5 bash-completion-openssl-cnf.patch, 1.1, NONE Message-ID: <200501172000.j0HK0MlM015274@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/bash-completion/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv15268 Modified Files: .cvsignore bash-completion.spec sources Removed Files: bash-completion-openssl-cnf.patch Log Message: Update to 20050112. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bash-completion/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 4 Jan 2005 23:23:51 -0000 1.4 +++ .cvsignore 17 Jan 2005 20:00:20 -0000 1.5 @@ -1 +1 @@ -bash-completion-20050103.tar.bz2 +bash-completion-20050112.tar.bz2 Index: bash-completion.spec =================================================================== RCS file: /cvs/extras/rpms/bash-completion/devel/bash-completion.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bash-completion.spec 4 Jan 2005 23:23:51 -0000 1.4 +++ bash-completion.spec 17 Jan 2005 20:00:20 -0000 1.5 @@ -1,5 +1,5 @@ Name: bash-completion -Version: 20050103 +Version: 20050112 Release: 1 Epoch: 0 Summary: Programmable completion for Bash @@ -7,9 +7,8 @@ Group: System Environment/Shells License: GPL URL: http://www.caliban.org/bash/ -Source0: http://www.caliban.org/files/bash/bash-completion-20050103.tar.bz2 +Source0: http://www.caliban.org/files/bash/bash-completion-20050112.tar.bz2 Source1: %{name}.profile -Patch0: %{name}-openssl-cnf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -22,7 +21,6 @@ %prep %setup -q -n bash_completion -%patch0 %build @@ -130,6 +128,9 @@ %changelog +* Thu Jan 13 2005 Ville Skytt?? - 0:20050112-1 +- Update to 20050112, openssl patch applied upstream. + * Wed Jan 5 2005 Ville Skytt?? - 0:20050103-1 - Update to 20050103. Index: sources =================================================================== RCS file: /cvs/extras/rpms/bash-completion/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Jan 2005 23:23:51 -0000 1.4 +++ sources 17 Jan 2005 20:00:20 -0000 1.5 @@ -1 +1 @@ -0ee7009b18ff862f8a63c2395e5fd100 bash-completion-20050103.tar.bz2 +82fbd64d75fb9942519763c7188407e7 bash-completion-20050112.tar.bz2 --- bash-completion-openssl-cnf.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jan 17 21:06:02 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:06:02 -0500 Subject: rpms/perl-Chart - New directory Message-ID: <200501172106.j0HL62YY017006@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Chart In directory cvs.fedora.redhat.com:/tmp/cvs-serv16999/perl-Chart Log Message: Directory /cvs/extras/rpms/perl-Chart added to the repository From fedora-extras-commits at redhat.com Mon Jan 17 21:06:02 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:06:02 -0500 Subject: rpms/perl-Chart/devel - New directory Message-ID: <200501172106.j0HL62Vj017009@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Chart/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv16999/perl-Chart/devel Log Message: Directory /cvs/extras/rpms/perl-Chart/devel added to the repository From fedora-extras-commits at redhat.com Mon Jan 17 21:06:21 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:06:21 -0500 Subject: rpms/perl-Chart Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501172106.j0HL6LAK017068@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Chart In directory cvs.fedora.redhat.com:/tmp/cvs-serv17059 Added Files: Makefile import.log Log Message: Setup of module perl-Chart --- NEW FILE Makefile --- # Top level Makefile for module perl-Chart all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 17 21:06:21 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:06:21 -0500 Subject: rpms/perl-Chart/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501172106.j0HL6L23017071@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Chart/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17059/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Chart --- NEW 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 Jan 17 21:07:18 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:07:18 -0500 Subject: rpms/perl-Chart import.log,1.1,1.2 Message-ID: <200501172107.j0HL7I6a017169@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Chart In directory cvs.fedora.redhat.com:/tmp/cvs-serv17160 Modified Files: import.log Log Message: auto-import perl-Chart-2.3-2 on branch devel from perl-Chart-2.3-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Chart/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 Jan 2005 21:06:19 -0000 1.1 +++ import.log 17 Jan 2005 21:07:15 -0000 1.2 @@ -0,0 +1 @@ +perl-Chart-2_3-2:HEAD:perl-Chart-2.3-2.src.rpm:1105996029 From fedora-extras-commits at redhat.com Mon Jan 17 21:07:18 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:07:18 -0500 Subject: rpms/perl-Chart/devel perl-Chart.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501172107.j0HL7IOQ017173@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Chart/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17160/devel Modified Files: .cvsignore sources Added Files: perl-Chart.spec Log Message: auto-import perl-Chart-2.3-2 on branch devel from perl-Chart-2.3-2.src.rpm --- NEW FILE perl-Chart.spec --- %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-Chart Version: 2.3 Release: 2 Epoch: 0 Summary: Perl module for producing many types of charts Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Chart/ Source0: http://www.cpan.org/authors/id/C/CH/CHARTGRP/Chart-2.3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1, perl(GD) >= 0:1.20 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. %prep %setup -q -n Chart-%{version} chmod 644 Chart/*.pm TODO doc/Documentation.pdf %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check || : make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README TODO doc/Documentation.pdf rgb.txt %{perl_vendorlib}/Chart %changelog * Sun Jul 11 2004 Ville Skytt?? - 0:2.3-2 - Bring up to date with current fedora.us Perl Spec template. * Thu Jan 15 2004 Ville Skytt?? - 0:2.3-0.fdr.1 - Update to 2.3. - Fix file permissions. * Sat Oct 11 2003 Ville Skytt?? - 0:2.2-0.fdr.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Chart/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jan 2005 21:06:19 -0000 1.1 +++ .cvsignore 17 Jan 2005 21:07:15 -0000 1.2 @@ -0,0 +1 @@ +Chart-2.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Chart/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jan 2005 21:06:19 -0000 1.1 +++ sources 17 Jan 2005 21:07:15 -0000 1.2 @@ -0,0 +1 @@ +809540667dd703353af30147ef27b67d Chart-2.3.tar.gz From fedora-extras-commits at redhat.com Mon Jan 17 21:09:15 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:09:15 -0500 Subject: rpms/perl-ExtUtils-CBuilder import.log,1.10,1.11 Message-ID: <200501172109.j0HL9FQe017285@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder In directory cvs.fedora.redhat.com:/tmp/cvs-serv17276 Modified Files: import.log Log Message: auto-import perl-ExtUtils-CBuilder-0.07-0.fdr.1.rh90 on branch RHL-9 from perl-ExtUtils-CBuilder-0.07-0.fdr.1.rh90.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/import.log,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- import.log 1 Jan 2005 13:01:58 -0000 1.10 +++ import.log 17 Jan 2005 21:09:13 -0000 1.11 @@ -7,3 +7,4 @@ perl-ExtUtils-CBuilder-0_06-0_fdr_1_rh90:RHL-9:perl-ExtUtils-CBuilder-0.06-0.fdr.1.rh90.src.rpm:1104584228 perl-ExtUtils-CBuilder-0_06-0_fdr_1_1:FC-1:perl-ExtUtils-CBuilder-0.06-0.fdr.1.1.src.rpm:1104584345 perl-ExtUtils-CBuilder-0_06-0_fdr_1_2:FC-2:perl-ExtUtils-CBuilder-0.06-0.fdr.1.2.src.rpm:1104584511 +perl-ExtUtils-CBuilder-0_07-0_fdr_1_rh90:RHL-9:perl-ExtUtils-CBuilder-0.07-0.fdr.1.rh90.src.rpm:1105996146 From fedora-extras-commits at redhat.com Mon Jan 17 21:09:15 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:09:15 -0500 Subject: rpms/perl-ExtUtils-CBuilder/RHL-9 ExtUtils-CBuilder-0.07-02-link.t.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 perl-ExtUtils-CBuilder.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200501172109.j0HL9FZh017289@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/RHL-9 In directory cvs.fedora.redhat.com:/tmp/cvs-serv17276/RHL-9 Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Added Files: ExtUtils-CBuilder-0.07-02-link.t.patch Log Message: auto-import perl-ExtUtils-CBuilder-0.07-0.fdr.1.rh90 on branch RHL-9 from perl-ExtUtils-CBuilder-0.07-0.fdr.1.rh90.src.rpm ExtUtils-CBuilder-0.07-02-link.t.patch: --- NEW FILE ExtUtils-CBuilder-0.07-02-link.t.patch --- diff -ruN ExtUtils-CBuilder-0.07-orig/t/02-link.t ExtUtils-CBuilder-0.07/t/02-link.t --- ExtUtils-CBuilder-0.07-orig/t/02-link.t 2005-01-13 03:52:30.000000000 +0000 +++ ExtUtils-CBuilder-0.07/t/02-link.t 2005-01-15 01:49:42.018884208 +0000 @@ -20,7 +20,7 @@ { local *FH; open FH, "> $source_file" or die "Can't create $source_file: $!"; - print FH "int main(char **argv) { return 11; }\n"; + print FH "int main(void) { return 11; }\n"; close FH; } ok -e $source_file; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/RHL-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 1 Jan 2005 12:57:15 -0000 1.4 +++ .cvsignore 17 Jan 2005 21:09:13 -0000 1.5 @@ -1 +1 @@ -ExtUtils-CBuilder-0.06.tar.gz +ExtUtils-CBuilder-0.07.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/RHL-9/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-ExtUtils-CBuilder.spec 1 Jan 2005 12:57:15 -0000 1.3 +++ perl-ExtUtils-CBuilder.spec 17 Jan 2005 21:09:13 -0000 1.4 @@ -1,7 +1,7 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-ExtUtils-CBuilder -Version: 0.06 +Version: 0.07 Release: 0.fdr.1.rh90 Epoch: 0 Summary: Compile and link C code for Perl modules @@ -9,7 +9,8 @@ Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/ExtUtils-CBuilder/ -Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.06.tar.gz +Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.07.tar.gz +Patch: ExtUtils-CBuilder-0.07-02-link.t.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -25,6 +26,7 @@ %prep %setup -q -n ExtUtils-CBuilder-%{version} +%patch -p1 %build @@ -56,6 +58,9 @@ %changelog +* Sat Jan 15 2005 Jose Pedro Oliveira - 0:0.07-0.fdr.1 +- Update to 0.07. + * Tue Dec 28 2004 Jose Pedro Oliveira - 0:0.06-0.fdr.1 - Update to 0.06. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/RHL-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Jan 2005 12:57:15 -0000 1.4 +++ sources 17 Jan 2005 21:09:13 -0000 1.5 @@ -1 +1 @@ -3aef9536908deb4194583c3cfd5281b1 ExtUtils-CBuilder-0.06.tar.gz +145c90ea9be4c13a6ad3a5d170413857 ExtUtils-CBuilder-0.07.tar.gz From fedora-extras-commits at redhat.com Mon Jan 17 21:10:14 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:10:14 -0500 Subject: rpms/perl-ExtUtils-CBuilder import.log,1.11,1.12 Message-ID: <200501172110.j0HLAEtn017408@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder In directory cvs.fedora.redhat.com:/tmp/cvs-serv17399 Modified Files: import.log Log Message: auto-import perl-ExtUtils-CBuilder-0.07-0.fdr.1.1 on branch FC-1 from perl-ExtUtils-CBuilder-0.07-0.fdr.1.1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/import.log,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- import.log 17 Jan 2005 21:09:13 -0000 1.11 +++ import.log 17 Jan 2005 21:10:12 -0000 1.12 @@ -8,3 +8,4 @@ perl-ExtUtils-CBuilder-0_06-0_fdr_1_1:FC-1:perl-ExtUtils-CBuilder-0.06-0.fdr.1.1.src.rpm:1104584345 perl-ExtUtils-CBuilder-0_06-0_fdr_1_2:FC-2:perl-ExtUtils-CBuilder-0.06-0.fdr.1.2.src.rpm:1104584511 perl-ExtUtils-CBuilder-0_07-0_fdr_1_rh90:RHL-9:perl-ExtUtils-CBuilder-0.07-0.fdr.1.rh90.src.rpm:1105996146 +perl-ExtUtils-CBuilder-0_07-0_fdr_1_1:FC-1:perl-ExtUtils-CBuilder-0.07-0.fdr.1.1.src.rpm:1105996205 From fedora-extras-commits at redhat.com Mon Jan 17 21:10:14 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:10:14 -0500 Subject: rpms/perl-ExtUtils-CBuilder/FC-1 ExtUtils-CBuilder-0.07-02-link.t.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 perl-ExtUtils-CBuilder.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200501172110.j0HLAEVd017412@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-1 In directory cvs.fedora.redhat.com:/tmp/cvs-serv17399/FC-1 Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Added Files: ExtUtils-CBuilder-0.07-02-link.t.patch Log Message: auto-import perl-ExtUtils-CBuilder-0.07-0.fdr.1.1 on branch FC-1 from perl-ExtUtils-CBuilder-0.07-0.fdr.1.1.src.rpm ExtUtils-CBuilder-0.07-02-link.t.patch: --- NEW FILE ExtUtils-CBuilder-0.07-02-link.t.patch --- diff -ruN ExtUtils-CBuilder-0.07-orig/t/02-link.t ExtUtils-CBuilder-0.07/t/02-link.t --- ExtUtils-CBuilder-0.07-orig/t/02-link.t 2005-01-13 03:52:30.000000000 +0000 +++ ExtUtils-CBuilder-0.07/t/02-link.t 2005-01-15 01:49:42.018884208 +0000 @@ -20,7 +20,7 @@ { local *FH; open FH, "> $source_file" or die "Can't create $source_file: $!"; - print FH "int main(char **argv) { return 11; }\n"; + print FH "int main(void) { return 11; }\n"; close FH; } ok -e $source_file; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-1/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 1 Jan 2005 12:59:11 -0000 1.4 +++ .cvsignore 17 Jan 2005 21:10:12 -0000 1.5 @@ -1 +1 @@ -ExtUtils-CBuilder-0.06.tar.gz +ExtUtils-CBuilder-0.07.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-1/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-ExtUtils-CBuilder.spec 1 Jan 2005 12:59:11 -0000 1.4 +++ perl-ExtUtils-CBuilder.spec 17 Jan 2005 21:10:12 -0000 1.5 @@ -1,7 +1,7 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-ExtUtils-CBuilder -Version: 0.06 +Version: 0.07 Release: 0.fdr.1.1 Epoch: 0 Summary: Compile and link C code for Perl modules @@ -9,7 +9,8 @@ Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/ExtUtils-CBuilder/ -Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.06.tar.gz +Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.07.tar.gz +Patch: ExtUtils-CBuilder-0.07-02-link.t.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -25,6 +26,7 @@ %prep %setup -q -n ExtUtils-CBuilder-%{version} +%patch -p1 %build @@ -56,6 +58,9 @@ %changelog +* Sat Jan 15 2005 Jose Pedro Oliveira - 0:0.07-0.fdr.1 +- Update to 0.07. + * Tue Dec 28 2004 Jose Pedro Oliveira - 0:0.06-0.fdr.1 - Update to 0.06. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-1/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Jan 2005 12:59:11 -0000 1.4 +++ sources 17 Jan 2005 21:10:12 -0000 1.5 @@ -1 +1 @@ -3aef9536908deb4194583c3cfd5281b1 ExtUtils-CBuilder-0.06.tar.gz +145c90ea9be4c13a6ad3a5d170413857 ExtUtils-CBuilder-0.07.tar.gz From fedora-extras-commits at redhat.com Mon Jan 17 21:11:12 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:11:12 -0500 Subject: rpms/perl-ExtUtils-CBuilder import.log,1.12,1.13 Message-ID: <200501172111.j0HLBCOO017537@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder In directory cvs.fedora.redhat.com:/tmp/cvs-serv17528 Modified Files: import.log Log Message: auto-import perl-ExtUtils-CBuilder-0.07-0.fdr.1.2 on branch FC-2 from perl-ExtUtils-CBuilder-0.07-0.fdr.1.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/import.log,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- import.log 17 Jan 2005 21:10:12 -0000 1.12 +++ import.log 17 Jan 2005 21:11:10 -0000 1.13 @@ -9,3 +9,4 @@ perl-ExtUtils-CBuilder-0_06-0_fdr_1_2:FC-2:perl-ExtUtils-CBuilder-0.06-0.fdr.1.2.src.rpm:1104584511 perl-ExtUtils-CBuilder-0_07-0_fdr_1_rh90:RHL-9:perl-ExtUtils-CBuilder-0.07-0.fdr.1.rh90.src.rpm:1105996146 perl-ExtUtils-CBuilder-0_07-0_fdr_1_1:FC-1:perl-ExtUtils-CBuilder-0.07-0.fdr.1.1.src.rpm:1105996205 +perl-ExtUtils-CBuilder-0_07-0_fdr_1_2:FC-2:perl-ExtUtils-CBuilder-0.07-0.fdr.1.2.src.rpm:1105996263 From fedora-extras-commits at redhat.com Mon Jan 17 21:11:12 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:11:12 -0500 Subject: rpms/perl-ExtUtils-CBuilder/FC-2 ExtUtils-CBuilder-0.07-02-link.t.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 perl-ExtUtils-CBuilder.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200501172111.j0HLBCLI017541@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv17528/FC-2 Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Added Files: ExtUtils-CBuilder-0.07-02-link.t.patch Log Message: auto-import perl-ExtUtils-CBuilder-0.07-0.fdr.1.2 on branch FC-2 from perl-ExtUtils-CBuilder-0.07-0.fdr.1.2.src.rpm ExtUtils-CBuilder-0.07-02-link.t.patch: --- NEW FILE ExtUtils-CBuilder-0.07-02-link.t.patch --- diff -ruN ExtUtils-CBuilder-0.07-orig/t/02-link.t ExtUtils-CBuilder-0.07/t/02-link.t --- ExtUtils-CBuilder-0.07-orig/t/02-link.t 2005-01-13 03:52:30.000000000 +0000 +++ ExtUtils-CBuilder-0.07/t/02-link.t 2005-01-15 01:49:42.018884208 +0000 @@ -20,7 +20,7 @@ { local *FH; open FH, "> $source_file" or die "Can't create $source_file: $!"; - print FH "int main(char **argv) { return 11; }\n"; + print FH "int main(void) { return 11; }\n"; close FH; } ok -e $source_file; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-2/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 1 Jan 2005 13:01:58 -0000 1.4 +++ .cvsignore 17 Jan 2005 21:11:10 -0000 1.5 @@ -1 +1 @@ -ExtUtils-CBuilder-0.06.tar.gz +ExtUtils-CBuilder-0.07.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-2/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-ExtUtils-CBuilder.spec 1 Jan 2005 13:01:58 -0000 1.5 +++ perl-ExtUtils-CBuilder.spec 17 Jan 2005 21:11:10 -0000 1.6 @@ -1,7 +1,7 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-ExtUtils-CBuilder -Version: 0.06 +Version: 0.07 Release: 0.fdr.1.2 Epoch: 0 Summary: Compile and link C code for Perl modules @@ -9,7 +9,8 @@ Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/ExtUtils-CBuilder/ -Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.06.tar.gz +Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.07.tar.gz +Patch: ExtUtils-CBuilder-0.07-02-link.t.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -25,6 +26,7 @@ %prep %setup -q -n ExtUtils-CBuilder-%{version} +%patch -p1 %build @@ -56,6 +58,9 @@ %changelog +* Sat Jan 15 2005 Jose Pedro Oliveira - 0:0.07-0.fdr.1 +- Update to 0.07. + * Tue Dec 28 2004 Jose Pedro Oliveira - 0:0.06-0.fdr.1 - Update to 0.06. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-2/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Jan 2005 13:01:58 -0000 1.4 +++ sources 17 Jan 2005 21:11:10 -0000 1.5 @@ -1 +1 @@ -3aef9536908deb4194583c3cfd5281b1 ExtUtils-CBuilder-0.06.tar.gz +145c90ea9be4c13a6ad3a5d170413857 ExtUtils-CBuilder-0.07.tar.gz From fedora-extras-commits at redhat.com Mon Jan 17 21:12:24 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:12:24 -0500 Subject: rpms/perl-GDGraph3d/FC-1 .cvsignore, 1.2, 1.3 perl-GDGraph3d.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200501172112.j0HLCOtq017658@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-GDGraph3d/FC-1 In directory cvs.fedora.redhat.com:/tmp/cvs-serv17646/FC-1 Modified Files: .cvsignore perl-GDGraph3d.spec sources Log Message: auto-import perl-GDGraph3d-0.63-0.fdr.2.1 on branch FC-1 from perl-GDGraph3d-0.63-0.fdr.2.1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph3d/FC-1/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:01:02 -0000 1.2 +++ .cvsignore 17 Jan 2005 21:12:22 -0000 1.3 @@ -1 +1 @@ -GDGraph3d-0.56.tar.gz +GD-Graph3d-0.63.tar.gz Index: perl-GDGraph3d.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph3d/FC-1/perl-GDGraph3d.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-GDGraph3d.spec 8 Nov 2004 05:01:02 -0000 1.1 +++ perl-GDGraph3d.spec 17 Jan 2005 21:12:22 -0000 1.2 @@ -1,21 +1,22 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-GDGraph3d -Version: 0.56 -Release: 0.fdr.3.1 +Version: 0.63 +Release: 0.fdr.2.1 Epoch: 0 Summary: 3D graph generation package for Perl Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/GDGraph3d/ -Source0: http://www.cpan.org/authors/id/W/WA/WADG/GDGraph3d-0.56.tar.gz +Source0: http://www.cpan.org/authors/id/W/WA/WADG/GD-Graph3d-0.63.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 BuildRequires: perl(GD), perl(GD::Text), perl(GD::Graph) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Provides: perl-GD-Graph3d = %{epoch}:%{version}-%{release} %description This is the GD::Graph3d extensions module. It provides 3D graphs for @@ -24,7 +25,7 @@ %prep -%setup -q -n GDGraph3d-%{version} +%setup -q -n GD-Graph3d-%{version} %build @@ -50,16 +51,22 @@ %files %defattr(-,root,root,-) -%doc Changes README +%doc Changes %{perl_vendorlib}/GD/ %{_mandir}/man3/*.3* %changelog -* Sun Jul 11 2004 Jose Pedro Oliveira - 0:0.56-0.fdr.3 +* Sat Jan 15 2005 Jose Pedro Oliveira - 0:0.63-0.fdr.2 +- Added versioning to the Provides statement (bug 2371). + +* Sun Jan 9 2005 Jose Pedro Oliveira - 0:0.63-0.fdr.1 +- Update to 0.63. + +* Sun Jul 11 2004 Jose Pedro Oliveira - 0:0.56-0.fdr.3 - Unowned directory: %%{perl_vendorlib}/GD (see bug 1800 comment #1). -* Wed Jun 30 2004 Jose Pedro Oliveira - 0:0.56-0.fdr.2 +* Wed Jun 30 2004 Jose Pedro Oliveira - 0:0.56-0.fdr.2 - Bring up to date with current fedora.us perl spec template. * Sun Oct 12 2003 Ville Skytt?? - 0:0.56-0.fdr.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph3d/FC-1/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:01:02 -0000 1.2 +++ sources 17 Jan 2005 21:12:22 -0000 1.3 @@ -1 +1 @@ -294dabc54c640ee62046932e7c4c6d1c GDGraph3d-0.56.tar.gz +f866dcdd1e7e2056bb946ab7ac3fe37b GD-Graph3d-0.63.tar.gz From fedora-extras-commits at redhat.com Mon Jan 17 21:12:24 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:12:24 -0500 Subject: rpms/perl-GDGraph3d import.log,1.3,1.4 Message-ID: <200501172112.j0HLCOu8017655@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-GDGraph3d In directory cvs.fedora.redhat.com:/tmp/cvs-serv17646 Modified Files: import.log Log Message: auto-import perl-GDGraph3d-0.63-0.fdr.2.1 on branch FC-1 from perl-GDGraph3d-0.63-0.fdr.2.1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph3d/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 8 Nov 2004 05:01:08 -0000 1.3 +++ import.log 17 Jan 2005 21:12:22 -0000 1.4 @@ -1,2 +1,3 @@ perl-GDGraph3d-0_56-0_fdr_3_1:HEAD:perl-GDGraph3d-0.56-0.fdr.3.1.src.rpm:1099890062 perl-GDGraph3d-0_56-0_fdr_3_2:HEAD:perl-GDGraph3d-0.56-0.fdr.3.2.src.rpm:1099890068 +perl-GDGraph3d-0_63-0_fdr_2_1:FC-1:perl-GDGraph3d-0.63-0.fdr.2.1.src.rpm:1105996335 From fedora-extras-commits at redhat.com Mon Jan 17 21:13:14 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:13:14 -0500 Subject: rpms/perl-GDGraph3d import.log,1.4,1.5 Message-ID: <200501172113.j0HLDER5017765@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-GDGraph3d In directory cvs.fedora.redhat.com:/tmp/cvs-serv17756 Modified Files: import.log Log Message: auto-import perl-GDGraph3d-0.63-0.fdr.2.2 on branch FC-2 from perl-GDGraph3d-0.63-0.fdr.2.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph3d/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 17 Jan 2005 21:12:22 -0000 1.4 +++ import.log 17 Jan 2005 21:13:12 -0000 1.5 @@ -1,3 +1,4 @@ perl-GDGraph3d-0_56-0_fdr_3_1:HEAD:perl-GDGraph3d-0.56-0.fdr.3.1.src.rpm:1099890062 perl-GDGraph3d-0_56-0_fdr_3_2:HEAD:perl-GDGraph3d-0.56-0.fdr.3.2.src.rpm:1099890068 perl-GDGraph3d-0_63-0_fdr_2_1:FC-1:perl-GDGraph3d-0.63-0.fdr.2.1.src.rpm:1105996335 +perl-GDGraph3d-0_63-0_fdr_2_2:FC-2:perl-GDGraph3d-0.63-0.fdr.2.2.src.rpm:1105996385 From fedora-extras-commits at redhat.com Mon Jan 17 21:13:14 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:13:14 -0500 Subject: rpms/perl-GDGraph3d/FC-2 .cvsignore, 1.2, 1.3 perl-GDGraph3d.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200501172113.j0HLDE1o017769@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-GDGraph3d/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv17756/FC-2 Modified Files: .cvsignore perl-GDGraph3d.spec sources Log Message: auto-import perl-GDGraph3d-0.63-0.fdr.2.2 on branch FC-2 from perl-GDGraph3d-0.63-0.fdr.2.2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph3d/FC-2/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:01:02 -0000 1.2 +++ .cvsignore 17 Jan 2005 21:13:12 -0000 1.3 @@ -1 +1 @@ -GDGraph3d-0.56.tar.gz +GD-Graph3d-0.63.tar.gz Index: perl-GDGraph3d.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph3d/FC-2/perl-GDGraph3d.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-GDGraph3d.spec 8 Nov 2004 05:01:08 -0000 1.2 +++ perl-GDGraph3d.spec 17 Jan 2005 21:13:12 -0000 1.3 @@ -1,21 +1,22 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-GDGraph3d -Version: 0.56 -Release: 0.fdr.3.2 +Version: 0.63 +Release: 0.fdr.2.2 Epoch: 0 Summary: 3D graph generation package for Perl Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/GDGraph3d/ -Source0: http://www.cpan.org/authors/id/W/WA/WADG/GDGraph3d-0.56.tar.gz +Source0: http://www.cpan.org/authors/id/W/WA/WADG/GD-Graph3d-0.63.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 BuildRequires: perl(GD), perl(GD::Text), perl(GD::Graph) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Provides: perl-GD-Graph3d = %{epoch}:%{version}-%{release} %description This is the GD::Graph3d extensions module. It provides 3D graphs for @@ -24,7 +25,7 @@ %prep -%setup -q -n GDGraph3d-%{version} +%setup -q -n GD-Graph3d-%{version} %build @@ -50,16 +51,22 @@ %files %defattr(-,root,root,-) -%doc Changes README +%doc Changes %{perl_vendorlib}/GD/ %{_mandir}/man3/*.3* %changelog -* Sun Jul 11 2004 Jose Pedro Oliveira - 0:0.56-0.fdr.3 +* Sat Jan 15 2005 Jose Pedro Oliveira - 0:0.63-0.fdr.2 +- Added versioning to the Provides statement (bug 2371). + +* Sun Jan 9 2005 Jose Pedro Oliveira - 0:0.63-0.fdr.1 +- Update to 0.63. + +* Sun Jul 11 2004 Jose Pedro Oliveira - 0:0.56-0.fdr.3 - Unowned directory: %%{perl_vendorlib}/GD (see bug 1800 comment #1). -* Wed Jun 30 2004 Jose Pedro Oliveira - 0:0.56-0.fdr.2 +* Wed Jun 30 2004 Jose Pedro Oliveira - 0:0.56-0.fdr.2 - Bring up to date with current fedora.us perl spec template. * Sun Oct 12 2003 Ville Skytt?? - 0:0.56-0.fdr.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph3d/FC-2/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:01:02 -0000 1.2 +++ sources 17 Jan 2005 21:13:12 -0000 1.3 @@ -1 +1 @@ -294dabc54c640ee62046932e7c4c6d1c GDGraph3d-0.56.tar.gz +f866dcdd1e7e2056bb946ab7ac3fe37b GD-Graph3d-0.63.tar.gz From fedora-extras-commits at redhat.com Mon Jan 17 21:14:54 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:14:54 -0500 Subject: rpms/perl-GDGraph3d import.log,1.5,1.6 Message-ID: <200501172114.j0HLEsQf017880@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-GDGraph3d In directory cvs.fedora.redhat.com:/tmp/cvs-serv17871 Modified Files: import.log Log Message: auto-import perl-GDGraph3d-0.63-2 on branch devel from perl-GDGraph3d-0.63-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph3d/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 17 Jan 2005 21:13:12 -0000 1.5 +++ import.log 17 Jan 2005 21:14:52 -0000 1.6 @@ -2,3 +2,4 @@ perl-GDGraph3d-0_56-0_fdr_3_2:HEAD:perl-GDGraph3d-0.56-0.fdr.3.2.src.rpm:1099890068 perl-GDGraph3d-0_63-0_fdr_2_1:FC-1:perl-GDGraph3d-0.63-0.fdr.2.1.src.rpm:1105996335 perl-GDGraph3d-0_63-0_fdr_2_2:FC-2:perl-GDGraph3d-0.63-0.fdr.2.2.src.rpm:1105996385 +perl-GDGraph3d-0_63-2:HEAD:perl-GDGraph3d-0.63-2.src.rpm:1105996485 From fedora-extras-commits at redhat.com Mon Jan 17 21:14:54 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:14:54 -0500 Subject: rpms/perl-GDGraph3d/devel .cvsignore, 1.2, 1.3 perl-GDGraph3d.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200501172114.j0HLEskg017884@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-GDGraph3d/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17871/devel Modified Files: .cvsignore perl-GDGraph3d.spec sources Log Message: auto-import perl-GDGraph3d-0.63-2 on branch devel from perl-GDGraph3d-0.63-2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph3d/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:01:02 -0000 1.2 +++ .cvsignore 17 Jan 2005 21:14:52 -0000 1.3 @@ -1 +1 @@ -GDGraph3d-0.56.tar.gz +GD-Graph3d-0.63.tar.gz Index: perl-GDGraph3d.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph3d/devel/perl-GDGraph3d.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-GDGraph3d.spec 10 Dec 2004 22:03:08 -0000 1.3 +++ perl-GDGraph3d.spec 17 Jan 2005 21:14:52 -0000 1.4 @@ -1,21 +1,22 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-GDGraph3d -Version: 0.56 -Release: 3 +Version: 0.63 +Release: 2 Epoch: 0 Summary: 3D graph generation package for Perl Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/GDGraph3d/ -Source0: http://www.cpan.org/authors/id/W/WA/WADG/GDGraph3d-0.56.tar.gz +Source0: http://www.cpan.org/authors/id/W/WA/WADG/GD-Graph3d-0.63.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 BuildRequires: perl(GD), perl(GD::Text), perl(GD::Graph) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Provides: perl-GD-Graph3d = %{epoch}:%{version}-%{release} %description This is the GD::Graph3d extensions module. It provides 3D graphs for @@ -24,7 +25,7 @@ %prep -%setup -q -n GDGraph3d-%{version} +%setup -q -n GD-Graph3d-%{version} %build @@ -50,16 +51,22 @@ %files %defattr(-,root,root,-) -%doc Changes README +%doc Changes %{perl_vendorlib}/GD/ %{_mandir}/man3/*.3* %changelog -* Sun Jul 11 2004 Jose Pedro Oliveira - 0:0.56-0.fdr.3 +* Sat Jan 15 2005 Jose Pedro Oliveira - 0:0.63-2 +- Added versioning to the Provides statement (bug 2371). + +* Sun Jan 9 2005 Jose Pedro Oliveira - 0:0.63-0.fdr.1 +- Update to 0.63. + +* Sun Jul 11 2004 Jose Pedro Oliveira - 0:0.56-0.fdr.3 - Unowned directory: %%{perl_vendorlib}/GD (see bug 1800 comment #1). -* Wed Jun 30 2004 Jose Pedro Oliveira - 0:0.56-0.fdr.2 +* Wed Jun 30 2004 Jose Pedro Oliveira - 0:0.56-0.fdr.2 - Bring up to date with current fedora.us perl spec template. * Sun Oct 12 2003 Ville Skytt?? - 0:0.56-0.fdr.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph3d/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:01:02 -0000 1.2 +++ sources 17 Jan 2005 21:14:52 -0000 1.3 @@ -1 +1 @@ -294dabc54c640ee62046932e7c4c6d1c GDGraph3d-0.56.tar.gz +f866dcdd1e7e2056bb946ab7ac3fe37b GD-Graph3d-0.63.tar.gz From fedora-extras-commits at redhat.com Mon Jan 17 21:16:39 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:16:39 -0500 Subject: rpms/perl-ExtUtils-CBuilder import.log,1.13,1.14 Message-ID: <200501172116.j0HLGdnb018003@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder In directory cvs.fedora.redhat.com:/tmp/cvs-serv17994 Modified Files: import.log Log Message: auto-import perl-ExtUtils-CBuilder-0.07-1 on branch devel from perl-ExtUtils-CBuilder-0.07-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/import.log,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- import.log 17 Jan 2005 21:11:10 -0000 1.13 +++ import.log 17 Jan 2005 21:16:37 -0000 1.14 @@ -10,3 +10,4 @@ perl-ExtUtils-CBuilder-0_07-0_fdr_1_rh90:RHL-9:perl-ExtUtils-CBuilder-0.07-0.fdr.1.rh90.src.rpm:1105996146 perl-ExtUtils-CBuilder-0_07-0_fdr_1_1:FC-1:perl-ExtUtils-CBuilder-0.07-0.fdr.1.1.src.rpm:1105996205 perl-ExtUtils-CBuilder-0_07-0_fdr_1_2:FC-2:perl-ExtUtils-CBuilder-0.07-0.fdr.1.2.src.rpm:1105996263 +perl-ExtUtils-CBuilder-0_07-1:HEAD:perl-ExtUtils-CBuilder-0.07-1.src.rpm:1105996590 From fedora-extras-commits at redhat.com Mon Jan 17 21:16:39 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:16:39 -0500 Subject: rpms/perl-ExtUtils-CBuilder/devel ExtUtils-CBuilder-0.07-02-link.t.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 perl-ExtUtils-CBuilder.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200501172116.j0HLGdMX018007@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17994/devel Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Added Files: ExtUtils-CBuilder-0.07-02-link.t.patch Log Message: auto-import perl-ExtUtils-CBuilder-0.07-1 on branch devel from perl-ExtUtils-CBuilder-0.07-1.src.rpm ExtUtils-CBuilder-0.07-02-link.t.patch: --- NEW FILE ExtUtils-CBuilder-0.07-02-link.t.patch --- diff -ruN ExtUtils-CBuilder-0.07-orig/t/02-link.t ExtUtils-CBuilder-0.07/t/02-link.t --- ExtUtils-CBuilder-0.07-orig/t/02-link.t 2005-01-13 03:52:30.000000000 +0000 +++ ExtUtils-CBuilder-0.07/t/02-link.t 2005-01-15 01:49:42.018884208 +0000 @@ -20,7 +20,7 @@ { local *FH; open FH, "> $source_file" or die "Can't create $source_file: $!"; - print FH "int main(char **argv) { return 11; }\n"; + print FH "int main(void) { return 11; }\n"; close FH; } ok -e $source_file; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 1 Jan 2005 13:15:00 -0000 1.4 +++ .cvsignore 17 Jan 2005 21:16:37 -0000 1.5 @@ -1 +1 @@ -ExtUtils-CBuilder-0.06.tar.gz +ExtUtils-CBuilder-0.07.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-ExtUtils-CBuilder.spec 1 Jan 2005 13:15:00 -0000 1.6 +++ perl-ExtUtils-CBuilder.spec 17 Jan 2005 21:16:37 -0000 1.7 @@ -1,7 +1,7 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-ExtUtils-CBuilder -Version: 0.06 +Version: 0.07 Release: 1 Epoch: 0 Summary: Compile and link C code for Perl modules @@ -9,7 +9,8 @@ Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/ExtUtils-CBuilder/ -Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.06.tar.gz +Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.07.tar.gz +Patch: ExtUtils-CBuilder-0.07-02-link.t.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -25,6 +26,7 @@ %prep %setup -q -n ExtUtils-CBuilder-%{version} +%patch -p1 %build @@ -56,7 +58,10 @@ %changelog -* Tue Dec 28 2004 Jose Pedro Oliveira - 0:0.06-1 +* Sat Jan 15 2005 Jose Pedro Oliveira - 0:0.07-1 +- Update to 0.07. + +* Tue Dec 28 2004 Jose Pedro Oliveira - 0:0.06-0.fdr.1 - Update to 0.06. * Mon Nov 29 2004 Ville Skytt?? - 0:0.05-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Jan 2005 13:15:00 -0000 1.4 +++ sources 17 Jan 2005 21:16:37 -0000 1.5 @@ -1 +1 @@ -3aef9536908deb4194583c3cfd5281b1 ExtUtils-CBuilder-0.06.tar.gz +145c90ea9be4c13a6ad3a5d170413857 ExtUtils-CBuilder-0.07.tar.gz From fedora-extras-commits at redhat.com Mon Jan 17 22:01:28 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 17:01:28 -0500 Subject: rpms/apt/devel apt-0.5.15cnc6-pymake2.patch, NONE, 1.1 apt-0.5.15cnc6-python-update.patch, NONE, 1.1 apt-0.5.15cnc6-r362.patch, NONE, 1.1 apt-0.5.15cnc6-scriptdir.patch, NONE, 1.1 apt.cron, NONE, 1.1 apt.init, NONE, 1.1 apt.sysconfig, NONE, 1.1 comps2prio.xsl, NONE, 1.1 rpmpriorities.1, 1.2, 1.3 rpmpriorities.2, 1.2, 1.3 rpmpriorities.3, NONE, 1.1 rpmpriorities.Rawhide, NONE, 1.1 apt-0.5.15cnc6-pymake.patch, 1.1, 1.2 apt.spec, 1.4, 1.5 default.conf, 1.1, 1.2 mirror-select.conf, 1.2, 1.3 upgradevirt.lua, 1.1, 1.2 apt-0.5.15cnc6-build-dep-fixdeps.patch, 1.1, NONE apt-0.5.5-rpmdir-symlink.patch, 1.1, NONE rpmpriorities, 1.1, NONE Message-ID: <200501172201.j0HM1SDp018944@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/apt/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv18331 Modified Files: apt-0.5.15cnc6-pymake.patch apt.spec default.conf mirror-select.conf upgradevirt.lua Added Files: apt-0.5.15cnc6-pymake2.patch apt-0.5.15cnc6-python-update.patch apt-0.5.15cnc6-r362.patch apt-0.5.15cnc6-scriptdir.patch apt.cron apt.init apt.sysconfig comps2prio.xsl rpmpriorities.1 rpmpriorities.2 rpmpriorities.3 rpmpriorities.Rawhide Removed Files: apt-0.5.15cnc6-build-dep-fixdeps.patch apt-0.5.5-rpmdir-symlink.patch rpmpriorities Log Message: Per Panu's approval, bring in lots of accumulated work from him, and add some bits from yours truly. apt-0.5.15cnc6-pymake2.patch: --- NEW FILE apt-0.5.15cnc6-pymake2.patch --- --- python/Makefile~ 2004-03-19 14:51:39.000000000 +0200 +++ python/Makefile 2005-01-16 11:55:44.552686258 +0200 @@ -8,8 +8,8 @@ #SWIG = /var/tmp/swig/BUILD/SWIG-1.3.16/swig LUAFLAGS = -DWITH_LUA -PYTHONVER = $(shell python -c "import sys; v=sys.version_info[:2]; print '%d.%d'%v" 2>/dev/null || echo NONE) -PYTHONFLAGS=-I/usr/include/python$(PYTHONVER) +PYTHON = python +PYTHONFLAGS = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_inc; print '-I' + get_python_inc(1)") all: $(MODULES) @@ -25,4 +25,4 @@ rm -f *.cxx distclean: clean - rm -f $(MODULES) *.pyc _*.so + rm -f $(MODULES) *.pyc *.pyo *.so apt-0.5.15cnc6-python-update.patch: --- NEW FILE apt-0.5.15cnc6-python-update.patch --- --- apt-0.5.15cnc6/python/apt.py.pyupdate 2004-08-14 16:35:16.427061350 +0300 +++ apt-0.5.15cnc6/python/apt.py 2004-08-14 16:35:17.747778020 +0300 @@ -1,7 +1,9 @@ # This file was created automatically by SWIG. # Don't modify this file, modify the SWIG interface instead. # This file is compatible with both classic and new-style classes. + import _apt + def _swig_setattr(self,class_type,name,value): if (name == "this"): if isinstance(value, class_type): @@ -25,22 +27,25 @@ except AttributeError: class _object : pass _newclass = 0 +del types -pkgInit = _apt.pkgInit +pkgInit = _apt.pkgInit APT_PKG_MAJOR = _apt.APT_PKG_MAJOR APT_PKG_MINOR = _apt.APT_PKG_MINOR APT_PKG_RELEASE = _apt.APT_PKG_RELEASE + pkgInitConfig = _apt.pkgInitConfig pkgInitSystem = _apt.pkgInitSystem - class pkgCache(_object): __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, pkgCache, name, value) __swig_getmethods__ = {} __getattr__ = lambda self, name: _swig_getattr(self, pkgCache, name) + def __repr__(self): + return "" % (self.this,) DepDepends = _apt.pkgCache_DepDepends DepPreDepends = _apt.pkgCache_DepPreDepends DepSuggests = _apt.pkgCache_DepSuggests @@ -83,171 +88,172 @@ FlagNotAutomatic = _apt.pkgCache_FlagNotAutomatic __swig_setmethods__["HeaderP"] = _apt.pkgCache_HeaderP_set __swig_getmethods__["HeaderP"] = _apt.pkgCache_HeaderP_get - if _newclass:HeaderP = property(_apt.pkgCache_HeaderP_get,_apt.pkgCache_HeaderP_set) + if _newclass:HeaderP = property(_apt.pkgCache_HeaderP_get, _apt.pkgCache_HeaderP_set) __swig_setmethods__["PkgP"] = _apt.pkgCache_PkgP_set __swig_getmethods__["PkgP"] = _apt.pkgCache_PkgP_get - if _newclass:PkgP = property(_apt.pkgCache_PkgP_get,_apt.pkgCache_PkgP_set) + if _newclass:PkgP = property(_apt.pkgCache_PkgP_get, _apt.pkgCache_PkgP_set) __swig_setmethods__["VerFileP"] = _apt.pkgCache_VerFileP_set __swig_getmethods__["VerFileP"] = _apt.pkgCache_VerFileP_get - if _newclass:VerFileP = property(_apt.pkgCache_VerFileP_get,_apt.pkgCache_VerFileP_set) + if _newclass:VerFileP = property(_apt.pkgCache_VerFileP_get, _apt.pkgCache_VerFileP_set) __swig_setmethods__["PkgFileP"] = _apt.pkgCache_PkgFileP_set __swig_getmethods__["PkgFileP"] = _apt.pkgCache_PkgFileP_get - if _newclass:PkgFileP = property(_apt.pkgCache_PkgFileP_get,_apt.pkgCache_PkgFileP_set) + if _newclass:PkgFileP = property(_apt.pkgCache_PkgFileP_get, _apt.pkgCache_PkgFileP_set) __swig_setmethods__["VerP"] = _apt.pkgCache_VerP_set __swig_getmethods__["VerP"] = _apt.pkgCache_VerP_get - if _newclass:VerP = property(_apt.pkgCache_VerP_get,_apt.pkgCache_VerP_set) + if _newclass:VerP = property(_apt.pkgCache_VerP_get, _apt.pkgCache_VerP_set) __swig_setmethods__["ProvideP"] = _apt.pkgCache_ProvideP_set __swig_getmethods__["ProvideP"] = _apt.pkgCache_ProvideP_get - if _newclass:ProvideP = property(_apt.pkgCache_ProvideP_get,_apt.pkgCache_ProvideP_set) + if _newclass:ProvideP = property(_apt.pkgCache_ProvideP_get, _apt.pkgCache_ProvideP_set) __swig_setmethods__["DepP"] = _apt.pkgCache_DepP_set __swig_getmethods__["DepP"] = _apt.pkgCache_DepP_get - if _newclass:DepP = property(_apt.pkgCache_DepP_get,_apt.pkgCache_DepP_set) + if _newclass:DepP = property(_apt.pkgCache_DepP_get, _apt.pkgCache_DepP_set) __swig_setmethods__["StringItemP"] = _apt.pkgCache_StringItemP_set __swig_getmethods__["StringItemP"] = _apt.pkgCache_StringItemP_get - if _newclass:StringItemP = property(_apt.pkgCache_StringItemP_get,_apt.pkgCache_StringItemP_set) + if _newclass:StringItemP = property(_apt.pkgCache_StringItemP_get, _apt.pkgCache_StringItemP_set) __swig_setmethods__["StrP"] = _apt.pkgCache_StrP_set __swig_getmethods__["StrP"] = _apt.pkgCache_StrP_get - if _newclass:StrP = property(_apt.pkgCache_StrP_get,_apt.pkgCache_StrP_set) - def ReMap(*args): return apply(_apt.pkgCache_ReMap,args) - def Sync(*args): return apply(_apt.pkgCache_Sync,args) - def GetMap(*args): return apply(_apt.pkgCache_GetMap,args) - def DataEnd(*args): return apply(_apt.pkgCache_DataEnd,args) - def Hash(*args): return apply(_apt.pkgCache_Hash,args) - def Priority(*args): return apply(_apt.pkgCache_Priority,args) - def FindPkg(*args): return apply(_apt.pkgCache_FindPkg,args) - def FindPackage(*args): return apply(_apt.pkgCache_FindPackage,args) - def Head(*args): return apply(_apt.pkgCache_Head,args) - def PkgIter(*args): return apply(_apt.pkgCache_PkgIter,args) - def FileIter(*args): return apply(_apt.pkgCache_FileIter,args) + if _newclass:StrP = property(_apt.pkgCache_StrP_get, _apt.pkgCache_StrP_set) + def ReMap(*args): return _apt.pkgCache_ReMap(*args) + def Sync(*args): return _apt.pkgCache_Sync(*args) + def GetMap(*args): return _apt.pkgCache_GetMap(*args) + def DataEnd(*args): return _apt.pkgCache_DataEnd(*args) + def Hash(*args): return _apt.pkgCache_Hash(*args) + def Priority(*args): return _apt.pkgCache_Priority(*args) + def FindPkg(*args): return _apt.pkgCache_FindPkg(*args) + def FindPackage(*args): return _apt.pkgCache_FindPackage(*args) + def Head(*args): return _apt.pkgCache_Head(*args) + def PkgIter(*args): return _apt.pkgCache_PkgIter(*args) + def FileIter(*args): return _apt.pkgCache_FileIter(*args) __swig_setmethods__["VS"] = _apt.pkgCache_VS_set __swig_getmethods__["VS"] = _apt.pkgCache_VS_get - if _newclass:VS = property(_apt.pkgCache_VS_get,_apt.pkgCache_VS_set) + if _newclass:VS = property(_apt.pkgCache_VS_get, _apt.pkgCache_VS_set) __swig_getmethods__["CompTypeDeb"] = lambda x: _apt.pkgCache_CompTypeDeb if _newclass:CompTypeDeb = staticmethod(_apt.pkgCache_CompTypeDeb) __swig_getmethods__["CompType"] = lambda x: _apt.pkgCache_CompType if _newclass:CompType = staticmethod(_apt.pkgCache_CompType) __swig_getmethods__["DepType"] = lambda x: _apt.pkgCache_DepType if _newclass:DepType = staticmethod(_apt.pkgCache_DepType) - def __init__(self,*args): - self.this = apply(_apt.new_pkgCache,args) - self.thisown = 1 - def __del__(self, destroy= _apt.delete_pkgCache): + def __init__(self, *args): + _swig_setattr(self, pkgCache, 'this', _apt.new_pkgCache(*args)) + _swig_setattr(self, pkgCache, 'thisown', 1) + def __del__(self, destroy=_apt.delete_pkgCache): try: if self.thisown: destroy(self) except: pass - def __repr__(self): - return "" % (self.this,) class pkgCachePtr(pkgCache): - def __init__(self,this): - self.this = this - if not hasattr(self,"thisown"): self.thisown = 0 - self.__class__ = pkgCache + def __init__(self, this): + _swig_setattr(self, pkgCache, 'this', this) + if not hasattr(self,"thisown"): _swig_setattr(self, pkgCache, 'thisown', 0) + _swig_setattr(self, pkgCache,self.__class__,pkgCache) _apt.pkgCache_swigregister(pkgCachePtr) cvar = _apt.cvar + pkgCache_CompTypeDeb = _apt.pkgCache_CompTypeDeb pkgCache_CompType = _apt.pkgCache_CompType pkgCache_DepType = _apt.pkgCache_DepType - class pkgCacheHeader(_object): __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, pkgCacheHeader, name, value) __swig_getmethods__ = {} __getattr__ = lambda self, name: _swig_getattr(self, pkgCacheHeader, name) + def __repr__(self): + return "" % (self.this,) __swig_setmethods__["Signature"] = _apt.pkgCacheHeader_Signature_set __swig_getmethods__["Signature"] = _apt.pkgCacheHeader_Signature_get - if _newclass:Signature = property(_apt.pkgCacheHeader_Signature_get,_apt.pkgCacheHeader_Signature_set) + if _newclass:Signature = property(_apt.pkgCacheHeader_Signature_get, _apt.pkgCacheHeader_Signature_set) __swig_setmethods__["MajorVersion"] = _apt.pkgCacheHeader_MajorVersion_set __swig_getmethods__["MajorVersion"] = _apt.pkgCacheHeader_MajorVersion_get - if _newclass:MajorVersion = property(_apt.pkgCacheHeader_MajorVersion_get,_apt.pkgCacheHeader_MajorVersion_set) + if _newclass:MajorVersion = property(_apt.pkgCacheHeader_MajorVersion_get, _apt.pkgCacheHeader_MajorVersion_set) __swig_setmethods__["MinorVersion"] = _apt.pkgCacheHeader_MinorVersion_set __swig_getmethods__["MinorVersion"] = _apt.pkgCacheHeader_MinorVersion_get - if _newclass:MinorVersion = property(_apt.pkgCacheHeader_MinorVersion_get,_apt.pkgCacheHeader_MinorVersion_set) + if _newclass:MinorVersion = property(_apt.pkgCacheHeader_MinorVersion_get, _apt.pkgCacheHeader_MinorVersion_set) __swig_setmethods__["Dirty"] = _apt.pkgCacheHeader_Dirty_set __swig_getmethods__["Dirty"] = _apt.pkgCacheHeader_Dirty_get - if _newclass:Dirty = property(_apt.pkgCacheHeader_Dirty_get,_apt.pkgCacheHeader_Dirty_set) + if _newclass:Dirty = property(_apt.pkgCacheHeader_Dirty_get, _apt.pkgCacheHeader_Dirty_set) __swig_setmethods__["HasFileDeps"] = _apt.pkgCacheHeader_HasFileDeps_set __swig_getmethods__["HasFileDeps"] = _apt.pkgCacheHeader_HasFileDeps_get - if _newclass:HasFileDeps = property(_apt.pkgCacheHeader_HasFileDeps_get,_apt.pkgCacheHeader_HasFileDeps_set) + if _newclass:HasFileDeps = property(_apt.pkgCacheHeader_HasFileDeps_get, _apt.pkgCacheHeader_HasFileDeps_set) + __swig_setmethods__["OptionsHash"] = _apt.pkgCacheHeader_OptionsHash_set + __swig_getmethods__["OptionsHash"] = _apt.pkgCacheHeader_OptionsHash_get + if _newclass:OptionsHash = property(_apt.pkgCacheHeader_OptionsHash_get, _apt.pkgCacheHeader_OptionsHash_set) __swig_setmethods__["HeaderSz"] = _apt.pkgCacheHeader_HeaderSz_set __swig_getmethods__["HeaderSz"] = _apt.pkgCacheHeader_HeaderSz_get - if _newclass:HeaderSz = property(_apt.pkgCacheHeader_HeaderSz_get,_apt.pkgCacheHeader_HeaderSz_set) + if _newclass:HeaderSz = property(_apt.pkgCacheHeader_HeaderSz_get, _apt.pkgCacheHeader_HeaderSz_set) __swig_setmethods__["PackageSz"] = _apt.pkgCacheHeader_PackageSz_set __swig_getmethods__["PackageSz"] = _apt.pkgCacheHeader_PackageSz_get - if _newclass:PackageSz = property(_apt.pkgCacheHeader_PackageSz_get,_apt.pkgCacheHeader_PackageSz_set) + if _newclass:PackageSz = property(_apt.pkgCacheHeader_PackageSz_get, _apt.pkgCacheHeader_PackageSz_set) __swig_setmethods__["PackageFileSz"] = _apt.pkgCacheHeader_PackageFileSz_set __swig_getmethods__["PackageFileSz"] = _apt.pkgCacheHeader_PackageFileSz_get - if _newclass:PackageFileSz = property(_apt.pkgCacheHeader_PackageFileSz_get,_apt.pkgCacheHeader_PackageFileSz_set) + if _newclass:PackageFileSz = property(_apt.pkgCacheHeader_PackageFileSz_get, _apt.pkgCacheHeader_PackageFileSz_set) __swig_setmethods__["VersionSz"] = _apt.pkgCacheHeader_VersionSz_set __swig_getmethods__["VersionSz"] = _apt.pkgCacheHeader_VersionSz_get - if _newclass:VersionSz = property(_apt.pkgCacheHeader_VersionSz_get,_apt.pkgCacheHeader_VersionSz_set) + if _newclass:VersionSz = property(_apt.pkgCacheHeader_VersionSz_get, _apt.pkgCacheHeader_VersionSz_set) __swig_setmethods__["DependencySz"] = _apt.pkgCacheHeader_DependencySz_set __swig_getmethods__["DependencySz"] = _apt.pkgCacheHeader_DependencySz_get - if _newclass:DependencySz = property(_apt.pkgCacheHeader_DependencySz_get,_apt.pkgCacheHeader_DependencySz_set) + if _newclass:DependencySz = property(_apt.pkgCacheHeader_DependencySz_get, _apt.pkgCacheHeader_DependencySz_set) __swig_setmethods__["ProvidesSz"] = _apt.pkgCacheHeader_ProvidesSz_set __swig_getmethods__["ProvidesSz"] = _apt.pkgCacheHeader_ProvidesSz_get - if _newclass:ProvidesSz = property(_apt.pkgCacheHeader_ProvidesSz_get,_apt.pkgCacheHeader_ProvidesSz_set) + if _newclass:ProvidesSz = property(_apt.pkgCacheHeader_ProvidesSz_get, _apt.pkgCacheHeader_ProvidesSz_set) __swig_setmethods__["VerFileSz"] = _apt.pkgCacheHeader_VerFileSz_set __swig_getmethods__["VerFileSz"] = _apt.pkgCacheHeader_VerFileSz_get [...15018 lines suppressed...] { (char *)"pkgCacheVerFileIterator_swigregister", pkgCacheVerFileIterator_swigregister, METH_VARARGS }, @@ -18577,11 +20061,13 @@ { (char *)"pkgSystem_Initialize", _wrap_pkgSystem_Initialize, METH_VARARGS }, { (char *)"pkgSystem_ArchiveSupported", _wrap_pkgSystem_ArchiveSupported, METH_VARARGS }, { (char *)"pkgSystem_AddStatusFiles", _wrap_pkgSystem_AddStatusFiles, METH_VARARGS }, + { (char *)"pkgSystem_AddSourceFiles", _wrap_pkgSystem_AddSourceFiles, METH_VARARGS }, { (char *)"pkgSystem_FindIndex", _wrap_pkgSystem_FindIndex, METH_VARARGS }, { (char *)"pkgSystem_Score", _wrap_pkgSystem_Score, METH_VARARGS }, { (char *)"pkgSystem_PreProcess", _wrap_pkgSystem_PreProcess, METH_VARARGS }, { (char *)"pkgSystem_ProcessCache", _wrap_pkgSystem_ProcessCache, METH_VARARGS }, { (char *)"pkgSystem_IgnoreDep", _wrap_pkgSystem_IgnoreDep, METH_VARARGS }, + { (char *)"pkgSystem_OptionsHash", _wrap_pkgSystem_OptionsHash, METH_VARARGS }, { (char *)"delete_pkgSystem", _wrap_delete_pkgSystem, METH_VARARGS }, { (char *)"pkgSystem_swigregister", pkgSystem_swigregister, METH_VARARGS }, { (char *)"Configuration_Find", _wrap_Configuration_Find, METH_VARARGS }, @@ -18653,6 +20139,7 @@ { (char *)"pkgRecordsParser_LongDesc", _wrap_pkgRecordsParser_LongDesc, METH_VARARGS }, { (char *)"pkgRecordsParser_Name", _wrap_pkgRecordsParser_Name, METH_VARARGS }, { (char *)"pkgRecordsParser_GetRec", _wrap_pkgRecordsParser_GetRec, METH_VARARGS }, + { (char *)"pkgRecordsParser_HasFile", _wrap_pkgRecordsParser_HasFile, METH_VARARGS }, { (char *)"delete_pkgRecordsParser", _wrap_delete_pkgRecordsParser, METH_VARARGS }, { (char *)"pkgRecordsParser_swigregister", pkgRecordsParser_swigregister, METH_VARARGS }, { (char *)"pkgAcquireItem_DestFile_get", _wrap_pkgAcquireItem_DestFile_get, METH_VARARGS }, @@ -18779,6 +20266,39 @@ { (char *)"delete_GlobalError", _wrap_delete_GlobalError, METH_VARARGS }, { (char *)"GlobalError_swigregister", GlobalError_swigregister, METH_VARARGS }, { (char *)"_GetErrorObj", _wrap__GetErrorObj, METH_VARARGS }, + { (char *)"LuaCacheControl_Open", _wrap_LuaCacheControl_Open, METH_VARARGS }, + { (char *)"LuaCacheControl_Close", _wrap_LuaCacheControl_Close, METH_VARARGS }, + { (char *)"delete_LuaCacheControl", _wrap_delete_LuaCacheControl, METH_VARARGS }, + { (char *)"LuaCacheControl_swigregister", LuaCacheControl_swigregister, METH_VARARGS }, + { (char *)"Lua_RunInteractive", _wrap_Lua_RunInteractive, METH_VARARGS }, + { (char *)"Lua_RunScript", _wrap_Lua_RunScript, METH_VARARGS }, + { (char *)"Lua_RunScripts", _wrap_Lua_RunScripts, METH_VARARGS }, + { (char *)"Lua_HasScripts", _wrap_Lua_HasScripts, METH_VARARGS }, + { (char *)"Lua_ResetScript", _wrap_Lua_ResetScript, METH_VARARGS }, + { (char *)"Lua_SetGlobal", _wrap_Lua_SetGlobal, METH_VARARGS }, + { (char *)"Lua_ResetGlobals", _wrap_Lua_ResetGlobals, METH_VARARGS }, + { (char *)"Lua_GetGlobalStr", _wrap_Lua_GetGlobalStr, METH_VARARGS }, + { (char *)"Lua_GetGlobalStrList", _wrap_Lua_GetGlobalStrList, METH_VARARGS }, + { (char *)"Lua_GetGlobalNum", _wrap_Lua_GetGlobalNum, METH_VARARGS }, + { (char *)"Lua_GetGlobalBool", _wrap_Lua_GetGlobalBool, METH_VARARGS }, + { (char *)"Lua_GetGlobalPtr", _wrap_Lua_GetGlobalPtr, METH_VARARGS }, + { (char *)"Lua_GetGlobalPkg", _wrap_Lua_GetGlobalPkg, METH_VARARGS }, + { (char *)"Lua_GetGlobalPkgList", _wrap_Lua_GetGlobalPkgList, METH_VARARGS }, + { (char *)"Lua_SetDepCache", _wrap_Lua_SetDepCache, METH_VARARGS }, + { (char *)"Lua_SetCache", _wrap_Lua_SetCache, METH_VARARGS }, + { (char *)"Lua_SetCacheControl", _wrap_Lua_SetCacheControl, METH_VARARGS }, + { (char *)"Lua_SetProblemResolver", _wrap_Lua_SetProblemResolver, METH_VARARGS }, + { (char *)"Lua_SetDontFix", _wrap_Lua_SetDontFix, METH_VARARGS }, + { (char *)"Lua_ResetCaches", _wrap_Lua_ResetCaches, METH_VARARGS }, + { (char *)"Lua_GetDepCache", _wrap_Lua_GetDepCache, METH_VARARGS }, + { (char *)"Lua_GetCache", _wrap_Lua_GetCache, METH_VARARGS }, + { (char *)"Lua_GetCacheControl", _wrap_Lua_GetCacheControl, METH_VARARGS }, + { (char *)"Lua_GetProblemResolver", _wrap_Lua_GetProblemResolver, METH_VARARGS }, + { (char *)"Lua_GetDontFix", _wrap_Lua_GetDontFix, METH_VARARGS }, + { (char *)"new_Lua", _wrap_new_Lua, METH_VARARGS }, + { (char *)"delete_Lua", _wrap_delete_Lua, METH_VARARGS }, + { (char *)"Lua_swigregister", Lua_swigregister, METH_VARARGS }, + { (char *)"_GetLuaObj", _wrap__GetLuaObj, METH_VARARGS }, { (char *)"new_pkgAcquireStatusDumb", _wrap_new_pkgAcquireStatusDumb, METH_VARARGS }, { (char *)"delete_pkgAcquireStatusDumb", _wrap_delete_pkgAcquireStatusDumb, METH_VARARGS }, { (char *)"pkgAcquireStatusDumb_swigregister", pkgAcquireStatusDumb_swigregister, METH_VARARGS }, @@ -18828,20 +20348,21 @@ static swig_type_info _swigt__p_PkgFileIterator[] = {{"_p_PkgFileIterator", 0, "PkgFileIterator *", 0},{"_p_PkgFileIterator"},{"_p_pkgCache__PkgFileIterator"},{0}}; static swig_type_info _swigt__p_pkgCache__PrvIterator[] = {{"_p_pkgCache__PrvIterator", 0, "pkgCache::PrvIterator *", 0},{"_p_pkgCache__PrvIterator"},{"_p_PrvIterator"},{0}}; static swig_type_info _swigt__p_pkgCache__DepIterator[] = {{"_p_pkgCache__DepIterator", 0, "pkgCache::DepIterator *", 0},{"_p_pkgCache__DepIterator"},{"_p_DepIterator"},{0}}; -static swig_type_info _swigt__p_VerFileIterator[] = {{"_p_VerFileIterator", 0, "VerFileIterator const &", 0},{"_p_VerFileIterator"},{"_p_pkgCache__VerFileIterator"},{0}}; +static swig_type_info _swigt__p_VerFileIterator[] = {{"_p_VerFileIterator", 0, "VerFileIterator const *", 0},{"_p_VerFileIterator"},{"_p_pkgCache__VerFileIterator"},{0}}; static swig_type_info _swigt__p_pkgCache__VerIterator[] = {{"_p_pkgCache__VerIterator", 0, "pkgCache::VerIterator *", 0},{"_p_pkgCache__VerIterator"},{"_p_VerIterator"},{0}}; -static swig_type_info _swigt__p_PrvIterator[] = {{"_p_PrvIterator", 0, "PrvIterator const &", 0},{"_p_PrvIterator"},{"_p_pkgCache__PrvIterator"},{0}}; +static swig_type_info _swigt__p_PrvIterator[] = {{"_p_PrvIterator", 0, "PrvIterator const *", 0},{"_p_PrvIterator"},{"_p_pkgCache__PrvIterator"},{0}}; static swig_type_info _swigt__p_pkgCache__PkgIterator[] = {{"_p_pkgCache__PkgIterator", 0, "pkgCache::PkgIterator *", 0},{"_p_pkgCache__PkgIterator"},{"_p_PkgIterator"},{0}}; static swig_type_info _swigt__p_pkgCache__PkgFileIterator[] = {{"_p_pkgCache__PkgFileIterator", 0, "pkgCache::PkgFileIterator *", 0},{"_p_pkgCache__PkgFileIterator"},{"_p_PkgFileIterator"},{0}}; static swig_type_info _swigt__p_VerIterator[] = {{"_p_VerIterator", 0, "VerIterator *", 0},{"_p_VerIterator"},{"_p_pkgCache__VerIterator"},{0}}; -static swig_type_info _swigt__p_PkgIterator[] = {{"_p_PkgIterator", 0, "PkgIterator const &", 0},{"_p_PkgIterator"},{"_p_pkgCache__PkgIterator"},{0}}; +static swig_type_info _swigt__p_PkgIterator[] = {{"_p_PkgIterator", 0, "PkgIterator const *", 0},{"_p_PkgIterator"},{"_p_pkgCache__PkgIterator"},{0}}; static swig_type_info _swigt__p_DepIterator[] = {{"_p_DepIterator", 0, "DepIterator *", 0},{"_p_DepIterator"},{"_p_pkgCache__DepIterator"},{0}}; static swig_type_info _swigt__p_pkgSourceList__const_iterator[] = {{"_p_pkgSourceList__const_iterator", 0, "pkgSourceList::const_iterator *", 0},{"_p_pkgSourceList__const_iterator"},{0}}; static swig_type_info _swigt__p_Configuration__Item[] = {{"_p_Configuration__Item", 0, "Configuration::Item *", 0},{"_p_Configuration__Item"},{"_p_Item"},{0}}; static swig_type_info _swigt__p_pkgCache__Header[] = {{"_p_pkgCache__Header", 0, "pkgCache::Header *", 0},{"_p_pkgCache__Header"},{"_p_Header"},{0}}; -static swig_type_info _swigt__p_Header[] = {{"_p_Header", 0, "Header &", 0},{"_p_Header"},{"_p_pkgCache__Header"},{0}}; +static swig_type_info _swigt__p_Header[] = {{"_p_Header", 0, "Header *", 0},{"_p_Header"},{"_p_pkgCache__Header"},{0}}; static swig_type_info _swigt__p_pkgPolicy[] = {{"_p_pkgPolicy", 0, "pkgPolicy *", 0},{"_p_pkgPolicy"},{0}}; -static swig_type_info _swigt__p_Policy[] = {{"_p_Policy", 0, "Policy &", 0},{"_p_Policy"},{0}}; +static swig_type_info _swigt__p_Policy[] = {{"_p_Policy", 0, "Policy *", 0},{"_p_Policy"},{0}}; +static swig_type_info _swigt__p_Lua[] = {{"_p_Lua", 0, "Lua *", 0},{"_p_Lua"},{0}}; static swig_type_info _swigt__p_Configuration[] = {{"_p_Configuration", 0, "Configuration *", 0},{"_p_Configuration"},{0}}; static swig_type_info _swigt__p_pkgAcqIndexRel[] = {{"_p_pkgAcqIndexRel", 0, "pkgAcqIndexRel *", 0},{"_p_pkgAcqIndexRel"},{0}}; static swig_type_info _swigt__p_pkgAcquire[] = {{"_p_pkgAcquire", 0, "pkgAcquire *", 0},{"_p_pkgAcquire"},{0}}; @@ -18850,13 +20371,16 @@ static swig_type_info _swigt__p_pkgCache__Dependency[] = {{"_p_pkgCache__Dependency", 0, "pkgCache::Dependency *", 0},{"_p_pkgCache__Dependency"},{"_p_Dependency"},{0}}; static swig_type_info _swigt__p_GlobalError[] = {{"_p_GlobalError", 0, "GlobalError *", 0},{"_p_GlobalError"},{0}}; static swig_type_info _swigt__p_pkgAcqIndex[] = {{"_p_pkgAcqIndex", 0, "pkgAcqIndex *", 0},{"_p_pkgAcqIndex"},{0}}; -static swig_type_info _swigt__p_StateCache[] = {{"_p_StateCache", 0, "StateCache &", 0},{"_p_StateCache"},{"_p_pkgDepCache__StateCache"},{0}}; +static swig_type_info _swigt__p_LuaCacheControl[] = {{"_p_LuaCacheControl", 0, "LuaCacheControl *", 0},{"_p_LuaCacheControl"},{0}}; +static swig_type_info _swigt__p_std__vectorTpkgCache__Package_p_t[] = {{"_p_std__vectorTpkgCache__Package_p_t", 0, "std::vector *", 0},{"_p_std__vectorTpkgCache__Package_p_t"},{0}}; +static swig_type_info _swigt__p_StateCache[] = {{"_p_StateCache", 0, "StateCache *", 0},{"_p_StateCache"},{"_p_pkgDepCache__StateCache"},{0}}; static swig_type_info _swigt__p_pkgDepCache__StateCache[] = {{"_p_pkgDepCache__StateCache", 0, "pkgDepCache::StateCache *", 0},{"_p_pkgDepCache__StateCache"},{"_p_StateCache"},{0}}; static swig_type_info _swigt__p_Item[] = {{"_p_Item", 0, "Item const *", 0},{"_p_Configuration__Item"},{"_p_Item"},{0}}; static swig_type_info _swigt__p_void[] = {{"_p_void", 0, "void *", 0},{"_p_void"},{0}}; static swig_type_info _swigt__p_pkgAcquire__Item[] = {{"_p_pkgAcquire__Item", 0, "pkgAcquire::Item *", 0},{"_p_pkgAcqArchive", _p_pkgAcqArchiveTo_p_pkgAcquire__Item},{"_p_pkgAcqFile", _p_pkgAcqFileTo_p_pkgAcquire__Item},{"_p_pkgAcqIndex", _p_pkgAcqIndexTo_p_pkgAcquire__Item},{"_p_pkgAcqIndexRel", _p_pkgAcqIndexRelTo_p_pkgAcquire__Item},{"_p_pkgAcquire__Item"},{0}}; static swig_type_info _swigt__p_MMap[] = {{"_p_MMap", 0, "MMap *", 0},{"_p_MMap"},{0}}; -static swig_type_info _swigt__p_PyObject[] = {{"_p_PyObject", 0, "PyObject *", 0},{"_p_PyObject"},{0}}; +static swig_type_info _swigt__p_std__vectorTchar_const_p_t[] = {{"_p_std__vectorTchar_const_p_t", 0, "std::vector *", 0},{"_p_std__vectorTchar_const_p_t"},{0}}; +static swig_type_info _swigt__p_lua_State[] = {{"_p_lua_State", 0, "lua_State *", 0},{"_p_lua_State"},{0}}; static swig_type_info _swigt__p_pkgRecords__Parser[] = {{"_p_pkgRecords__Parser", 0, "pkgRecords::Parser *", 0},{"_p_pkgRecords__Parser"},{0}}; static swig_type_info _swigt__p_p_pkgCache__Version[] = {{"_p_p_pkgCache__Version", 0, "pkgCache::Version **", 0},{"_p_p_pkgCache__Version"},{"_p_p_Version"},{0}}; static swig_type_info _swigt__p_p_Version[] = {{"_p_p_Version", 0, "Version **", 0},{"_p_p_Version"},{"_p_p_pkgCache__Version"},{0}}; @@ -18867,11 +20391,13 @@ static swig_type_info _swigt__p_p_pkgIndexFile[] = {{"_p_p_pkgIndexFile", 0, "pkgIndexFile **", 0},{"_p_p_pkgIndexFile"},{0}}; static swig_type_info _swigt__p_pkgProblemResolver[] = {{"_p_pkgProblemResolver", 0, "pkgProblemResolver *", 0},{"_p_pkgProblemResolver"},{0}}; static swig_type_info _swigt__p_pkgAcqArchive[] = {{"_p_pkgAcqArchive", 0, "pkgAcqArchive *", 0},{"_p_pkgAcqArchive"},{0}}; +static swig_type_info _swigt__p_std__vectorTstd__string_t[] = {{"_p_std__vectorTstd__string_t", 0, "std::vector *", 0},{"_p_std__vectorTstd__string_t"},{0}}; static swig_type_info _swigt__p_p_char[] = {{"_p_p_char", 0, "char **", 0},{"_p_p_char"},{0}}; static swig_type_info _swigt__p_pkgAcquireStatusDumb[] = {{"_p_pkgAcquireStatusDumb", 0, "pkgAcquireStatusDumb *", 0},{"_p_pkgAcquireStatusDumb"},{0}}; static swig_type_info _swigt__p_pkgCacheFile[] = {{"_p_pkgCacheFile", 0, "pkgCacheFile *", 0},{"_p_pkgCacheFile"},{0}}; static swig_type_info _swigt__p_pkgAcquire__ItemDesc[] = {{"_p_pkgAcquire__ItemDesc", 0, "pkgAcquire::ItemDesc *", 0},{"_p_pkgAcquire__ItemDesc"},{0}}; static swig_type_info _swigt__p_pkgAcquireStatus[] = {{"_p_pkgAcquireStatus", 0, "pkgAcquireStatus *", 0},{"_p_pkgAcquireStatus"},{"_p_pkgAcquireStatusDumb", _p_pkgAcquireStatusDumbTo_p_pkgAcquireStatus},{0}}; +static swig_type_info _swigt__lua_CFunction[] = {{"_lua_CFunction", 0, "lua_CFunction", 0},{"_lua_CFunction"},{0}}; static swig_type_info _swigt__p_pkgDepCache[] = {{"_p_pkgDepCache", 0, "pkgDepCache *", 0},{"_p_pkgDepCache"},{0}}; static swig_type_info _swigt__p_DynamicMMap__Pool[] = {{"_p_DynamicMMap__Pool", 0, "DynamicMMap::Pool *", 0},{"_p_DynamicMMap__Pool"},{0}}; static swig_type_info _swigt__p_pkgPackageManager[] = {{"_p_pkgPackageManager", 0, "pkgPackageManager *", 0},{"_p_pkgPackageManager"},{0}}; @@ -18884,7 +20410,7 @@ static swig_type_info _swigt__p_std__ostream[] = {{"_p_std__ostream", 0, "std::ostream *", 0},{"_p_std__ostream"},{0}}; static swig_type_info _swigt__p_pkgAcqFile[] = {{"_p_pkgAcqFile", 0, "pkgAcqFile *", 0},{"_p_pkgAcqFile"},{0}}; static swig_type_info _swigt__p_pkgSourceList[] = {{"_p_pkgSourceList", 0, "pkgSourceList *", 0},{"_p_pkgSourceList"},{0}}; -static swig_type_info _swigt__p_string[] = {{"_p_string", 0, "string &", 0},{"_p_string"},{0}}; +static swig_type_info _swigt__p_string[] = {{"_p_string", 0, "string *", 0},{"_p_string"},{0}}; static swig_type_info _swigt__p_p_pkgVersioningSystem[] = {{"_p_p_pkgVersioningSystem", 0, "pkgVersioningSystem **", 0},{"_p_p_pkgVersioningSystem"},{0}}; static swig_type_info _swigt__p_pkgSystem[] = {{"_p_pkgSystem", 0, "pkgSystem *", 0},{"_p_pkgSystem"},{0}}; static swig_type_info _swigt__p_p_pkgSystem[] = {{"_p_p_pkgSystem", 0, "pkgSystem **", 0},{"_p_p_pkgSystem"},{0}}; @@ -18892,8 +20418,8 @@ static swig_type_info _swigt__p_VerFile[] = {{"_p_VerFile", 0, "VerFile *", 0},{"_p_VerFile"},{"_p_pkgCache__VerFile"},{0}}; static swig_type_info _swigt__p_pkgCache__VerFile[] = {{"_p_pkgCache__VerFile", 0, "pkgCache::VerFile *", 0},{"_p_pkgCache__VerFile"},{"_p_VerFile"},{0}}; static swig_type_info _swigt__p_pkgAcquire__MethodConfig[] = {{"_p_pkgAcquire__MethodConfig", 0, "pkgAcquire::MethodConfig *", 0},{"_p_pkgAcquire__MethodConfig"},{0}}; -static swig_type_info _swigt__p_pkgCache__Package[] = {{"_p_pkgCache__Package", 0, "pkgCache::Package *", 0},{"_p_pkgCache__Package"},{"_p_Package"},{0}}; static swig_type_info _swigt__p_Package[] = {{"_p_Package", 0, "Package *", 0},{"_p_Package"},{"_p_pkgCache__Package"},{0}}; +static swig_type_info _swigt__p_pkgCache__Package[] = {{"_p_pkgCache__Package", 0, "pkgCache::Package *", 0},{"_p_pkgCache__Package"},{"_p_Package"},{0}}; static swig_type_info _swigt__p_unsigned_char[] = {{"_p_unsigned_char", 0, "unsigned char *", 0},{"_p_unsigned_char"},{0}}; static swig_type_info _swigt__p_pkgRecords[] = {{"_p_pkgRecords", 0, "pkgRecords *", 0},{"_p_pkgRecords"},{0}}; static swig_type_info _swigt__p_pkgAcquire__Worker[] = {{"_p_pkgAcquire__Worker", 0, "pkgAcquire::Worker *", 0},{"_p_pkgAcquire__Worker"},{0}}; @@ -18922,6 +20448,7 @@ _swigt__p_Header, _swigt__p_pkgPolicy, _swigt__p_Policy, +_swigt__p_Lua, _swigt__p_Configuration, _swigt__p_pkgAcqIndexRel, _swigt__p_pkgAcquire, @@ -18930,13 +20457,16 @@ _swigt__p_pkgCache__Dependency, _swigt__p_GlobalError, _swigt__p_pkgAcqIndex, +_swigt__p_LuaCacheControl, +_swigt__p_std__vectorTpkgCache__Package_p_t, _swigt__p_StateCache, _swigt__p_pkgDepCache__StateCache, _swigt__p_Item, _swigt__p_void, _swigt__p_pkgAcquire__Item, _swigt__p_MMap, -_swigt__p_PyObject, +_swigt__p_std__vectorTchar_const_p_t, +_swigt__p_lua_State, _swigt__p_pkgRecords__Parser, _swigt__p_p_pkgCache__Version, _swigt__p_p_Version, @@ -18947,11 +20477,13 @@ _swigt__p_p_pkgIndexFile, _swigt__p_pkgProblemResolver, _swigt__p_pkgAcqArchive, +_swigt__p_std__vectorTstd__string_t, _swigt__p_p_char, _swigt__p_pkgAcquireStatusDumb, _swigt__p_pkgCacheFile, _swigt__p_pkgAcquire__ItemDesc, _swigt__p_pkgAcquireStatus, +_swigt__lua_CFunction, _swigt__p_pkgDepCache, _swigt__p_DynamicMMap__Pool, _swigt__p_pkgPackageManager, @@ -18972,8 +20504,8 @@ _swigt__p_VerFile, _swigt__p_pkgCache__VerFile, _swigt__p_pkgAcquire__MethodConfig, -_swigt__p_pkgCache__Package, _swigt__p_Package, +_swigt__p_pkgCache__Package, _swigt__p_unsigned_char, _swigt__p_pkgRecords, _swigt__p_pkgAcquire__Worker, @@ -19091,6 +20623,7 @@ PyDict_SetItemString(d,(char*)"cvar", SWIG_globals); SWIG_addvarlink(SWIG_globals,(char*)"_error",_wrap__error_get, _wrap__error_set); + SWIG_addvarlink(SWIG_globals,(char*)"_lua",_wrap__lua_get, _wrap__lua_set); SWIG_addvarlink(SWIG_globals,(char*)"pkgVersion",_wrap_pkgVersion_get, _wrap_pkgVersion_set); SWIG_addvarlink(SWIG_globals,(char*)"pkgLibVersion",_wrap_pkgLibVersion_get, _wrap_pkgLibVersion_set); SWIG_addvarlink(SWIG_globals,(char*)"pkgOS",_wrap_pkgOS_get, _wrap_pkgOS_set); apt-0.5.15cnc6-r362.patch: --- NEW FILE apt-0.5.15cnc6-r362.patch --- Index: lua/Makefile.in =================================================================== --- lua/Makefile.in (revision 316) +++ lua/Makefile.in (revision 362) @@ -1809,13 +1809,13 @@ distclean-generic: -rm -f $(CONFIG_CLEAN_FILES) -rm -f luac/$(DEPDIR)/$(am__dirstamp) + -rm -f luac/$(am__dirstamp) + -rm -f lua/$(am__dirstamp) + -rm -f lua/$(DEPDIR)/$(am__dirstamp) + -rm -f local/$(am__dirstamp) -rm -f local/$(DEPDIR)/$(am__dirstamp) - -rm -f local/$(am__dirstamp) -rm -f lib/$(am__dirstamp) -rm -f lib/$(DEPDIR)/$(am__dirstamp) - -rm -f luac/$(am__dirstamp) - -rm -f lua/$(am__dirstamp) - -rm -f lua/$(DEPDIR)/$(am__dirstamp) maintainer-clean-generic: @echo "This command is intended for maintainers to use" Index: contrib/log/log.lua =================================================================== --- contrib/log/log.lua (revision 0) +++ contrib/log/log.lua (revision 362) @@ -0,0 +1,80 @@ +-- This script will log the changes being introduced by +-- the transaction which is going to be run, and is based +-- on an idea of Panu Matilainen. It must be plugged +-- in the slots Scripts::PM::Pre/Post. +-- +-- Author: Gustavo Niemeyer + +if confget("APT::Log::Enable/b", "false") == "false" then + return +end + +confset("Dir::Log", "/var/log", true) +confset("Dir::Log::transaction", "apt.log", true) +filename = confget("Dir::Log::transaction/f", "/var/log/apt.log") + +if script_slot == "Scripts::PM::Pre" then + file = io.open(filename, "a+") + if not file then + print("error: can't open log file at "..filename) + return + end + local removing = {} + local installing = {} + local reinstalling = {} + local downgrading = {} + local upgrading = {} + for i, pkg in ipairs(pkglist()) do + if statkeep(pkg) then + -- Do nothing + elseif statreinstall(pkg) then + table.insert(reinstalling, + string.format("ReInstalling %s %s\n", + pkgname(pkg), + verstr(pkgvercur(pkg)))) + elseif statremove(pkg) then + table.insert(removing, + string.format("Removing %s %s\n", + pkgname(pkg), + verstr(pkgvercur(pkg)))) + elseif statnewinstall(pkg) then + table.insert(installing, + string.format("Installing %s %s\n", + pkgname(pkg), + verstr(pkgverinst(pkg)))) + elseif statdowngrade(pkg) then + table.insert(downgrading, + string.format("Downgrading %s %s to %s\n", + pkgname(pkg), + verstr(pkgvercur(pkg)), + verstr(pkgverinst(pkg)))) + elseif statupgrade(pkg) then + table.insert(upgrading, + string.format("Upgrading %s %s to %s\n", + pkgname(pkg), + verstr(pkgvercur(pkg)), + verstr(pkgverinst(pkg)))) + end + end + file:write("Transaction starting at ", os.date(), "\n") + local function write(index, str) + file:write(str) + end + table.foreach(removing, write) + table.foreach(installing, write) + table.foreach(reinstalling, write) + table.foreach(downgrading, write) + table.foreach(upgrading, write) + file:close() +elseif script_slot == "Scripts::PM::Post" then + if transaction_success then + word = "succeeded" + else + word = "failed" + end + file = io.open(filename, "a+") + file:write("Transaction ", word, " at ", os.date(), "\n") + file:close() +end + +-- vim:ts=4:sw=4:et Index: contrib/log/log.conf =================================================================== --- contrib/log/log.conf (revision 0) +++ contrib/log/log.conf (revision 362) @@ -0,0 +1,8 @@ + +APT::Log::Enable "true"; + +Dir::Log "/var/log"; +Dir::Log::transaction "apt.log"; + +Scripts::PM::Pre:: "log.lua"; +Scripts::PM::Post:: "log.lua"; Index: contrib/log/README =================================================================== --- contrib/log/README (revision 0) +++ contrib/log/README (revision 362) @@ -0,0 +1,11 @@ +This script will log the changes being introduced by +the transaction which is going to be run, and is based +on an idea of Panu Matilainen. + +This script must be plugged in the slots: + + Scripts::PM::Pre + Scripts::PM::Post + +Then, when some transaction is run, it will dump information +about it in /var/log/apt.log, or in the configured file. Index: contrib/apt-wrapper/apt.1.xml =================================================================== --- contrib/apt-wrapper/apt.1.xml (revision 316) +++ contrib/apt-wrapper/apt.1.xml (revision 362) @@ -3,20 +3,27 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + + rpm + 1 + " +> + %aptent; - ]> - Richard - Bos + Debian apt development team + + Conectiva apt-rpm development team + &apt-product; - 20 February 2004 + 24 June 2004 2004 Richard Bos @@ -64,7 +71,7 @@ Actions - A full list of actions that are supported by apt: + Actions supported by apt: add, autoclean, build-dep, @@ -76,9 +83,13 @@ dump, dumpavail, gencaches, + groupinstall, + groupnames, + groupremove, ident, install, list-extras, + list-nodeps, moo, pkgnames, policy, @@ -90,6 +101,7 @@ script, search, show, [...8045 lines suppressed...] msgid "Sub-process %s returned an error code (%u)" msgstr "Unterprozesss %s gab Fehlercode zur??ck (%u)" -#: apt-pkg/contrib/fileutl.cc:376 apt-pkg/rpm/rpmpm.cc:621 +#: apt-pkg/contrib/fileutl.cc:376 apt-pkg/rpm/rpmpm.cc:626 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Unter-Prozess %s stieg unerwartet aus" @@ -1671,7 +1672,7 @@ msgstr "k??nnte RPMFileHandler nicht zur??ckspulen" #: apt-pkg/rpm/rpmhandler.cc:160 apt-pkg/rpm/rpmhandler.cc:167 -#: apt-pkg/rpm/rpmpm.cc:680 apt-pkg/rpm/rpmpm.cc:685 +#: apt-pkg/rpm/rpmpm.cc:685 apt-pkg/rpm/rpmpm.cc:690 #, fuzzy, c-format msgid "Failed reading file %s" msgstr "Fehler beim Ausf??hren von Script %s" @@ -1743,7 +1744,7 @@ "RPM::Allow-Duplicated-Warning \"false\";\n" msgstr "" -#: apt-pkg/rpm/rpmlistparser.cc:685 +#: apt-pkg/rpm/rpmlistparser.cc:680 msgid "Bad NotAutomatic flag" msgstr "" @@ -1800,67 +1801,67 @@ msgid "Failure running script %s" msgstr "Fehler beim Ausf??hren von Script %s" -#: apt-pkg/rpm/rpmpm.cc:309 +#: apt-pkg/rpm/rpmpm.cc:312 msgid "Unknown pkgRPMPM operation." msgstr "" -#: apt-pkg/rpm/rpmpm.cc:544 +#: apt-pkg/rpm/rpmpm.cc:549 msgid "Executing RPM (" msgstr "F??hre RPM aus (" -#: apt-pkg/rpm/rpmpm.cc:584 +#: apt-pkg/rpm/rpmpm.cc:589 #, fuzzy msgid "Could not exec " msgstr "Konnte Lock %s nicht bekommen" -#: apt-pkg/rpm/rpmpm.cc:599 +#: apt-pkg/rpm/rpmpm.cc:604 #, fuzzy msgid "Couldn't wait for subprocess" msgstr "Konnte Pipe f??r %s nicht ??ffnen" -#: apt-pkg/rpm/rpmpm.cc:615 +#: apt-pkg/rpm/rpmpm.cc:620 #, c-format msgid "Sub-process %s recieved a segmentation fault." msgstr "Unterprozess %s empfing Segmentation-Fault." -#: apt-pkg/rpm/rpmpm.cc:625 apt-pkg/rpm/rpmpm.cc:873 +#: apt-pkg/rpm/rpmpm.cc:630 apt-pkg/rpm/rpmpm.cc:878 #, fuzzy msgid "Done." msgstr "Fertig" -#: apt-pkg/rpm/rpmpm.cc:676 +#: apt-pkg/rpm/rpmpm.cc:681 #, fuzzy, c-format msgid "Failed opening %s" msgstr "Problem beim ??ffnen von %s" -#: apt-pkg/rpm/rpmpm.cc:689 apt-pkg/rpm/rpmpm.cc:713 +#: apt-pkg/rpm/rpmpm.cc:694 apt-pkg/rpm/rpmpm.cc:718 #, c-format msgid "Failed adding %s to transaction %s" msgstr "" -#: apt-pkg/rpm/rpmpm.cc:765 apt-pkg/rpm/rpmpm.cc:775 +#: apt-pkg/rpm/rpmpm.cc:770 apt-pkg/rpm/rpmpm.cc:780 #, fuzzy msgid "Could not open RPM database" msgstr "k??nnte RPM-Datenbank nicht ??ffnen" -#: apt-pkg/rpm/rpmpm.cc:812 apt-pkg/rpm/rpmpm.cc:825 +#: apt-pkg/rpm/rpmpm.cc:817 apt-pkg/rpm/rpmpm.cc:830 msgid "Transaction set check failed" msgstr "" -#: apt-pkg/rpm/rpmpm.cc:845 +#: apt-pkg/rpm/rpmpm.cc:850 #, c-format msgid "Ordering failed for %d packages" msgstr "" -#: apt-pkg/rpm/rpmpm.cc:849 +#: apt-pkg/rpm/rpmpm.cc:854 msgid "Committing changes..." msgstr "" -#: apt-pkg/rpm/rpmpm.cc:865 +#: apt-pkg/rpm/rpmpm.cc:870 msgid "Error while running transaction" msgstr "" -#: apt-pkg/rpm/rpmpm.cc:871 +#: apt-pkg/rpm/rpmpm.cc:876 #, fuzzy msgid "Some errors occurred while running transaction" msgstr "Fehler w??hrend der Verarbeitung von %s (NewVersion1) aufgetreten" @@ -1875,12 +1876,16 @@ msgid "error parsing source list %s" msgstr "Fehler beim Parsen der Paketliste %s" -#: apt-pkg/rpm/rpmsystem.cc:410 apt-pkg/pkgcachegen.cc:714 +#: apt-pkg/rpm/rpmsystem.cc:411 apt-pkg/pkgcachegen.cc:714 #: apt-pkg/pkgcachegen.cc:741 apt-pkg/pkgcachegen.cc:783 #: apt-pkg/pkgcachegen.cc:788 apt-pkg/pkgcachegen.cc:992 msgid "Reading Package Lists" msgstr "Lese Paketlisten" +#: apt-pkg/rpm/rpmshowprogress.h:121 apt-pkg/rpm/rpmshowprogress.h:123 +msgid "Preparing..." +msgstr "" + #: apt-pkg/acquire.cc:61 #, c-format msgid "Lists directory %spartial is missing." @@ -2246,37 +2251,37 @@ msgid "Malformed line %lu in source list %s (Absolute dist)" msgstr "Misbildete Zeile %lu in Quellliste %s (Absolute dist)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:119 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Misbildete Zeile %lu in Quellliste %s (dist parse)" -#: apt-pkg/sourcelist.cc:206 apt-pkg/sourcelist.cc:230 +#: apt-pkg/sourcelist.cc:209 apt-pkg/sourcelist.cc:233 #, c-format msgid "Vendor block %s is invalid" msgstr "Vendor-Block %s ist ung??ltig" -#: apt-pkg/sourcelist.cc:314 +#: apt-pkg/sourcelist.cc:317 #, c-format msgid "Line %u too long in source list %s." msgstr "Zeile %u zu lang in Quellliste %s." -#: apt-pkg/sourcelist.cc:334 +#: apt-pkg/sourcelist.cc:337 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Misbildete Zeile %u in Quellliste %s (type)" -#: apt-pkg/sourcelist.cc:338 +#: apt-pkg/sourcelist.cc:341 #, c-format msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Unbekannter Typ '%s' in Zeile %u in Quellliste %s" -#: apt-pkg/sourcelist.cc:347 apt-pkg/sourcelist.cc:350 +#: apt-pkg/sourcelist.cc:350 apt-pkg/sourcelist.cc:353 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Misbildete Zeile %u in Quellliste %s (vendor id)" -#: apt-pkg/sourcelist.cc:364 +#: apt-pkg/sourcelist.cc:367 #, c-format msgid "Unknown vendor ID '%s' in line %u of source list %s" msgstr "Unbekannte Vendor-ID '%s' in Zeile %u der Quellliste %s" @@ -2295,7 +2300,7 @@ msgid "Unable to parse package file %s (2)" msgstr "Ausserstande Paketdatei %s (2) zu parsen" -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:202 msgid "" "Please use apt-cdrom to make this CD recognized by APT. apt-get update " "cannot be used to add new CDs" @@ -2303,16 +2308,16 @@ "Bitte verwenden Sie apt-cdrom um diese CD von APT erkennen zu lassen, apt-" "get update kann nicht dazu verwendet werden new CDs hinzuzuf??gen" -#: methods/cdrom.cc:177 methods/cdrom.cc:215 +#: methods/cdrom.cc:210 methods/cdrom.cc:248 msgid "Wrong CD" msgstr "Falsche CD" -#: methods/cdrom.cc:210 +#: methods/cdrom.cc:243 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" -#: methods/cdrom.cc:233 methods/file.cc:82 +#: methods/cdrom.cc:266 methods/file.cc:82 msgid "File not found" msgstr "Datei nicht gefunden" apt-0.5.15cnc6-scriptdir.patch: --- NEW FILE apt-0.5.15cnc6-scriptdir.patch --- --- apt-0.5.15cnc6/contrib/apt-groupinstall/apt-groupinstall.conf.scriptdir 2004-08-14 20:08:50.588071969 +0300 +++ apt-0.5.15cnc6/contrib/apt-groupinstall/apt-groupinstall.conf 2004-08-14 20:09:02.784455510 +0300 @@ -11,7 +11,7 @@ // For RH-based systems Scripts::Groupinstall::Backend "groupinstall-backend-comps.py"; // For Synaptic task-support -Synaptic::taskHelperProg "/usr/lib/apt/scripts/groupinstall-backend-comps.py"; +Synaptic::taskHelperProg "/usr/share/apt/scripts/groupinstall-backend-comps.py"; // For Suse systems //Scripts::Groupinstall::Backend "groupinstall-backend-suse"; --- apt-0.5.15cnc6/apt-pkg/luaiface.cc.scriptdir 2004-08-14 16:36:06.888236043 +0300 +++ apt-0.5.15cnc6/apt-pkg/luaiface.cc 2004-08-14 16:36:06.974217598 +0300 @@ -76,7 +76,7 @@ Lua::Lua() : DepCache(0), Cache(0), CacheControl(0), Fix(0), DontFix(0) { - _config->CndSet("Dir::Bin::scripts", "/usr/lib/apt/scripts"); + _config->CndSet("Dir::Bin::scripts", "/usr/share/apt/scripts"); const luaL_reg lualibs[] = { {"base", luaopen_base}, --- NEW FILE apt.cron --- #!/bin/sh [ ! -f /var/lock/subsys/apt ] && exit 0 [ -f /etc/sysconfig/apt ] && . /etc/sysconfig/apt [ $CHECK_ONLY == "yes" ] && OPTS="$OPTS --check-only" [ $PRESERVE_CONFIG == "yes" ] && OPTS="$OPTS -o rpm::preserve-config=true" OPTS="$OPTS $EXTRA_OPTIONS" /usr/bin/apt-get -q update && /usr/bin/apt-get -q -y $OPTS dist-upgrade --- NEW FILE apt.init --- #!/bin/bash # # apt This shell script enables the automatic updates by APT # # Author: Seth Vidal # Modified for APT by Panu Matilainen # # chkconfig: - 50 01 # # description: Enable daily run of apt, a program updater. # processname: apt-get # config: /etc/apt/ # # source function library . /etc/rc.d/init.d/functions lockfile=/var/lock/subsys/apt RETVAL=0 start() { echo -n $"Enabling nightly apt update: " touch "$lockfile" && success || failure RETVAL=$? echo } stop() { echo -n $"Disabling nightly apt update: " rm -f "$lockfile" && success || failure RETVAL=$? echo } restart() { stop start } case "$1" in start) start ;; stop) stop ;; restart|force-reload) restart ;; reload) ;; condrestart) [ -f "$lockfile" ] && restart ;; status) if [ -f $lockfile ]; then echo $"Nightly apt update is enabled." RETVAL=0 else echo $"Nightly apt update is disabled." RETVAL=3 fi ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart}" exit 1 esac exit $RETVAL --- NEW FILE apt.sysconfig --- # Actually perform updates or only check what's available [yes|no] CHECK_ONLY=no # Hold back packages with modified configuration files [yes|no] PRESERVE_CONFIG=no # Any extra parameters you want to pass to dist-upgrade EXTRA_OPTIONS= --- NEW FILE comps2prio.xsl --- Essential: Index: rpmpriorities.1 =================================================================== RCS file: rpmpriorities.1 diff -N rpmpriorities.1 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ rpmpriorities.1 17 Jan 2005 22:01:26 -0000 1.3 @@ -0,0 +1,36 @@ +Essential: + grub + termcap + ed + kbd + iproute + libtermcap + libgcc + setserial + file + rpm + sysklogd + losetup + kudzu + glibc + shadow-utils + coreutils + bash + iputils + vim-minimal + passwd + cpio + raidtools + SysVinit + authconfig + hdparm + hotplug + readline + util-linux + basesystem + setup + e2fsprogs + procps + initscripts + filesystem + fedora-release Index: rpmpriorities.2 =================================================================== RCS file: rpmpriorities.2 diff -N rpmpriorities.2 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ rpmpriorities.2 17 Jan 2005 22:01:26 -0000 1.3 @@ -0,0 +1,36 @@ +Essential: + grub + termcap + ed + kbd + iproute + libtermcap + libgcc + setserial + file + rpm + sysklogd + losetup + kudzu + glibc + shadow-utils + coreutils + bash + iputils + vim-minimal + passwd + cpio + raidtools + SysVinit + authconfig + hdparm + hotplug + readline + util-linux + basesystem + setup + e2fsprogs + procps + initscripts + filesystem + fedora-release --- NEW FILE rpmpriorities.3 --- Essential: grub termcap ed kbd iproute libtermcap libgcc setserial file rpm sysklogd losetup kudzu glibc shadow-utils coreutils bash iputils vim-minimal passwd cpio raidtools SysVinit authconfig hdparm hotplug readline util-linux basesystem setup e2fsprogs procps initscripts filesystem fedora-release udev --- NEW FILE rpmpriorities.Rawhide --- Essential: grub termcap ed kbd iproute libtermcap libgcc setserial file rpm sysklogd losetup kudzu glibc shadow-utils coreutils bash iputils vim-minimal passwd cpio raidtools SysVinit authconfig hdparm hotplug readline util-linux basesystem setup e2fsprogs procps initscripts filesystem fedora-release apt-0.5.15cnc6-pymake.patch: Index: apt-0.5.15cnc6-pymake.patch =================================================================== RCS file: /cvs/extras/rpms/apt/devel/apt-0.5.15cnc6-pymake.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- apt-0.5.15cnc6-pymake.patch 8 Nov 2004 04:04:37 -0000 1.1 +++ apt-0.5.15cnc6-pymake.patch 17 Jan 2005 22:01:26 -0000 1.2 @@ -14,7 +14,7 @@ _%.so: %_wrap.cxx - $(CC) -shared -I.. $(PYTHONFLAGS) $(LUAFLAGS) -L../bin -L../build/bin -lapt-pkg -o $@ $< -+ $(CC) -shared -I.. -I../include $(PYTHONFLAGS) $(LUAFLAGS) -L../apt-pkg/.libs -lapt-pkg -o $@ $< ++ $(CC) -shared -fPIC -I.. -I../include $(PYTHONFLAGS) $(LUAFLAGS) -L../apt-pkg/.libs -lapt-pkg -o $@ $< apt_wrap.cxx: apt.i - $(SWIG) $(SWIGFLAGS) -c++ -I.. $(LUAFLAGS) -python $< Index: apt.spec =================================================================== RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- apt.spec 10 Nov 2004 03:05:28 -0000 1.4 +++ apt.spec 17 Jan 2005 22:01:26 -0000 1.5 @@ -1,16 +1,23 @@ # needed for rpmpriorities and mirror-select.conf: %{!?fcrel:%define fcrel %(cut -d' ' -f4 /etc/fedora-release )} -# the python bindings only work with python >= 2.something -%define pythonver %(echo $(python2 -c "import sys; v=sys.version_info[:2]; print '%d.%d'%v" 2>/dev/null)) +%{!?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 + +# subversion revision for svn snapshots +%define svnver r362 # we need to work around various missing builddeps in rpm :-/ -%{!?rpmver:%define rpmver %(rpm --version | cut -d' ' -f3)} +%{!?rpmver:%define rpmver %(rpm --version | cut -d' ' -f3 | cut -d. -f1-2)} Summary: Debian's Advanced Packaging Tool with RPM support. Name: apt Version: 0.5.15cnc6 -Release: 11 +Release: 12.%{svnver} Epoch: 0 Group: System Environment/Base URL: https://moin.conectiva.com.br/AptRpm @@ -27,12 +34,21 @@ Source3: vendors.list Source4: apt_preferences -# rpmpriorities generated from comps.xml base group -Source5: rpmpriorities - -# Sources 50-99 are for Lua-scripts -Source50: gpg-checker.lua -Source51: gpg-import.lua +# rpmpriorities generated + manually tweaked from comps.xml core group +Source5: rpmpriorities.1 +Source6: rpmpriorities.2 +Source6: rpmpriorities.3 +Source18: rpmpriorities.Rawhide +Source19: comps2prio.xsl + +# nightly updater scripts & config +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 Source53: mirror-select.lua Source54: upgradevirt.lua @@ -61,35 +77,46 @@ Source250: fedora-vendor.list BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Provides: apt-mirrorselect + # Others 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 BuildRequires: beecrypt-devel BuildRequires: elfutils-devel -BuildRequires: python-devel >= 0:%{pythonver} +# TODO: verify the required minimum version +BuildRequires: python-devel >= 0:2.2 BuildRequires: rpm-devel, zlib-devel, bzip2-devel, libstdc++-devel, gettext BuildRequires: docbook-utils, perl, readline-devel, ncurses-devel # for version detection to work BuildRequires: fedora-release +%if %{generate_rpmpriorities} +BuildRequires: %{_bindir}/xsltproc, %{comps} +%endif -%if "%{rpmver}" >= "4.3.1" +%if "%{rpmver}" == "4.3" BuildRequires: libselinux-devel %endif # Fix some issues in python binding build Patch1: apt-0.5.15cnc6-pymake.patch -# Fix segfault in rpm-dir with dangling symlinks -Patch2: apt-0.5.5-rpmdir-symlink.patch +Patch5: apt-0.5.15cnc6-pymake2.patch +# Update to current svn snapshot: svn diff -r316:%{svnver} +Patch2: apt-0.5.15cnc6-%{svnver}.patch # Make rpm manifest usage configurable Patch3: apt-0.5.15cnc5-manifest-limit.patch -# Docbook build fist, send upstream +# Docbook build fixes, send upstream Patch4: apt-0.5.15cnc6-docbook.patch -# Make build-dep check for broken dependencies -Patch5: apt-0.5.15cnc6-build-dep-fixdeps.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-0.5.15cnc6-scriptdir.patch +# Update python bindings +Patch8: apt-0.5.15cnc6-python-update.patch %description A port of Debian's apt tools for RPM based distributions. @@ -110,19 +137,39 @@ Summary: Python bindings for libapt-pkg Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: %{_bindir}/python%{pythonver} +Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %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} = %{epoch}:%{version}-%{release} +Requires: rhpl, 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. + + %prep %setup -q %patch1 -p1 -b .pymake -%patch2 -p1 -b .rpmdir +%patch2 -p0 -b .svnsnap %patch3 -p1 -b .manifest %patch4 -p0 -b .docbook -%patch5 -p0 -b .build-dep-fix +%patch5 -p0 -b .pymake2 %patch6 -p1 -b .rdonly +%patch7 -p1 -b .scriptdir +%patch8 -p1 -b .pyupdate # fix docs to reference correct paths perl -pi -e \ @@ -130,17 +177,28 @@ s|/usr/share/doc/apt/|%{_docdir}/%{name}-%{version}/|' \ doc/apt.ent doc/fr/apt.ent.fr +install -pm 644 %{SOURCE19} comps2prio.xsl + %build -# disabling build dep tracking ought to make rpm-building a bit faster %configure --disable-dependency-tracking SGML_CATALOG_FILES=$(ls -1 %{_sysconfdir}/sgml/sgml-docbook-3.1* | head -n 1) \ -make %{?_smp_mflags} NOISY=1 +make %{?_smp_mflags} + +# prevent re-generation of the python wrapper, requires a patched swig :( +#touch python/apt.py python/apt_wrap.cxx +cp python/apt.py python/apt.py.pyupdate +cp python/apt_wrap.cxx python/apt_wrap.cxx.pyupdate +make -C python %{?_smp_mflags} PYTHON="%{__python}" +%{__python} -c "import py_compile; py_compile.compile('python/apt.py')" + +%if %{generate_rpmpriorities} +%{_bindir}/xsltproc -o rpmpriorities comps2prio.xsl %{comps} +%else +cp -p $RPM_SOURCE_DIR/rpmpriorities.%{fcrel} rpmpriorities +%endif -touch python/apt.py python/apt_wrap.cxx -make -C python %{?_smp_mflags} -python -c "import py_compile; py_compile.compile('python/apt.py')" %install rm -rf $RPM_BUILD_ROOT @@ -154,10 +212,8 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/gensrclist mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/state/apt/lists/partial - # The config files mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/scripts 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 @@ -165,7 +221,7 @@ 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 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/rpmpriorities +install -p -m 644 rpmpriorities $RPM_BUILD_ROOT/%{_sysconfdir}/apt/ # install config parts for cnf in %{SOURCE150} %{SOURCE151}; do @@ -183,15 +239,28 @@ done # Lua scripts -mkdir -p $RPM_BUILD_ROOT%{_libdir}/apt/scripts -for script in %{SOURCE50} %{SOURCE51} %{SOURCE52} %{SOURCE53} %{SOURCE54}; do - install -p -m 755 $script $RPM_BUILD_ROOT%{_libdir}/apt/scripts/ +mkdir -p $RPM_BUILD_ROOT%{scriptdir} +for script in %{SOURCE52} %{SOURCE53} %{SOURCE54}; do + install -p -m 755 $script $RPM_BUILD_ROOT%{scriptdir} done - # The python bindings -mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages/ -install -p -m 755 python/apt.py* python/_apt.so $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages/ +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}/ +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 + +# GPG checker from contrib +install -p -m 755 contrib/gpg-check/*.lua $RPM_BUILD_ROOT/%{scriptdir}/ + +# 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 755 contrib/apt-groupinstall/apt-groupinstall.conf $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf.d/ # nuke .la files rm -f $RPM_BUILD_ROOT%{_libdir}/*.la @@ -199,6 +268,7 @@ # don't require python, lua etc because of stuff in doc/contrib find contrib/ -type f |xargs chmod 0644 + %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 @@ -208,11 +278,19 @@ 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" > %{_sysconfdir}/apt/apt.conf fi +/sbin/chkconfig --add apt %postun -p /sbin/ldconfig @@ -222,13 +300,14 @@ %files -f %{name}.lang %defattr(-, root, root) -%doc AUTHORS* COPYING* ABOUT* TODO doc/examples/ contrib/ +%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 %config(noreplace) %{_sysconfdir}/apt/apt.conf @@ -237,8 +316,11 @@ # NOTE: no noreplace on these 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 +%config %{_sysconfdir}/cron.daily/apt.cron %{_bindir}/apt-cache %{_bindir}/apt-cdrom @@ -250,11 +332,13 @@ %{_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 - %files devel %defattr(-, root, root) %{_includedir}/apt-pkg/* @@ -263,9 +347,26 @@ %files python %defattr(-, root, root) -%{_libdir}/python%{pythonver}/site-packages/* +%{python_sitearch}/_apt.so +%{python_sitearch}/apt.py +%{python_sitearch}/apt.pyc +%ghost %{python_sitearch}/apt.pyo + +%files groupinstall +%defattr(-, root, root) +%{_sysconfdir}/apt/apt.conf.d/apt-groupinstall.conf +%{scriptdir}/apt-groupinstall.lua +%{scriptdir}/groupinstall-backend-comps.py + %changelog +* Mon Jan 17 2005 Ville Skytt?? - 0:0.5.15cnc6-12.r362 +- Clean up -python packaging, make everything honor %%{__python}. +- Build with dependency tracking disabled. +- "Revert" rpmpriorities and libselinux build-dep stuff to Panu's version. +- Add experimental auto-generation of rpmpriorities, but don't use it yet. +- Fix up mirror-select.conf creation. + * Wed Nov 10 2004 Michael Schwendt 0.5.15cnc6-11 - TODO: Somebody with access to www.fedora.us would need to update Source151 (mirror-select.conf) and update it for FC3. @@ -273,6 +374,78 @@ and fixed the inaccurate conditional BR libselinux-devel which could be made unconditional). +* Tue Nov 09 2004 Panu Matilainen 0.5.15cnc6-0.fdr.19.r362 +- add rpmpriorities for fc3 + +* Tue Sep 14 2004 Panu Matilainen +- don't check rpm's sublevel for selinux-devel requirement + +* Wed Aug 18 2004 Panu Matilainen 0.5.15cnc6-0.fdr.18.r362 +- revision r362 +- add rpmprioties file for rawhide + +* Sat Aug 14 2004 Panu Matilainen 0.5.15cnc6-0.fdr.18.r361 +- update to revision r361 +- automated updates from cron are now configurable through /etc/sysconfig/apt +- provide apt-mirrorselect so repo-configs can depend on it +- preliminary fixes for x86_64: + - put scripts to /usr/share/apt/scripts instead of /usr/lib + - build python bindings with -fPIC + +* Thu Aug 12 2004 Panu Matilainen 0.5.15cnc6-0.fdr.17.r360 +- update to revision r360 +- revert back to print() in upgradevirt kernel-module-warning (see #1524/c18) + +* Wed Aug 11 2004 Panu Matilainen 0.5.15cnc6-0.fdr.17.r358 +- update to revision r358 + +* Tue Jul 13 2004 Panu Matilainen 0.5.15cnc6-0.fdr.17.r355 +- update to revision r355 for native SELinux support + +* Fri Jul 9 2004 Panu Matilainen 0.5.15cnc6-0.fdr.16.r354 +- fix a typo in apt.cron + +* Fri Jul 9 2004 Panu Matilainen 0.5.15cnc6-0.fdr.15.r354 +- don't run kernel-module magic if no kernel was installed in (dist-)upgrade +- improve description a bit +- update to svn r354 (improved virtual package handling in apt-cache) + +* Mon Jul 5 2004 Panu Matilainen 0.5.15cnc6-0.fdr.14.r353 +- add optional script to automatically update from cron +- use updated gpg checker (with progress reporting) from contrib +- add new subpackage for groupinstall (to avoid dependening on comps and rhpl + for core apt) +- update to revision 353 from upstream for various bugfixes and enhancements, + drop merged patches +- remove NOISY=1 from make, hasn't done anything in ages.. + +* Thu Jun 17 2004 Panu Matilainen 0.5.15cnc6-0.fdr.13 +- fix grubby handling wrt non-UP kernels +- never change default kernel if the current default is non-linux system +- include upstream patch to allow setting custom md5cache path for genbasedir + +* Tue Jun 15 2004 Panu Matilainen 0.5.15cnc6-0.fdr.12 +- don't fiddle with grubby unless a new kernel was actually installed +- include kernel-sourcecode in allow-duplicated +- include rpmpriorities for fc2 final + +* Fri May 14 2004 Panu Matilainen +- use rpm's ordering algorithm, not apt's internal + +* Mon May 10 2004 Panu Matilainen +- remove ash from rpmpriorities (#1562) +- updated version of upgradevirt.lua (#1514) + +* Tue May 04 2004 Panu Matilainen +- set APT::Cache::AllNames to false to make "apt-cache pkgnames" less scary + +* Thu Apr 29 2004 Panu Matilainen +- check for rpm 4.3.1 + +* Fri Apr 09 2004 Panu Matilainen +- remove kernel from rpmpriorities, allow-duplicated packages don't work + nicely with any higher than standard priority which is the default anyway + * Fri Apr 09 2004 Panu Matilainen 0.5.15cnc6-0.fdr.11 - revert the ctrl-c workaroound, the "cure" is worse than the disease Index: default.conf =================================================================== RCS file: /cvs/extras/rpms/apt/devel/default.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- default.conf 8 Nov 2004 04:04:37 -0000 1.1 +++ default.conf 17 Jan 2005 22:01:26 -0000 1.2 @@ -13,15 +13,20 @@ Show-Upgraded "true"; Show-Versions "true"; }; - + Cache + { + AllNames "false"; + } }; RPM { + // Use rpm's ordering, not apt's (which is incorrect for FHL/FC upgrades) + Order "true"; // 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|source))?(-(unsupported-modules))?$"; "^gpg-pubkey$"; }; + Allow-Duplicated { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|source|sourcecode))?(-(unsupported-modules))?$"; "^gpg-pubkey$"; }; // XXX: not used currently //Allow-Duplicated-Upgrade { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|source))?(-(unsupported-modules))?$"; }; // "Upgrade" allow-duplicated packages as well @@ -47,7 +52,7 @@ Init { "gpg-import.lua"; }; PM { - Pre { "gpg-checker.lua"; }; + Pre { "gpg-check.lua"; }; Post { "upgradevirt.lua"; }; }; AptGet @@ -56,6 +61,7 @@ DistUpgrade {"upgradevirt.lua"; }; Install::SelectPackage { "upgradevirt.lua"; }; Install::PreResolve { "upgradevirt.lua"; }; + Install::TranslateArg { "upgradevirt.lua"; }; }; Synaptic { Index: mirror-select.conf =================================================================== RCS file: /cvs/extras/rpms/apt/devel/mirror-select.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mirror-select.conf 8 Nov 2004 04:04:43 -0000 1.2 +++ mirror-select.conf 17 Jan 2005 22:01:26 -0000 1.3 @@ -3,5 +3,5 @@ Scripts::AptGet::Help::Command:: "mirror-select.lua"; Dir::Etc::sourceparts::mirrorsource "mirror-select.list"; Dir::State::mirrors "mirrors.list"; -Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/fedora.us-fc2-mirrors.list"; -Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/macromedia-fc2-mirrors.list"; +Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/fedora.us-fcFCREL-mirrors.list"; +Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/macromedia-fcFCREL-mirrors.list"; Index: upgradevirt.lua =================================================================== RCS file: /cvs/extras/rpms/apt/devel/upgradevirt.lua,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- upgradevirt.lua 8 Nov 2004 04:04:37 -0000 1.1 +++ upgradevirt.lua 17 Jan 2005 22:01:26 -0000 1.2 @@ -1,6 +1,5 @@ --- rpm::upgrade-kernel only for backwards compatibility -if confget("RPM::Upgrade-Virtual/b", "false") == "false" and confget("RPM::Upgrade-Kernel/b", "false") == "false" then +if confget("RPM::Upgrade-Virtual/b", "false") == "false" then return end @@ -10,18 +9,41 @@ function get_kerneltype() for i, ktype in ipairs(knames) do if string.find(posix.uname("%r"), ktype) then - return "kernel-"..ktype + return ktype end end -- it's either unknown type or normal UP system - return "kernel" + return "" +end + +-- get package name +function get_kernelname() + suffix = get_kerneltype() + if suffix == "" then + return "kernel" + else + return "kernel-"..suffix + end end -- if grubby is available set default kernel to version function set_default(version) - vmlinuz = '/boot/vmlinuz-'..version - if posix.access('/sbin/grubby', 'x') and posix.access(vmlinuz, 'f') then - os.execute('/sbin/grubby --set-default='..vmlinuz) + if not posix.access('/sbin/grubby', 'x') then + return + end + grubby = io.popen("LANG=C /sbin/grubby --default-kernel") + for line in grubby.lines(grubby) do + -- don't touch the default if it's not a linux system + if string.find(line, "vmlinuz") then + ktype = get_kerneltype() + vmlinuz = '/boot/vmlinuz-'..version..ktype + if posix.access(vmlinuz, 'f') then + print(_("Setting "..vmlinuz.." as new default kernel.")) + os.execute('/sbin/grubby --set-default='..vmlinuz) + else + aptwarning(_("Unable to set new default kernel "..vmlinuz)) + end + end end end @@ -33,6 +55,7 @@ return end + seenpkgs = {} pkgs = pkglist() for i, pkg in ipairs(pkgs) do -- oh fun.. loop through all installed packages and see there are @@ -46,9 +69,10 @@ inst = pkgfind(prov.name.."-"..new_version) if inst then markinstall(inst) - else - print("WARNING: "..prov.name.." not available for kernel "..new_version.."!") + elseif not seenpkgs[prov.name] == true then + print(_("WARNING: "..prov.name.." not available for kernel "..new_version.."!")) end + seenpkgs[prov.name] = true end end end @@ -91,10 +115,10 @@ -- mark installed virtualized packages for "upgrade" function mark_upgrade(name, pkg) - ktype = get_kerneltype() - if pkg.inst then + kname = get_kernelname() + if pkg.inst and not pkgvercur(pkg.pkg) then markinstall(pkg.pkg) - if name == ktype then + if name == kname and not pkgvercur(pkg.pkg) then confset('Kernel::New-Version', verstr(pkg.ver)) end end @@ -102,14 +126,14 @@ -- find the latest version of given virtual pkg for installation function mark_install(virtualpkg) - ktype = get_kerneltype() + kname = get_kernelname() pkgs = find_instonly_pkgs() for name in pkgs do if name == virtualpkg then selected = pkgs[name].pkg end end - if virtualpkg == ktype then + if virtualpkg == kname and not pkgvercur(pkgs[virtualpkg].pkg) then confset('Kernel::New-Version', verstr(pkgs[virtualpkg].ver)) end end @@ -132,13 +156,13 @@ mark_install(virtualname) return elseif script_slot == 'Scripts::AptGet::Install::PreResolve' then - ktype = get_kerneltype() + kname = get_kernelname() if not confexists('Kernel::New-Version') then for i, pkg in ipairs(pkglist()) do idx = string.find(pkgname(pkg), "#") if statinstall(pkg) and idx then name = string.sub(pkgname(pkg), 1, idx-1) - if ktype == name then + if kname == name and not pkgvercur(pkg) then confset('Kernel::New-Version', verstr(pkgvercand(pkg))) end end @@ -147,15 +171,28 @@ if confexists('Kernel::New-Version') then upgrade_kernel_modules(confget('Kernel::New-Version')) end +-- if there's no virtual provide without the version in the name +-- we need to match it here instead of selectpackage +elseif script_slot == 'Scripts::AptGet::Install::TranslateArg' then + modprefix = confgetlist('Kernel::Module-Prefix') + for i, prefix in ipairs(modprefix) do + if string.find(argument, prefix, 1, true) then + translated = argument.."-"..posix.uname("%r") + end + end + return elseif script_slot == 'Scripts::AptGet::Upgrade' or script_slot == 'Scripts::AptGet::DistUpgrade' then pkgs = find_instonly_pkgs() table.foreach(pkgs, mark_upgrade) - upgrade_kernel_modules(confget('Kernel::New-Version')) + if confexists('Kernel::New-Version') then + upgrade_kernel_modules(confget('Kernel::New-Version')) + end elseif script_slot == 'Scripts::PM::Post' then - if confget('Kernel::Set-Default/b', "false") == "true" then + if confget('Kernel::Set-Default/b', "false") == "true" and + confexists('Kernel::New-Version') then set_default(confget('Kernel::New-Version')) end end --- vim:ts=4 +-- vim:ts=4:sw=4 --- apt-0.5.15cnc6-build-dep-fixdeps.patch DELETED --- --- apt-0.5.5-rpmdir-symlink.patch DELETED --- --- rpmpriorities DELETED --- From fedora-extras-commits at redhat.com Mon Jan 17 22:11:53 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 17:11:53 -0500 Subject: rpms/fedora-rpmdevtools/devel .cvsignore, 1.4, 1.5 fedora-rpmdevtools.spec, 1.4, 1.5 sources, 1.4, 1.5 rpminfo, 1.1, NONE Message-ID: <200501172211.j0HMBrgf019028@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/fedora-rpmdevtools/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv19022 Modified Files: .cvsignore fedora-rpmdevtools.spec sources Removed Files: rpminfo Log Message: Update to 0.3.0. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 Nov 2004 04:17:52 -0000 1.4 +++ .cvsignore 17 Jan 2005 22:11:51 -0000 1.5 @@ -1 +1 @@ -fedora-rpmdevtools-0.2.0.tar.bz2 +fedora-rpmdevtools-0.3.0.tar.bz2 Index: fedora-rpmdevtools.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/fedora-rpmdevtools.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fedora-rpmdevtools.spec 10 Dec 2004 22:03:02 -0000 1.4 +++ fedora-rpmdevtools.spec 17 Jan 2005 22:11:51 -0000 1.5 @@ -1,8 +1,8 @@ %define emacs_sitestart_d %{_datadir}/emacs/site-lisp/site-start.d -%define xemacs_sitestart_d %{_libdir}/xemacs/xemacs-packages/lisp/site-start.d %{_datadir}/xemacs/site-packages/lisp/site-start.d +%define xemacs_sitestart_d %{_prefix}/lib/xemacs/xemacs-packages/lisp/site-start.d %{_prefix}/lib64/xemacs/site-packages/lisp/site-start.d %{_datadir}/xemacs/site-packages/lisp/site-start.d Name: fedora-rpmdevtools -Version: 0.2.0 +Version: 0.3.0 Release: 1 Epoch: 0 Summary: Fedora RPM Development Tools @@ -10,8 +10,8 @@ Group: Development/Tools License: GPL URL: http://www.fedora.us/ +# rpminfo upstream: http://people.redhat.com/twoerner/rpminfo/bin/ Source0: %{name}-%{version}.tar.bz2 -Source1: http://people.redhat.com/twoerner/rpminfo/bin/rpminfo BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -61,17 +61,15 @@ install -pm 755 fedora-pkgannfmt $RPM_BUILD_ROOT%{_bindir} install -pm 755 fedora-rmdevelrpms $RPM_BUILD_ROOT%{_bindir} install -pm 755 fedora-rpmchecksig $RPM_BUILD_ROOT%{_bindir} -install -pm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/fedora-rpminfo +install -pm 755 rpminfo $RPM_BUILD_ROOT%{_bindir}/fedora-rpminfo install -pm 755 fedora-extract $RPM_BUILD_ROOT%{_bindir} install -pm 755 fedora-diffarchive $RPM_BUILD_ROOT%{_bindir} install -pm 755 fedora-rpmvercmp $RPM_BUILD_ROOT%{_bindir} install -pm 755 fedora-wipebuildtree $RPM_BUILD_ROOT%{_bindir} -# Deprecated, will be removed in the next "major" release (0.3.0?) -install -pm 755 fedora-unrpm $RPM_BUILD_ROOT%{_bindir} -install -pm 755 fedora-diffrpm $RPM_BUILD_ROOT%{_bindir} -install -dm 755 $RPM_BUILD_ROOT%{_libdir}/rpm -install -pm 755 check-buildroot check-rpaths* $RPM_BUILD_ROOT%{_libdir}/rpm +install -dm 755 $RPM_BUILD_ROOT%{_prefix}/lib/rpm +install -pm 755 check-buildroot check-rpaths* \ + $RPM_BUILD_ROOT%{_prefix}/lib/rpm install -dm 755 $RPM_BUILD_ROOT%{_datadir}/fedora/devgpgkeys install -pm 644 spectemplate*.spec template.init \ @@ -127,10 +125,18 @@ %config(noreplace) %{_sysconfdir}/fedora %{_datadir}/fedora %{_bindir}/fedora-* -%{_libdir}/rpm/check-* +%{_prefix}/lib/rpm/check-* %changelog +* Tue Jan 18 2005 Ville Skytt?? - 0:0.3.0-1 +- Remove 0.fdr. prefixes and epoch 0's from all spec templates. +- Add try-restart action to init script template. +- Remove deprecated fedora-diffrpm and fedora-unrpm. +- Install check-* to %%{_prefix}/lib/rpm instead of %%{_libdir}/rpm (bug 2351). +- Check both %%{_prefix}/lib and %%{_prefix}/lib64 in the xemacs trigger. +- Update rpminfo to 2004-07-07-01 and include it in the tarball. + * Thu Oct 7 2004 Ville Skytt?? - 0:0.2.0-0.fdr.1 - New generalized replacements for fedora-unrpm and fedora-diffrpm: fedora-extract and fedora-diffarchive. Index: sources =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Nov 2004 04:17:52 -0000 1.4 +++ sources 17 Jan 2005 22:11:51 -0000 1.5 @@ -1 +1 @@ -0482cf7d222d7c3d6dfb1cf419e54991 fedora-rpmdevtools-0.2.0.tar.bz2 +18e7e0d9cdb6830ec919907343a32907 fedora-rpmdevtools-0.3.0.tar.bz2 --- rpminfo DELETED --- From fedora-extras-commits at redhat.com Tue Jan 18 16:17:09 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 18 Jan 2005 11:17:09 -0500 Subject: rpms/liferea/devel liferea.spec, 1.6, 1.6.2.1 sources, 1.4, 1.4.2.1 liferea.desktop, 1.1, 1.1.2.1 Message-ID: <200501181617.j0IGH9dK002865@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/liferea/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv2859 Modified Files: Tag: liferea-0_9_0-testing liferea.spec sources liferea.desktop Log Message: Test update to liferea-0.9.0-0.fdr.1.src.rpm from Brian + update desktop file. Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -r1.6 -r1.6.2.1 --- liferea.spec 12 Jan 2005 20:05:46 -0000 1.6 +++ liferea.spec 18 Jan 2005 16:17:07 -0000 1.6.2.1 @@ -1,13 +1,13 @@ Name: liferea -Version: 0.6.4 -Release: 1.b +Version: 0.9.0 +Release: 1 Epoch: 0 Summary: An RSS/RDF feed reader. Group: Applications/Internet License: GPL URL: http://liferea.sourceforge.net/ -Source0: http://download.sourceforge.net/liferea/liferea-0.6.4b.tar.gz +Source0: http://download.sourceforge.net/liferea/liferea-0.9.0.tar.gz Source2: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -31,7 +31,7 @@ %prep -%setup -q -n %{name}-%{version}b +%setup -q -n %{name}-%{version} %build @@ -83,6 +83,9 @@ %changelog +* Fri Jan 14 2005 Brian Pepple - 0:0.9.0-1 +- Updated to 0.9.0. + * Wed Jan 12 2005 Brian Pepple - 0:0.6.4-1.b - Updated to 0.6.4b. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/sources,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- sources 12 Jan 2005 20:05:46 -0000 1.4 +++ sources 18 Jan 2005 16:17:07 -0000 1.4.2.1 @@ -1 +1 @@ -d45086ee3fc098cc9ca146bece0ddf9f liferea-0.6.4b.tar.gz +903a4e3db696ac11d1013e104428d57b liferea-0.9.0.tar.gz Index: liferea.desktop =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.desktop,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- liferea.desktop 8 Nov 2004 04:49:13 -0000 1.1 +++ liferea.desktop 18 Jan 2005 16:17:07 -0000 1.1.2.1 @@ -4,11 +4,13 @@ Name[de]=Liferea Feed Reader Name[cs]=Liferea Feed Reader Name[es]=Liferea, lector de titulares RSS +Name[fr]=Liferea, lecteur de flux GenericName=Feed Reader Comment=Download and view feeds Comment[de]=Anzeigen von News-Feeds Comment[cs]=Stahov??n?? a ??ten?? ??l??nk?? -Comment[es]=Lea fuentes de noticias mediante titulares RSS y XML +Comment[es]=Lector de titulares RSS Liferea +Comment[fr]=T??l??charge et visualise des flux Exec=liferea Icon=liferea.png StartupNotify=false From fedora-extras-commits at redhat.com Tue Jan 18 17:37:56 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 18 Jan 2005 12:37:56 -0500 Subject: rpms/cd-discid/devel cd-discid.spec,1.1,1.2 Message-ID: <200501181737.j0IHbu1N003704@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/cd-discid/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv3696 Modified Files: cd-discid.spec Log Message: Honor optflags, improve description, fix manpage perms (#145345). Index: cd-discid.spec =================================================================== RCS file: /cvs/extras/rpms/cd-discid/devel/cd-discid.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cd-discid.spec 15 Jan 2005 08:19:20 -0000 1.1 +++ cd-discid.spec 18 Jan 2005 17:37:54 -0000 1.2 @@ -1,7 +1,7 @@ Summary: utility to get CDDB discid information Name: cd-discid Version: 0.9 -Release: 1 +Release: 2 Group: Applications/Multimedia License: GPL Source: http://www.hispalinux.es/~data/files/cd-discid/cd-discid_%{version}.orig.tar.gz @@ -9,21 +9,21 @@ %description cd-discid is a backend utility to get CDDB discid information from a CD-ROM -disc. It was originally designed for cdgrab, but can be used for any purpose -requiring CDDB data. +disc. It was originally designed for cdgrab (now abcde), but can be used for +any purpose requiring CDDB data. %prep %setup -q %build -make cd-discid +make CFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} install -m 0755 cd-discid $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 -install -m 0444 cd-discid $RPM_BUILD_ROOT%{_mandir}/man1 +install -m 0644 cd-discid $RPM_BUILD_ROOT%{_mandir}/man1 %clean rm -rf $RPM_BUILD_ROOT @@ -35,6 +35,11 @@ %{_mandir}/man1/* %changelog +* Mon Jan 17 2005 Ville Skytt?? - 0.9-2 +- Honor $RPM_OPT_FLAGS. +- Improve description. +- "Fix" man page permissions. + * Wed Apr 14 2004 Nils Philippsen - version 0.9 From fedora-extras-commits at redhat.com Tue Jan 18 17:40:40 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 18 Jan 2005 12:40:40 -0500 Subject: rpms/abcde/devel abcde.spec,1.1,1.2 Message-ID: <200501181740.j0IHeeFe003747@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/abcde/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv3741 Modified Files: abcde.spec Log Message: Add dependencies, fix up Debianisms, include more docs (#145344). Index: abcde.spec =================================================================== RCS file: /cvs/extras/rpms/abcde/devel/abcde.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- abcde.spec 15 Jan 2005 08:17:24 -0000 1.1 +++ abcde.spec 18 Jan 2005 17:40:38 -0000 1.2 @@ -1,7 +1,7 @@ Summary: A Better CD Encoder Name: abcde Version: 2.2.0 -Release: 1 +Release: 2 License: GPL & Artistic Group: Applications/Multimedia Source: http://www.hispalinux.es/~data/files/abcde_%{version}.orig.tar.gz @@ -11,7 +11,7 @@ URL: http://www.hispalinux.es/~data/abcde.php BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: cd-discid +Requires: cd-discid vorbis-tools flac cdparanoia wget speex %description abcde is a frontend command-line utility (actually, a shell script) that @@ -23,6 +23,7 @@ %patch0 -p1 -b .vi %patch1 -p1 -b .inst %patch2 -p1 -b .genre +sed -i 's/normalize-audio/normalize/g' abcde* %install rm -rf $RPM_BUILD_ROOT @@ -33,12 +34,17 @@ %files %defattr (-, root, root, -) -%doc changelog COPYING README TODO +%doc changelog COPYING README TODO FAQ examples %config(noreplace) %{_sysconfdir}/abcde.conf %{_bindir}/* %{_mandir}/man1/* %changelog +* Mon Jan 17 2005 Ville Skytt?? - 2.2.0-2 +- Add vorbis-tools, flac, cdparanoia, wget, and speex dependencies. +- Weed out some Debianisms from default external tool names. +- Include more docs. + * Fri Jan 14 2005 Nils Philippsen - version 2.2.0 From fedora-extras-commits at redhat.com Tue Jan 18 18:31:09 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 18 Jan 2005 13:31:09 -0500 Subject: rpms/synaptic/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 synaptic.spec, 1.5, 1.6 Message-ID: <200501181831.j0IIV9MD004672@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/synaptic/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv4666 Modified Files: .cvsignore sources synaptic.spec Log Message: Update to 0.55.3 from Panu. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/synaptic/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 05:25:25 -0000 1.3 +++ .cvsignore 18 Jan 2005 18:31:07 -0000 1.4 @@ -1 +1 @@ -synaptic-0.51.tar.gz +synaptic-0.55.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/synaptic/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 05:25:25 -0000 1.3 +++ sources 18 Jan 2005 18:31:07 -0000 1.4 @@ -1 +1 @@ -8592c5b29225431d4b16afbaf2d506ca synaptic-0.51.tar.gz +cc548050f1da9207e815de284b7aee39 synaptic-0.55.3.tar.gz Index: synaptic.spec =================================================================== RCS file: /cvs/extras/rpms/synaptic/devel/synaptic.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- synaptic.spec 10 Dec 2004 22:03:11 -0000 1.5 +++ synaptic.spec 18 Jan 2005 18:31:07 -0000 1.6 @@ -3,12 +3,11 @@ Summary: Graphical frontend for APT package manager. Name: synaptic -Version: 0.51 +Version: 0.55.3 Release: 1 -Epoch: 0 License: GPL Group: Applications/System -Source: http://savannah.nongnu.org/download/synaptic/%{name}-%{version}.tar.gz +Source: http://savannah.nongnu.org/download/synaptic/synaptic-%{version}.tar.gz URL: http://www.nongnu.org/synaptic/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: usermode-gtk @@ -97,11 +96,30 @@ %{_sbindir}/%{name} %{_datadir}/applications/*.desktop %{_datadir}/%{name} +%{_datadir}/pixmaps/%{name}.png %{_datadir}/gnome/help/%{name} %{_datadir}/omf/%{name} %{_mandir}/man8/%{name}.8* %changelog +* Tue Nov 09 2004 Panu Matilainen 0.55.3-1 +- update to 0.55.3 + +* Tue Nov 02 2004 Panu Matilainen 0.55-0.fdr.1 +- update to 0.55 + +* Sun Oct 03 2004 Panu Matilainen 0.53.4-0.fdr.1 +- update to 0.53.4 + +* Mon Aug 16 2004 Panu Matilainen 0.53-0.fdr.1 +- update to 0.53 final + +* Thu Aug 12 2004 Panu Matilainen 0.53-0.fdr.0.pre3.1 +- update to 0.53pre3 + +* Tue Jul 06 2004 Panu Matilainen 0.52-0.fdr.1 +- update to 0.52 + * Wed Jun 23 2004 Panu Matilainen 0.51-0.fdr.1 - update to 0.51 - require yelp From fedora-extras-commits at redhat.com Tue Jan 18 18:54:17 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 18 Jan 2005 13:54:17 -0500 Subject: rpms/dillo/devel .cvsignore, 1.3, 1.4 dillo.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200501181854.j0IIsHCq004799@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/dillo/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv4793 Modified Files: .cvsignore dillo.spec sources Log Message: Update to 0.8.4, fixes CAN-2005-0012 (#144953). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dillo/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:13:59 -0000 1.3 +++ .cvsignore 18 Jan 2005 18:54:15 -0000 1.4 @@ -1 +1 @@ -dillo-0.8.2.tar.bz2 +dillo-0.8.4.tar.bz2 Index: dillo.spec =================================================================== RCS file: /cvs/extras/rpms/dillo/devel/dillo.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dillo.spec 10 Dec 2004 22:03:02 -0000 1.4 +++ dillo.spec 18 Jan 2005 18:54:15 -0000 1.5 @@ -1,5 +1,5 @@ Name: dillo -Version: 0.8.2 +Version: 0.8.4 Release: 1 Epoch: 0 Summary: Very small and fast GUI web browser @@ -7,7 +7,7 @@ Group: Applications/Internet License: GPL URL: http://www.dillo.org/ -Source0: http://www.dillo.org/download/dillo-0.8.2.tar.bz2 +Source0: http://www.dillo.org/download/dillo-0.8.4.tar.bz2 Source1: %{name}.desktop Patch0: dillo-0.8.0-nodebug.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -29,7 +29,7 @@ %patch0 %build -%configure --disable-dependency-tracking --enable-cookies --enable-ipv6 +%configure --disable-dependency-tracking --enable-ipv6 make %{?_smp_mflags} %install @@ -58,13 +58,19 @@ %{_libdir}/%{name} %changelog +* Tue Jan 18 2005 Ville Skytt?? - 0:0.8.4-1 +- Update to 0.8.4, fixes CAN-2005-0012 (#144953). + * Tue Sep 7 2004 Ville Skytt?? - 0:0.8.2-0.fdr.1 - Update to 0.8.2. - Disable dependency tracking to speed up the build. + * Thu Jun 20 2004 Nils O. Sel??sdal - 0:0.8.1-0.fdr.1 - 0.8.1 release + * Mon Apr 19 2004 Nils O. Sel??sdal - 0:0.8.0-0.fdr.3 - Require wget for https support. + * Thu Feb 12 2004 Ville Skytt?? - 0:0.8.0-0.fdr.2 - Use "make install DESTDIR" instead of the %%makeinstall macro to avoid buildroot traces in installed files. Index: sources =================================================================== RCS file: /cvs/extras/rpms/dillo/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:13:59 -0000 1.3 +++ sources 18 Jan 2005 18:54:15 -0000 1.4 @@ -1 +1 @@ -4322f339aa4a4a2a4ba9a11444df9c67 dillo-0.8.2.tar.bz2 +ebf17d6cca1fccc8bc80acdf05e736a3 dillo-0.8.4.tar.bz2 From fedora-extras-commits at redhat.com Tue Jan 18 19:10:14 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 18 Jan 2005 14:10:14 -0500 Subject: rpms/psi import.log,1.9,1.10 Message-ID: <200501181910.j0IJAEJk005619@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/psi In directory cvs.fedora.redhat.com:/tmp/cvs-serv5610 Modified Files: import.log Log Message: auto-import psi-0.9.3-0.fdr.1.2 on branch FC-2 from psi-0.9.3-0.fdr.1.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/psi/import.log,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- import.log 12 Jan 2005 21:11:58 -0000 1.9 +++ import.log 18 Jan 2005 19:10:12 -0000 1.10 @@ -6,3 +6,4 @@ psi-0_9_2-0_fdr_2_1:FC-1:psi-0.9.2-0.fdr.2.1.src.rpm:1099890830 psi-0_9_2-0_fdr_2_2:HEAD:psi-0.9.2-0.fdr.2.2.src.rpm:1099890840 psi-0_9_3-1:HEAD:psi-0.9.3-1.src.rpm:1105564278 +psi-0_9_3-0_fdr_1_2:FC-2:psi-0.9.3-0.fdr.1.2.src.rpm:1106075377 From fedora-extras-commits at redhat.com Tue Jan 18 19:10:14 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 18 Jan 2005 14:10:14 -0500 Subject: rpms/psi/FC-2 crystal_roster.jisp, NONE, 1.1 crystal_system.jisp, NONE, 1.1 .cvsignore, 1.4, 1.5 psi.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200501181910.j0IJAElT005623@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/psi/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv5610/FC-2 Modified Files: .cvsignore psi.spec sources Added Files: crystal_roster.jisp crystal_system.jisp Log Message: auto-import psi-0.9.3-0.fdr.1.2 on branch FC-2 from psi-0.9.3-0.fdr.1.2.src.rpm --- NEW FILE crystal_roster.jisp --- PK  ?]??? ?"????)^x?]E???B?? ??RJ???@????ik????P?1&??D{v!V???|?|???= ?G(??x??9>.u&MhL?? ? juUkw?????Em.??g[)8p ???????K???a??UYk4?-?4e?lH?  ?I8DI????e(A?H?U?EZ? Z?(??jT- 2raFv??r?[?3N9???s?s?ia?h????????{??m &?w? p????~0???cEQ [F??2T???????`y??u"y?,@???1?4?@@?m?k8?????}k|U????'$?[M0  )%  $i$6 ?cv?I???d????]4d9x!???&?{? ?"bv??^Tl?n6?e??n *"Z??P???Jg?iY??????|?????m??? ]??F????0==??? ???  i??$4J?$??c?3???]DvH?????|??=:??? H)?%ala??GP(rXm"Jmh???a,?"?No??.????>&r?I??@3??Z??u??????eIfffXZZj?RJ???.?o4?Uap?Q??.9m????M;?k?D+p+4,???st???eW?c?vNa`?X?0Q1I,??d?z??U?a~?Y????c??9??7Q?????%NcdP^???C???U??E?pGVF?  -??E!H??`??]??????mC?8???Lf?a7????????_??|??P( ??k?Z????????1 ?J?B?? pe?????d???Z_?s?~??w?8??J|s?v?M??BJy?40T??x8?*?>?-?8?4D??QVVh?:E?XDy????<@4??????4:?O?i??6=:??n?.?4???]??Z?V???D??f??#j??{??GD?eb?.?6ckk?/??m??7?xq??&????n?1M????????t?h?S??? )? ?B ?.4??KHLH?nD ??@???d???;??O=P?????????? X4 ??lb??l????? -?[? ?80? v?9sN2??U??V???\a??u????3?4\cf8???k??q`????????"?_???nx.????z>??fqZ??Y  ???b??q????x?T?l4M?L????a?? ?g???[???B?=z#?C?z????qy`?f!?i?Nx|UV??=W????lz2?o??? ?)^?0???(?j???#???? ?j??va1?/???#??????|Ty??S????9!? ?d??@@ o?????R)??H)Q??????????;7.W>?+??[??^f??1??D???????j??m?3@?? ?f???N?l?`6?=???? 13#Wm???z?s???C???_TKyvD? kF.. G%?`/?\/ ??Y??Lk?d?M ry?C?X?sobr???'d?-?H?? ?`??? 3??b???h?z??n:~???|??[Ec??O??????}??L??????OV??#?R?V???i??? }4?????????k??}trt$g?-.???2?n?'?F,?O!)&N?(}?yne???????????s?? ?o>)?(?-?B?0?D?d at m?D???>?????(( ???(??!?4??dt{?`u??'?{??? j????O1; ^x?e????? h??q??M???r??????=2?????&??u?kd??$;P??P7??g???T?$?????????????KH?????:v?????ho????????D\??v???% ?$????Dg?A ?8?kV??>?N??)r??5O?}S?? ?? J##a????7?J???????Bq?FNK?]2?4?}B????U^??]??VI1x?X2?3?m??0Ug?n?_?{6f+N??D?0?9???7fw??& ?7???*NM]?[???lGJ"?s{??!??pg?-+?eH?/???(v?Uy?%??)??s????X?????? ??h?e9?ncf??????b=h^?4?@?|??Of?Ka??6P?K????+{??}???? q?8?? ???uL?I??k ?iX\???vT#\vUw??}"?l??|1??\?S??Z<*"???@?wU?H??paKLQY>+ddO@????????? v&?M???g?@??`??? ??k??x? ?u:8)???4?z?mI??M'?6???m????-ch??Run?)??d[h???m??? /?$??N???pl j???G????G???2W?????????W[ QP?4?????r??e?#q?Z??????!?hv????????g\???Ul?Z??a??@:?????q?W9$E? ?? P? ?4"?????^?4:????+(????s?'???x???J??s??-"?S(?6???i?? ?E?P??~u}?' K???`@[??~??K?R??}t?RE?EcS0??\?RPmE??/?Jq?.A?`BBXY????oJ?e?k?~???=J?"n8?w?$ ??~???????p??N?{5?7? ???C??t_m H??3?Z??? }?@???N????o????????????y?G?????]??B??,?Z?BK??H???? t!FZ??O#?PK ??&7???7\f?/??????LIpX?'q?7=0L??"^~?????Z??j????<x?tr ????Z`?=Q??iX`8w??)??@?r????9????{??98??~??\z}+f??????(??^??A???C?>?yG1n?&?z13Y?-R6??1????&??@??58??(?c????? S]]]?mK?3??8N?7vu????b:??k?x??=jtY`ss?s^4`)??,x?3??g?mP?T4_>???N?????"?v?]5?8g8 ? y3?|??'#%[?]?????}????jU?y*P?UsP??N9???1????:ZbI?L?\U?fu???V???:?????5\R?????? O???xY?-?\?3O???t?M??L??T?????????%v{?;G6a|^I5l??????_??oZm?p{?\???{?H?4:??\-U ??k)??@???zhc?.r?)x??>?;?N???q??u?????8? ?????>??D??=^=&9?\?$??,=???????????e\y|]\4g8?????+f??????????????u[4????????/:?;?M????y???HC8? c????????b2Y??$!?@??????V?p?P _??RsG{?????&?NU???????????G??????9????_I?%???2??PA?4??z?3?^M?MN??<<??P3"?Fi]`z?w4?<;?p??????????8*!dk?l7u????u??p??.????r????0$???k?a???>%????Zxz??|?#A???&j???????cC????8?*????t/5????o??' bz??`0?{??2-4???T:???^?K??}?X? ??bp???:?l?y?GS??9?]??TY8???'?k6w???Q A ?s? ?,??!?^?y??1%tP?{?O?? ?l???B????2?B??2~???O?>??!|9??4?e?n?a?C ????i??S?SE]?h???E?n?W????]?] Z???7??S???m dm ?C??G?RY$?{X????u?? ???=?t??/????G?? ?? ??zH?'\?wn???}?x?Q?f??FM?? ??M?????????????????? ?y?/0???M?5??{????? Y?Kt?G?r?:???8?3Z}?O?}????R?_??/??#6r??n"O???p&B???g\??A?{???8 ?N???`?XT????=???~??h?{*?????jN?????\??????f!?y1A?b'W???4???t?????js? ?????EAX???????^ ?P??w?&?P?????O)?[D? ZH]&???[??A??e)??!??$?????c8??n?$???qc?\????u???>V at W~2????W?????,l?3? ;???+Z?)0?`?????a3?<%????p??(|??P?CC>s?c???A?jW??? m:F?5v7?bJC2?Yb??e,?>?rt??U?47:??W???????????6;?w?????h=4??jt?y1{?V??????Zd1Xz#?E?$?{???"?|`?V???~?????V??? ?w?nry;??j{? _/GK??,?????????RY?R????f?f?????????X?vX??????"iQG C?o.??y?f??R?_?_?????????m?7? (fh?a?B=?5V?b????Ow????b??H??????.?[??^?|?bdie??0Y??xi??gm?b??~???.??K,????????rk^?x?,?z?"??U?@[bbr????K??|?kZBZB8;??R'%.q!???mj??kaa??i?_?????E??K?2P??k??xd?I~=???f??G?^??v?{$ ???P?P_???&~??lA9??t????U??[? ^!?9!? N???????7o????a??vg?O?,?|??MS????[9T ?JOO?????B?,???!???P[??|M????}?!v:%j%jo???$????D?&??}????8>k@?K??z*??%?Gz?6??????U"X??.1?^?bb5?>;?b3???????H?????8?c?[??l???T?????+?j7???9?\?P??21?P??C??W$??io??fI?o?L?9bv?}?nR?j??V5Jjx??d?u?? ????KBGe/GH[?J?'J????(@?$?xZ??+o4?M]??O??60??<,/????) + K??S-S-o?c ??Z??W ?`X???B=?'?S?????<\?C????"K?6'h?Q?6z?Ss 5??? "2??/?QA??Jx:?d???E?(?G???&k??H ?h&J????????H?#?f??i???m??Q at b???5????aa!?$? ?i??kF?????????W7???? U/?U????$ ? Ux?W{,???:??-s5?H?+???djs66??????????j???H?d?aN?N????:???n?.?~X?Yz?pB?????e?w?"? y??b??(:.???Db???^??=???????O(QSO?E??ia???p@???WiW?ai????X??&r???.?h7???&?????zb?(?KJ??a?>>??GI?I?E???X?Y???Z?-[SB??*??.,l???a`??w'???-fb`p???Y?K???????Z????????2?I???35^??IgI???Jc????q??%??$?,?jSx?2h?#?h?b?b??!+V+??e??LW?y?'Q??l4?c5?M]??C?K1?kW??OtlH?+g??????[??_?-U??%0m3n??????2??~3?i?)d? ??W??q? ?????-w??n?(r??y?\7Us5&l??s?E>K???>?f?B0}~?l?Y?c?????I7?'_?????t??????0[?@\;F?kx?}???aQ?u~)??,,tj??g^?&?8?R?M?;?;99?:???;N??|_&!}???????|&?B$????G?b??V??????W/^9?????s?????#??f~?8*? 1G?m_?? ??GF??s?s? ??3??l}?????^pq%??????2???u<4?T?1????z?NV????6?????{Ow?+Z&-????vpk??r?'?l?mo?????B[]i????Cn?{????w??}}???-??Ez????u???^0???y???????????ZQ\S??????u???J-???S?_?Qj?xy??#??q? ~x??1?Q~w5#L??v&???@?w?(?+?F7n??;?e6?(??e?????SM?p?D#A'Ba?'\1!g??kMW?F,r??8???(????i?+?g?-I??O??v}??M??Qn? c?????$5?&,\!i(????O?? 8?v???>?ah??????,b?a!?R(K??k?????W??? ???(U(U?\A??$P{Z| ??S???Z~?A????Xr??O???1V?Z?>hV?LRG?h?h??B?v???!O?? f6??Fg`o??? y?:WA&Mv??]????)?f????a?ai?&0???L??V??ZP???fF?Hnw??)?????( ????F?5?????@?}L??????X????cH???>??9n:?y??d??A???y????%, ??!?????k??r:U??????]y?? ?L&N?q?????EK?I?t?D????V.?a-??$????j mL?^??O?ul?\Ym?w???=?^?3!?+f?+??=Q???#c`?0>6??"?'??a?s??'??- at 9?',iY h??r?O?O?W[{??<?m/=W?5 X???0?70p????b???$z????_?Gy?J??A? ???3"E$??]?f_x-??&?&M?y?H?4~???I ???Y????????X??&?$Y2??s??e?X??????LC?@Vosu.??2???.Xe??????K???c??0Sv?y?x??-l????`?1?g?a?A_??r?????>?u???????zz???T???s??2??n?}???t??k?Rg[?X;?ej?6??I/1{xk??o$????|???#)>]@????i??E?Wd??????*?ST?dHd????)?ibU??< ?unpVa?@B??Z h ??????????N?gV???e?1?"B??bTN "16?ili?'??m ??????>?(???3*o{~?H7?UX4\?i) ?]W??W?R? QQ`?Q???????;??????????p??n????.r???a?J.??x????z.>??c?u???????u ??]%]%5??????Z?4??M ?,r???V|x??Q?q?z???6b?c?c???????on&/y?E?? ??j?Mt.????,????jx? ???? ???P2 ??L?i???'{b6<?)j?d????4??IX??$3??bSE????R?z?C???????N,?LKL??s??*oD3????r?^y?8A???0???l1em7z???????$ R??qS?>?+ ?,}'i??????3b??y?????Q???iQ??L/??ix?6Xm??U????u??f??????q??6?5SD??4??q????L4u0?HJm ?????V??I?6?????0Og????}Kvf)???:??[???k?O?c[?aB ??b?}????????s?G?##C?`{????7?n?g???rlo??R??QY????(?n5??v??P/C?&??????L??oJ??w)f????q??-??8???V2 ???B(??#? ???=W??2?Y???V?? ? ??YYYp??????????X??o?S???{?zm/ ?:9bi??Q?1?[jg| ??? ????W??????> ???????C?&?????D&Wb_3???????????,????Q?eH`???9m?IEv ???? N=?o????c???.??~?xS?|`/?A?jv> |&`9??myG=i`?W????-???es at l??? ?? v`?2????R??X?? w??a???????td?jG7??&1???OvY43?_??pp*??0????6^O?e ?"+.?h?????9?,.???d\?"$??`%?L8? ??eg???????gJ?fk?R??K? b[??""??ej*?V???^-Y?0???TV?6Y??&????????@??\ ??y??]51???j~?{??VI?.???M?n????tnIv?R?;?a ?:?`??.??qG?57?u??1???K?G?? ^nG+nR*WM?????? ??????E?????8}?}` (T ?o?=4??q?%???? ?Y??M??r;???#t;<*A??l?V???W???p????M?X?cc_??M???? ? `??@  ??????????f???V??,D?AJ?????t?Ff?V??n?57????=W?s?????s????=?s9??K??x????F??3?V??*??N???yi???????N9?8? @h ??????z=jqdo????mz??#?'o??sHg????0?K??-F$M?5?!??????mj????L0???9=/??=]????$jL?{???????L?edPR:????????Qw;???G?R???i?}I?=???F?ao?Sl??zc?>"?????E??Xr???w 4?p???Wp????_?z?"??:?sB????o?Ha4D??   ??? ???p??v????? ?gl?@ i?$v"??A5???????B??? ?.?}????@?&???iGI:Z?D??OK??????V???+????????R?W????????????t6??^???C5:f?&\i???&''[?o?    ????? .CYx??f????????? ?olj?[??aP?5f??d*???????? 2? =.+]Q&p????3?  ??V_Y???t???F?E ????d????????@'108???:?????7?@??  ?&JF????????GJ?n'+?p\?q?^j-???? ?.L&{?G?Tg?X?e?Qk:V ?r ?m??0?/5????C?4}}tJ/2????w????? U?+?*???Xh?}??k??C??#?7??s ???  ????1|??f7P?9p(@ ?L` ?v?????Hn?????S??????+?S]?,?D|6????M????8?i???8??1`l ??t/?I???Z?B??????%%M??????[?"???????"R r*b%l8*ej??(??!!)F?X?\?$ J 7?! ??H$?;q???Tlt%? %???5jt  ???h ????9???~?|?? ?p????? ????????|f`??FQ @X ???5????@?# ^?????????'T  c?0????Se2?Q?a??kd??|?J.??p?? n???_????? e?????'?y?B?o?w?? ???G??E0l???C?H9????KJJ????1??i?[+?0V???w??????]:fu?p??AL???$kr``j&+OX?1?=?? ??'Hm???,??8??b ?-??A???6t???^???X????z???A???????0?5 "{1?[?`y#tL?????????t??l?8We??[m??:?????]??@m???UN?/?5?iH?]?e???T?%?????y?J  4??Ci???#E'?`D @  ???k>?CH???K?"????cX {t>$8?)??2?? ?4???t?????K????t8?????9G?}f2?n?|?>?aDB???d????t:=??L??]????~? ^G,v?6???/I?b6?.55?X?m??? P?T ??pP???4b?X?R???2?\?bY??? ?????????M&JE???fhny?????? @????h4J#?1???t?T?-9? ?#@?O?j? zo??  ?`???O4J@^R?V(??"m?R?_?5?)h?? ns?w?? ?r? 1?Q? ??{_? d?:b ?%????"???V*?'???j?=g?_??X?FZ]????PR??a|??  ?R?????}$??L'?$?$wf?=.?4?Z?9??w??=??;?????H$O&?N?R???d?"?`??b??R?koL?a,.?RW???1$R???lv????p\??Rc??????????z?|???(?bz????$od????????[????????n?GG?eTU)??o??;????splq-??N&?t.??|?a?U?d,??C??-?u??e??dd2??]P  ????9??| ????7?????(?NO?8????&???zG????????xA??????|??jt??Q at u?\N????1?????????????p??iE???wp??psX???1???N Zz ?p?@??(?c(??r9V?* ?(?;???"???<(??_??(?@?q???I?d?M]%8??$?#???6???@??2? : ???.??^? C?D?1GD?0??41???VG?H???b`HQ:?g??b??9?*?o?1??@??[f??-}?(?M$??/+Eisd?t???KI} B?y???e??7?+?^???????,?q???7z?????]L5???0u??{????aJ??g?9|??????g???$8gv??x6???c(?]?  iW?|?????7???-?? 3^|????;ou???D!Rl?.?v?6X???E??????g??c???L????~?t?V?]????}?l~?2?_7r????h??????t????&??S???]??????`?^?&g???? ?gK????,z?'?? ??????????? M.??EEm`?A?? ?_>??g??????  &2??p ~??!??`??k?WPq??c??@?P ??o4a??[?A??2?`6??x?(w:}???e  ?l??R C???~?{V???5;??4i?P?q??7???? ?????m????/???? )?L?j???x???_??m?*  ??S!?f! ??m????i@????3?????J?E?GqE? ? ??N?=???8?q??N?f?]???A?{^Q????@???? ?\? ?ZhP??z=U??5@l5S?????'g??:??x???? [??h?f6??v??6???????,??eg?`???A??Z9???p'??n????Z?????? ;??????  ?*g??(?? r??<.?c?*?????$\??? )???&??LE????????^?#????-????S??O&?>?????^)??   ???u???? `466.???z????UHV?????_{???????????(((H? LH??????=???I@??????s????????????%Se????)????????S???{?????y??wK??a????????\??????7???????`@????t?? o|2s??????? ????3???kL???w?????? ^`?!n#!!?3&6??yp?O?????|?y??E&?uIL???_??????7o??????????>P?? nnn? M??g?????@??i?;qJc??  ???????( 3;;?????y!A?lZd2i??FP??A??Z??????????z ?s????2?]?U}??vS???U?$?wf??q@?,<_???y)????? ???<?~????p?e???????????s???????  ?????EKR'?S???fviQ?S` ? ??????O???i>?[?A??2?`6??x?(w:}???e   \`?V?x[????6XY%?lh?TiU+??eb?G??: ??0E?J???u at YE???S~$???@N???????? ????I?????}???s??????,M?KZ?{?~????EW?#??????y5u??K??????#????&??-`%?/??`?|????O??}????+?K??^??X?R????'??-]Xszp]:?ze??w?[?UG??G&'` ????????W=????C??=t???;j?2?!(?????t???5B??!????????z???"???vp?T??n??????[?FM]?!??{???:~h??W??%?.19?????[vm[???p0?]?????q????? ????!? IN? ?????^?[??-FH?6?? ????|???E?"????i??????~????????? ??C?u???g? !k?7?^onT ???! ? x{sc~?? ??]p????g?????K??;???[z??AoII???9v???? ?h ?B?????Q__?i]??^?????6??? `| ????#??????????//?4???f?????8>??c?9?6u?????y???q??D?Q???PMM 48.?7?#?? ?@!6*???hjjv1?z??0?r???>?=XT P p ???;?K?p~V eR????n?????I?? ???} ?~?u ?u??  ??`???3??!???iN??T???`pp})8?????z? ?2?N? T??R ?? ?;?d??? ?H?|?   ??K??m9???N??H??5?s)Y_?"??????Q???~??O?????f?#?????????U/??He?BX?fK?????????? ?Nn???'?7????IO?D?_?z?????~????????#?)A??z???)????m;?~?? ??=Z????{[?oQ'?n???+???}v?e7?}???.?@??>? ?fJtvR|????? ?9????1Q?u?.??????o??????l??o??? ?? ?S??&?????P??6j????Hzk~?3?q |L???<???Z?O??#L?????????\?G*D[? C1???mX2[?Z ?^?+*2??"??xg,@!w|$?????w?!L?3?ly5???W$#? `?}o? ?NHSRi?H?s$???Z|????????nN??q^?k? 4?K??{0???KI 3???t???,?a9?4??TU)m ? M*~?uE"(mJ ?K?k????&?????x????e?????????o^p pU??4????B h???'?fG??r???0,??TE?*`T?)?ciBH5??UI??|????5/>d???????O1?{??\p?Q`xi4??d0?B%?????&?0aU?J???~?oM?HO3?Rq?????9*??z_d??? 70????|?$?[3?AG?1~???Z -?? ?'?6????Hc=f?@?L??p&?+?7?{|>?+??Gr???? ?1???n"?I?? ?=`&F?u?K2f? ???? ???:????1;' ?T????$?? ?. \!????qO?1Y?9%`E??x ?j\BV'n??\@Aru?0 ?m?F,k??*8A s????An?\@???j|?L??L4??K?????XDu?????Bq???|???^ ? "???k??_??*9???-@,j??H?? ???f_?^??T?l?g??,T@o?p?_q?iG?8?-?? ??@M???kn???Y????$??????????/|??s??\>???????????????"8????z?_? ? $x????? ?Q???A83Z???R?X?????Lzq??????0??x????3w??9??$La??u[`??|??_|???;v?m????o????S?|?}??g?yf ?? ??? ???c?5????????t???$ ???3k?9????}?????N??????F=1jA@?u>=\?U]SI??C?????f?8??1?4 ??4??65??Z\s?7????@????}?kO?\????o?????? 4?X?Ff? ???????m?.[Hq42W??/;????O???? ??k?????[?5???^*??9?????[a?7??o??A?M7?t??-[A?g&?9???/??O[?? Hz???????? +? ?? , ?=?f??N??*?:< [ /RGtMv?u???rm_^??!-?P?9}??w??]Fdn??????#?K|?S?z????~??x1????&?9?? Qd[???n??n!bnc+????i83?? ;2??C?_??-+????|??bm??O=?????????? ?????7???:?>%?SN9??? ???????? ????E?&?Q ci??? ?D??P?9???N!S??xB? ???UL?y???Z????;?????y]???3??a?g?7 06??d?A?? ?GQ t7j?B?H$??????!=NWY?? ??'a9f?4.Fq&?HB?O??_???????w?[??^d?$Q^G"?J???N ????"?`?K??B?9O????F"???K^ ?L?j??*????:U????>?????O?8??K?=?r?E?`s??wl?6_~q ?N?j???9?Y????2?y?S???M??9?I?:O,?2?U?_??????>?`?Z3s??K?|~q??T.???=???? ?_~?}|??,?&v)???N????-????n?P??f?E???R.?`ma$???T:q?????6O?1[????+??[???"c??Kc??.???;Q???9?????0??[?r??N???@oL? ???9???)i??Y???bs?w??? R?"??J?`????Rz?Ld,?r?????G`?\???( R`???^rX5?#?f????95 qqq???????J?r?|oR??u>???????}y?\?t08C\?????ZV??DF? {}~L?A!????k?s?f_C???????%&&??? ?x??a??L??N?I.?CJlm9^v8??????y??Z%??BH?>@?(??"?b?+? ?B?7???v??? ?q6}r?uZ??Jg?h ????,?F?z??]xrr?>??x?>???G?V???2 \9?+?? ?1?hr?Wuw????b???N???s_W?????????5p.Jc?'?+?&????????px?#?6??0t?>A0Y???m?wb???? ?? ? 2u;M?zL??([?-????L?=B?e??????f88??%??)?)?K?b ?????????Z??a???)??x???R/???(????u?'??F??6X??H???~V?? 5?2O  X.@???_c??1C?e?Z?_ ?z??{?eI?J|&`???I:????_r%I.???"d#S =c*??n??A ????????A-?G5X?z?as?V?S??&?t??IP4?3?A??}Z? h1:??bt ?vdS?U??#S???N?)?#?]???a]cj??y?+6|??A?h?l?????H??;?7????? ?2"?!?? b? 6????,?v?????q??C?*??WC???/V?_?? ?&-G??IQ?T?!}?  ,??"?l! K???? ??4?0?D?DA+??1?L??QI??q)qM?R??A?1&? 5????(?8?sm|???????o9?|?"B??4?l? ??v?6d j?? ??????????????I????G?? ?W{?*n0A??raN< KJ?7?I??M??tj??v'??(???!?}D??? +>?A?4??yDZ"w?5:=????????hO8c???9%=%I(?RA???]T G??mx???C??k???v???95 ??p8?.?r?/?oQ????????A}&F? ??s?g???kF$?y?Q?a????????\????????0?Ob??D?Mt?@?? ???CE???@?M???????N<!???/??c??+??W??? ??\ g?Z?S?-LB??9 ???PS???m?r_e6F?5????5P?U\ z????h?L??6 ??.C?r???{?H??9???*.?M{?a4 u?Td??qf??bY? ???$:a?  3d*U?c:8 ?5R@?`In!$?u??:??s????? @t??^??#9???????{?}IJ???R????3?U?q)?x?KS#;;?O?Pg?`???KI`$.-CuO?? ,!3$ ! ?u??v???x????_s???]?vI??y?;v?n8R7??????Y?Z??H??? ?c???q6!??= ??H?$??99H5?H ??1????B???n?RH@??????? ??90i???B`?)?$??20M??53? @ K??2Q??x?z??F??DY??~?????? '??R?3?:????qH? (?z?????(???ge???H??Fi??????p_3wN @????a??iT???XJ???7???M#rrH???:D"LF`??N:?L^? `??+????/?? ?42q:=2????h?????D? W???I?fd(?)SX?????`:G?!?W4_x???w? ?.???(? C&?@?@??]??g{??`G 1??????  "??iF???WDPc?P???????H??  @?i???ry?t??N?8_!?A` ???????1shh?????.*K?T??ELc?Fe ?T?%?A???t??|?8x?d??7?????@ZOg? ??????l?? dH?????6@?y ?: M?{?U??q`?f?? ~?F_u?  ??w?????~??? A~?d?????W/8?E?a????@  Q????#????????? @C?\?{ f` ?S??e8?????_F?` ?r ????????~??? (?? 4 M????;???? ?^?%"d mi? ????? ???}gxv? ???>?zv?T@?Ar  O80???? h??? ????? ? @??????????_???7778????l (I?????????3??????  HB!H$j???LF2:???? ??????v?#e?? ?Q'?15e?bp?$}}??0v??MR?&?????u`?|^????,??4 P&??Sj??m??L?V? ?W? ?E???*??wff?<v???!?:??c? ????5?Z?c?=?????a???????i?~!TrMWN?:^???????,d4tz??x?????J??h_g?=?{E??S!?_ 1?R??G???\?c??[ ??29v???X?:?`???O??B?X@SJ uz?>G??zh????|?;? ???J7????A&? 1;??&?????Pj??*??????LNL??????ek???L?k9MM5??m?D??w???o]??L??   ?u?? Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/psi/FC-2/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 Nov 2004 05:14:00 -0000 1.4 +++ .cvsignore 18 Jan 2005 19:10:12 -0000 1.5 @@ -1,15 +1,19 @@ -psi-0.9.2.tar.bz2 -psi-icons.tar.bz2 psi_ca.qm.bz2 psi_cs.qm.bz2 -psi_de.qm.bz2 psi_el.qm.bz2 psi_es.qm.bz2 -psi_fr.qm.bz2 psi_it.qm.bz2 psi_mk.qm.bz2 +psi_se.qm.bz2 +psi-0.9.3.tar.bz2 +psi_de.qm.bz2 +psi_ee.qm.bz2 +psi_et.qm.bz2 +psi_fi.qm.bz2 +psi_fr.qm.bz2 psi_nl.qm.bz2 psi_pl.qm.bz2 -psi_se.qm.bz2 +psi_ru.qm.bz2 psi_sk.qm.bz2 +psi_sw.qm.bz2 psi_zh.qm.bz2 Index: psi.spec =================================================================== RCS file: /cvs/extras/rpms/psi/FC-2/psi.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- psi.spec 8 Nov 2004 05:14:00 -0000 1.5 +++ psi.spec 18 Jan 2005 19:10:12 -0000 1.6 @@ -1,33 +1,32 @@ # Psi has no KDE-specific feature yet, but it's in the TODO list %{!?_without_kde:%define with_kde 1} -Name: psi -Version: 0.9.2 -Release: 0.fdr.2.2 -Summary: Jabber client using QT3 +Name: psi +Version: 0.9.3 +Release: 0.fdr.1.2 +Summary: Jabber client using QT3 Epoch: 0 -License: GPL -Group: Applications/Internet -URL: http://psi.affinix.com/ -Source0: http://dl.sf.net/psi/psi-0.9.2.tar.bz2 -Source1: %name-icons.tar.bz2 +License: GPL +Group: Applications/Internet +URL: http://psi.affinix.com/ +Source0: http://dl.sf.net/psi/psi-0.9.3.tar.bz2 Source2: psi-uicwrapper.sh Patch1: psi-0.9.2-strip.patch Patch2: psi-0.9.2-mach-build.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel >= 1:3.1.1 -#BuildRequires: qt-designer >= 1:3.1.1 BuildRequires: XFree86-devel BuildRequires: zlib-devel BuildRequires: desktop-file-utils +BuildRequires: qca-devel %if 0%{?with_kde} BuildRequires: kdelibs-devel %endif -Requires: sox +Requires: sox Requires: gnupg -Requires: qca-tls # Language packs Source50: psi_pl.qm.bz2 @@ -35,9 +34,9 @@ Source52: psi_fr.qm.bz2 #Source53: psi_eo.qm.bz2 #Source54: psi_sr at Latn.qm.bz2 -#Source55: psi_fi.qm.bz2 +Source55: psi_fi.qm.bz2 Source56: psi_cs.qm.bz2 -#Source57: psi_ru.qm.bz2 +Source57: psi_ru.qm.bz2 Source58: psi_de.qm.bz2 Source59: psi_es.qm.bz2 Source60: psi_mk.qm.bz2 @@ -48,7 +47,9 @@ Source65: psi_se.qm.bz2 Source66: psi_ca.qm.bz2 Source67: psi_zh.qm.bz2 - +Source68: psi_sw.qm.bz2 +Source69: psi_ee.qm.bz2 +Source70: psi_et.qm.bz2 # Emoticonsets Source100: Chibi.jisp @@ -63,12 +64,14 @@ Source109: Ninja.jisp Source110: webmessenger.jisp - # Rostericonsets Source130: weather.jisp Source131: icqG.jisp Source132: gaduGaduG.jisp -#Source133: neos.jisp +Source133: http://www.cs.kuleuven.ac.be/~remko/psi/crystal/crystal_roster.jisp + +# System iconsets +Source160: http://www.cs.kuleuven.ac.be/~remko/psi/crystal/crystal_system.jisp %description @@ -86,23 +89,9 @@ %description -n %name-i18n This package adds internationalization to Psi. -Supported languages are: -- Polish (pl) -- French (fr) -- Spanish (es) -- Macedonian (mk) -- Dutch (nl) -- Slovak (sk) -- Cesky (cs) -- Catalan (ca) -- German (de) -- Simplified Chinese (zh) -- Italiano (it) -- Greek (el) -- Svenska (se) If you want to add a translation from http://psi.affinix.com, just put the .qm file in %_datadir/%name (you'll have to do -this as root) +this as root), and restart psi. %package -n %name-icons Summary: Additional icons for Psi @@ -119,7 +108,7 @@ %prep -%setup -q -a 1 +%setup -q # (ugly) hack to enable debuginfo subrpm %patch1 -p1 -b .strip # needed to build with mach @@ -133,8 +122,8 @@ %endif ./configure \ - --prefix=%{_prefix} \ - --bindir=%{_bindir} \ + --prefix=%{_prefix} \ + --bindir=%{_bindir} \ --libdir=%{_datadir}/%name \ --qtdir=$QTDIR @@ -161,9 +150,9 @@ %__bzip2 -dck %{SOURCE52} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_fr.qm #%__bzip2 -dck %{SOURCE53} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_eo.qm #%__bzip2 -dck %{SOURCE54} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_sr at Latn.qm -#%__bzip2 -dck %{SOURCE55} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_fi.qm +%__bzip2 -dck %{SOURCE55} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_fi.qm %__bzip2 -dck %{SOURCE56} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_cs.qm -#%__bzip2 -dck %{SOURCE57} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_ru.qm +%__bzip2 -dck %{SOURCE57} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_ru.qm %__bzip2 -dck %{SOURCE58} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_de.qm %__bzip2 -dck %{SOURCE59} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_es.qm %__bzip2 -dck %{SOURCE60} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_mk.qm @@ -174,6 +163,9 @@ %__bzip2 -dck %{SOURCE65} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_se.qm %__bzip2 -dck %{SOURCE66} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_ca.qm %__bzip2 -dck %{SOURCE67} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_zh.qm +%__bzip2 -dck %{SOURCE68} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_sw.qm +%__bzip2 -dck %{SOURCE69} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_ee.qm +%__bzip2 -dck %{SOURCE69} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_et.qm ## Install iconsets install -p %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/ @@ -191,7 +183,9 @@ install -p %{SOURCE130} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/ install -p %{SOURCE131} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/ install -p %{SOURCE132} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/ -#install -p %{SOURCE133} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/ +install -p %{SOURCE133} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/ + +install -p %{SOURCE160} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/system/ # Menu perl -pi -e 's/Icon=psi/Icon=psi.png/' $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/%{name}.desktop @@ -204,11 +198,8 @@ $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/%{name}.desktop # icon -install -p -D -m 644 %{name}48.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%name.png -install -p -D -m 644 %{name}32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%name.png -install -p -D -m 644 %{name}16.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%name.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -ln -s ../icons/hicolor/48x48/apps/%name.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%name.png +ln -s ../icons/hicolor/48x48/apps/psi.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%name.png %clean @@ -236,6 +227,26 @@ %changelog +* Sun Jan 09 2005 Aurelien Bompard 0:0.9.3-0.fdr.1 +- version 0.9.3 final + +* Mon Jan 03 2005 Aurelien Bompard 0:0.9.3-0.fdr.0.3.test2 +- version 0.9.3-test2 + +* Thu Nov 25 2004 Aurelien Bompard 0:0.9.3-0.fdr.0.2.test1 +- Drop hardcoded requirement on qca-tls, it should be a plugin + +* Mon Nov 22 2004 Aurelien Bompard 0:0.9.3-0.fdr.0.1.test1 +- update to 0.9.3test1 +- use the provided icon in the menu and drop Source1. +- add crystal iconset +- added Russian and Eesti translations + +* Sat Sep 18 2004 Aurelien Bompard 0:0.9.2-0.fdr.3 +- add patch for typing notification +- add crystal iconset +- update translations (adding kiswahili and Eesti) + * Fri Jun 11 2004 Aurelien Bompard 0:0.9.2-0.fdr.2 - split qca-tls out of this package and require it - fix build on FC1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/psi/FC-2/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Nov 2004 05:14:00 -0000 1.4 +++ sources 18 Jan 2005 19:10:12 -0000 1.5 @@ -1,15 +1,19 @@ -e29f90aea7d839f2a70e4a6e77e95a70 psi-0.9.2.tar.bz2 -d8d5faecb51ea9b7e814e75b3cfa15f2 psi-icons.tar.bz2 1689645b1e2bf181c6fc2d68f070cf0d psi_ca.qm.bz2 69f88fc4768d963bed4cd3ebfbb75a28 psi_cs.qm.bz2 -8cf8142dc0f00b3169d9ba8fdd4793a5 psi_de.qm.bz2 da61ff1ec70cf90357d78f6c81d0ad86 psi_el.qm.bz2 c831c0924c363e8bac42aab577f6982d psi_es.qm.bz2 -8b525df4dce83f5115d92bca5526ca26 psi_fr.qm.bz2 022996fd1f35f26a777f07d667071421 psi_it.qm.bz2 3e1ac01eaf5451f1b1d0968b2f911983 psi_mk.qm.bz2 -084cf4d01df12cd44a3b02e58f75c30a psi_nl.qm.bz2 -02f712f564a07b8fbd3beae0107cc19f psi_pl.qm.bz2 8cc619e6752d6c4db5093eca5d458f0a psi_se.qm.bz2 -e0c9220a54d2622478599cb94c1c38b8 psi_sk.qm.bz2 -5399ddcc710b216c2b816162b7c2f0ba psi_zh.qm.bz2 +d20f3bb530235a246bc2d92308089744 psi-0.9.3.tar.bz2 +52611e036dd0b7cb2ecadcf16eeb9632 psi_de.qm.bz2 +2e19193ebcfd59f80badf011714a2c82 psi_ee.qm.bz2 +2e19193ebcfd59f80badf011714a2c82 psi_et.qm.bz2 +74053f86b57bd74be4b2866dd02b730d psi_fi.qm.bz2 +dd8f83f3c3fc1c20d094f6570acaad4b psi_fr.qm.bz2 +a0cc2e82074a2be17c5ad0004747ac43 psi_nl.qm.bz2 +d3418d4383e47f37f7fedbbc9591db6c psi_pl.qm.bz2 +5e701ee8f56b01c65f3097f5ba13f63c psi_ru.qm.bz2 +784e291e51e4746b602e182ab9ec3ac2 psi_sk.qm.bz2 +a5570c823cfbe33ee602110b89cf4e16 psi_sw.qm.bz2 +38629928c813dc54fc04b38de5e6dcee psi_zh.qm.bz2 From fedora-extras-commits at redhat.com Tue Jan 18 19:11:53 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 18 Jan 2005 14:11:53 -0500 Subject: rpms/taglib import.log,1.4,1.5 Message-ID: <200501181911.j0IJBrqQ005741@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/taglib In directory cvs.fedora.redhat.com:/tmp/cvs-serv5731 Modified Files: import.log Log Message: auto-import taglib-1.3.1-0.fdr.1.2 on branch FC-2 from taglib-1.3.1-0.fdr.1.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/taglib/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 8 Nov 2004 05:24:36 -0000 1.4 +++ import.log 18 Jan 2005 19:11:51 -0000 1.5 @@ -1,3 +1,4 @@ taglib-1_1-0_fdr_5_1:HEAD:taglib-1.1-0.fdr.5.1.src.rpm:1099891467 taglib-1_1-0_fdr_5_2:HEAD:taglib-1.1-0.fdr.5.2.src.rpm:1099891473 taglib-1_3-0_fdr_1_2:HEAD:taglib-1.3-0.fdr.1.2.src.rpm:1099891476 +taglib-1_3_1-0_fdr_1_2:FC-2:taglib-1.3.1-0.fdr.1.2.src.rpm:1106075504 From fedora-extras-commits at redhat.com Tue Jan 18 19:11:53 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 18 Jan 2005 14:11:53 -0500 Subject: rpms/taglib/FC-2 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 taglib.spec, 1.3, 1.4 Message-ID: <200501181911.j0IJBrEG005745@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/taglib/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv5731/FC-2 Modified Files: .cvsignore sources taglib.spec Log Message: auto-import taglib-1.3.1-0.fdr.1.2 on branch FC-2 from taglib-1.3.1-0.fdr.1.2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/taglib/FC-2/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 05:24:36 -0000 1.3 +++ .cvsignore 18 Jan 2005 19:11:51 -0000 1.4 @@ -1 +1 @@ -taglib-1.3.tar.gz +taglib-1.3.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/taglib/FC-2/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 05:24:36 -0000 1.3 +++ sources 18 Jan 2005 19:11:51 -0000 1.4 @@ -1 +1 @@ -54fe2a3abf0cf77130207846b0ce6ef4 taglib-1.3.tar.gz +f5c7c71513ba51b240864d7475a199c0 taglib-1.3.1.tar.gz Index: taglib.spec =================================================================== RCS file: /cvs/extras/rpms/taglib/FC-2/taglib.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- taglib.spec 8 Nov 2004 05:24:36 -0000 1.3 +++ taglib.spec 18 Jan 2005 19:11:51 -0000 1.4 @@ -1,13 +1,13 @@ -Name: taglib -Version: 1.3 +Name: taglib +Version: 1.3.1 Release: 0.fdr.1.2 -Epoch: 0 +Epoch: 0 Summary: Audio Meta-Data Library Group: System Environment/Libraries License: LGPL URL: http://ktown.kde.org/~wheeler/taglib/ -Source: http://developer.kde.org/~wheeler/files/src/taglib-1.3.tar.gz +Source: http://developer.kde.org/~wheeler/files/src/taglib-1.3.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -34,12 +34,13 @@ %build -%configure +%configure --disable-rpath make %{?_smp_mflags} # Doc -cd taglib-api +pushd taglib-api doxygen taglib.doxygen +popd %install rm -rf $RPM_BUILD_ROOT @@ -47,8 +48,8 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -fr examples/.deps rm -fr examples/Makefile* +rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la -find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %files %defattr(-,root,root) @@ -74,6 +75,15 @@ %changelog +* Mon Jan 10 2005 Aurelien Bompard 0:1.3.1-0.fdr.1 +- version 1.3.1 +- drop patch0 +- don't nuke every .la files, only the useless ones +- spec improvements thanks to Rex Dieter + +* Thu Nov 04 2004 Aurelien Bompard 0:1.3-0.fdr.2 +- add apeitem.h to the include files in -devel + * Mon Oct 04 2004 Aurelien Bompard 0:1.3-0.fdr.1 - version 1.3 From fedora-extras-commits at redhat.com Tue Jan 18 19:13:34 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 18 Jan 2005 14:13:34 -0500 Subject: rpms/taglib/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 taglib.spec, 1.5, 1.6 taglib-1.3-apeitem.patch, 1.1, NONE Message-ID: <200501181913.j0IJDYQh005864@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/taglib/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv5852/devel Modified Files: .cvsignore sources taglib.spec Removed Files: taglib-1.3-apeitem.patch Log Message: auto-import taglib-1.3.1-1 on branch devel from taglib-1.3.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/taglib/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 05:24:36 -0000 1.3 +++ .cvsignore 18 Jan 2005 19:13:31 -0000 1.4 @@ -1 +1 @@ -taglib-1.3.tar.gz +taglib-1.3.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/taglib/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 05:24:36 -0000 1.3 +++ sources 18 Jan 2005 19:13:31 -0000 1.4 @@ -1 +1 @@ -54fe2a3abf0cf77130207846b0ce6ef4 taglib-1.3.tar.gz +f5c7c71513ba51b240864d7475a199c0 taglib-1.3.1.tar.gz Index: taglib.spec =================================================================== RCS file: /cvs/extras/rpms/taglib/devel/taglib.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- taglib.spec 10 Dec 2004 22:03:11 -0000 1.5 +++ taglib.spec 18 Jan 2005 19:13:31 -0000 1.6 @@ -1,14 +1,13 @@ -Name: taglib -Version: 1.3 -Release: 2 -Epoch: 0 +Name: taglib +Version: 1.3.1 +Release: 1 +Epoch: 0 Summary: Audio Meta-Data Library Group: System Environment/Libraries License: LGPL URL: http://ktown.kde.org/~wheeler/taglib/ -Source: http://developer.kde.org/~wheeler/files/src/taglib-1.3.tar.gz -Patch0: taglib-1.3-apeitem.patch +Source: http://developer.kde.org/~wheeler/files/src/taglib-1.3.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -32,16 +31,16 @@ %prep %setup -q -%patch0 -p0 -b .apeitem %build -%configure +%configure --disable-rpath make %{?_smp_mflags} # Doc -cd taglib-api +pushd taglib-api doxygen taglib.doxygen +popd %install rm -rf $RPM_BUILD_ROOT @@ -49,8 +48,8 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -fr examples/.deps rm -fr examples/Makefile* +rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la -find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %files %defattr(-,root,root) @@ -76,6 +75,12 @@ %changelog +* Mon Jan 10 2005 Aurelien Bompard 0:1.3.1-1 +- version 1.3.1 +- drop patch0 +- don't nuke every .la files, only the useless ones +- spec improvements thanks to Rex Dieter + * Thu Nov 04 2004 Aurelien Bompard 0:1.3-0.fdr.2 - add apeitem.h to the include files in -devel --- taglib-1.3-apeitem.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jan 18 19:13:34 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 18 Jan 2005 14:13:34 -0500 Subject: rpms/taglib import.log,1.5,1.6 Message-ID: <200501181913.j0IJDYGO005861@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/taglib In directory cvs.fedora.redhat.com:/tmp/cvs-serv5852 Modified Files: import.log Log Message: auto-import taglib-1.3.1-1 on branch devel from taglib-1.3.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/taglib/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 18 Jan 2005 19:11:51 -0000 1.5 +++ import.log 18 Jan 2005 19:13:31 -0000 1.6 @@ -2,3 +2,4 @@ taglib-1_1-0_fdr_5_2:HEAD:taglib-1.1-0.fdr.5.2.src.rpm:1099891473 taglib-1_3-0_fdr_1_2:HEAD:taglib-1.3-0.fdr.1.2.src.rpm:1099891476 taglib-1_3_1-0_fdr_1_2:FC-2:taglib-1.3.1-0.fdr.1.2.src.rpm:1106075504 +taglib-1_3_1-1:HEAD:taglib-1.3.1-1.src.rpm:1106075601 From fedora-extras-commits at redhat.com Tue Jan 18 19:30:07 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 18 Jan 2005 14:30:07 -0500 Subject: common cvs-import.sh,1.3,1.4 Message-ID: <200501181930.j0IJU7PA006142@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/common In directory cvs.fedora.redhat.com:/tmp/cvs-serv6133/common Modified Files: cvs-import.sh Log Message: Make *.jisp go to lookaside cache. Index: cvs-import.sh =================================================================== RCS file: /cvs/extras/common/cvs-import.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cvs-import.sh 12 Dec 2004 20:37:01 -0000 1.3 +++ cvs-import.sh 18 Jan 2005 19:30:05 -0000 1.4 @@ -307,7 +307,7 @@ case $f in *.tar | *gz | *.bz2 | *.Z | *.zip | *.ZIP | \ *.ttf | *.bin | *.tbz | *.pdf | *.rpm | \ - *.jar | *.war | *.db | *.cpio ) + *.jar | *.war | *.db | *.cpio | *.jisp ) UPLOADFILES="$UPLOADFILES $f" if [ -n "$(grep $f sources 2>/dev/null)" ] ; then # this file existed before with a different md5sum From fedora-extras-commits at redhat.com Tue Jan 18 19:30:07 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 18 Jan 2005 14:30:07 -0500 Subject: rpms/psi/FC-2 sources, 1.5, 1.6 Chibi.jisp, 1.1, NONE KMess-Cartoon-1.0.jisp, 1.1, NONE Ninja.jisp, 1.1, NONE apple_ichat-1.0.jisp, 1.1, NONE crystal_roster.jisp, 1.1, NONE crystal_system.jisp, 1.1, NONE gaduGaduG.jisp, 1.1, NONE icqG.jisp, 1.1, NONE kreativ_squareheads.jisp, 1.1, NONE shinyicons.jisp, 1.1, NONE tlen.pl-3.73.jisp, 1.1, NONE trill-extra-smileys.jisp, 1.1, NONE trill-extra-symbols.jisp, 1.1, NONE weather.jisp, 1.1, NONE webmessenger.jisp, 1.1, NONE yahoo_messenger.jisp, 1.1, NONE Message-ID: <200501181930.j0IJU788006146@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/psi/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv6133/psi/FC-2 Modified Files: sources Removed Files: Chibi.jisp KMess-Cartoon-1.0.jisp Ninja.jisp apple_ichat-1.0.jisp crystal_roster.jisp crystal_system.jisp gaduGaduG.jisp icqG.jisp kreativ_squareheads.jisp shinyicons.jisp tlen.pl-3.73.jisp trill-extra-smileys.jisp trill-extra-symbols.jisp weather.jisp webmessenger.jisp yahoo_messenger.jisp Log Message: Make *.jisp go to lookaside cache. Index: sources =================================================================== RCS file: /cvs/extras/rpms/psi/FC-2/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 18 Jan 2005 19:10:12 -0000 1.5 +++ sources 18 Jan 2005 19:30:05 -0000 1.6 @@ -17,3 +17,19 @@ 784e291e51e4746b602e182ab9ec3ac2 psi_sk.qm.bz2 a5570c823cfbe33ee602110b89cf4e16 psi_sw.qm.bz2 38629928c813dc54fc04b38de5e6dcee psi_zh.qm.bz2 +259f0351152852d8091b092440557bab apple_ichat-1.0.jisp +6d98db4a5fab3c5909a422d983ed336f Chibi.jisp +14f8bdbea1873b2972d56726c4c011cf crystal_roster.jisp +ee56b25a85ec3ddef64339e177f7028d crystal_system.jisp +a4aada51bbf57c17c2bfda5ba52717ec gaduGaduG.jisp +9d8b4be36909c235657d61698846aee1 icqG.jisp +459d5feae7cf05210f10ffd8df9ac93f KMess-Cartoon-1.0.jisp +f1760382d3aea32199aeb7303493a9ea kreativ_squareheads.jisp +cbe6f581bf32a2cb56e8bf5871db639d Ninja.jisp +9ec2c600f390dc725e4793383ff50ec2 shinyicons.jisp +099c70f9ca25623c89e3ba5b44af2e6d tlen.pl-3.73.jisp +6a3065d33b072e15decbfb3673028df6 trill-extra-smileys.jisp +b743f3f65dfe526b6d730044031d5c78 trill-extra-symbols.jisp +be98902383c572fd3cd6876a6940a73e weather.jisp +0a2ce25ab4506d563bf65da372c9f8f4 webmessenger.jisp +747a785fdaae8dc5a5ee78a3253035ab yahoo_messenger.jisp --- Chibi.jisp DELETED --- --- KMess-Cartoon-1.0.jisp DELETED --- --- Ninja.jisp DELETED --- --- apple_ichat-1.0.jisp DELETED --- --- crystal_roster.jisp DELETED --- --- crystal_system.jisp DELETED --- --- gaduGaduG.jisp DELETED --- --- icqG.jisp DELETED --- --- kreativ_squareheads.jisp DELETED --- --- shinyicons.jisp DELETED --- --- tlen.pl-3.73.jisp DELETED --- --- trill-extra-smileys.jisp DELETED --- --- trill-extra-symbols.jisp DELETED --- --- weather.jisp DELETED --- --- webmessenger.jisp DELETED --- --- yahoo_messenger.jisp DELETED --- From fedora-extras-commits at redhat.com Tue Jan 18 20:45:28 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 18 Jan 2005 15:45:28 -0500 Subject: rpms/imlib2/devel imlib2.spec,1.7,1.8 Message-ID: <200501182045.j0IKjSnK007089@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/imlib2/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv7083 Modified Files: imlib2.spec Log Message: Upload source tarball and really include the libtool archives! Index: imlib2.spec =================================================================== RCS file: /cvs/extras/rpms/imlib2/devel/imlib2.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- imlib2.spec 17 Jan 2005 09:43:09 -0000 1.7 +++ imlib2.spec 18 Jan 2005 20:45:26 -0000 1.8 @@ -1,7 +1,7 @@ Summary: A graphic library for file loading, saving, rendering, and manipulation Name: imlib2 Version: 1.2.0 -Release: 3 +Release: 4 Epoch: 0 License: BSD Group: System Environment/Libraries @@ -76,7 +76,7 @@ rm -f __doc/Makefile* rm -f \ - $RPM_BUILD_ROOT%{_libdir}/imlib2/{loaders,filters}/*.*a \ + $RPM_BUILD_ROOT%{_libdir}/imlib2/{loaders,filters}/*.a \ $RPM_BUILD_ROOT%{_bindir}/{color_spaces,imlib2,*test} # ship .la files due to a bug in kdelibs (see changelog): @@ -105,8 +105,10 @@ %{_datadir}/imlib2/data/ %dir %{_libdir}/imlib2/filters/ %{_libdir}/imlib2/filters/*.so +%{_libdir}/imlib2/filters/*.la %dir %{_libdir}/imlib2/loaders/ %{_libdir}/imlib2/loaders/*.so +%{_libdir}/imlib2/loaders/*.la %files devel %defattr(-,root,root,-) @@ -120,13 +122,16 @@ # ----------------------------------------------------------------------------- %changelog -* Fri Jan 14 2005 Thorsten Leemhuis - 0:1.2.0-4 +- Really include libtool archives to fix fedora.us bug #2284. + +* Fri Jan 14 2005 Thorsten Leemhuis - 0:1.2.0-3 - Move filters and loaders back into main package where they belong -* Mon Jan 10 2005 Thorsten Leemhuis - 0:1.2.0-2 - Don't ship *.?.a in {_libdir}/imlib/filters/ and loaders/ -* Sun Jan 09 2005 Thorsten Leemhuis - 0:1.2.0-1 - Ship .la files ue to a bug in kdelibs; see https://bugzilla.fedora.us/show_bug.cgi?id=2284 http://bugzilla.redhat.com/bugzilla/142244 @@ -140,7 +145,7 @@ - use configure param --x-libraries={_prefix}/X11R6/{_lib} and patch to fix "cannot find -lX11" -* Thu Dec 30 2004 Thorsten Leemhuis - 0:1.1.2-2 - Disable mmx on x86_64 (fixes Build error) - Add explicit libdir=_libdir to make calls to avoid install errors on x86_64 - Add --with-pic configure option (taken from Matthias Saou's package) From fedora-extras-commits at redhat.com Tue Jan 18 22:42:26 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 18 Jan 2005 17:42:26 -0500 Subject: rpms/liferea/devel sources, 1.4.2.1, 1.4.2.2 liferea.spec, 1.6.2.1, 1.6.2.2 liferea.desktop, 1.1.2.1, NONE Message-ID: <200501182242.j0IMgQDL008735@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/liferea/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv8727 Modified Files: Tag: liferea-0_9_0-testing sources liferea.spec Removed Files: Tag: liferea-0_9_0-testing liferea.desktop Log Message: Update testing branch to 0.9.0b from Brian. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/sources,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -u -r1.4.2.1 -r1.4.2.2 --- sources 18 Jan 2005 16:17:07 -0000 1.4.2.1 +++ sources 18 Jan 2005 22:42:24 -0000 1.4.2.2 @@ -1 +1 @@ -903a4e3db696ac11d1013e104428d57b liferea-0.9.0.tar.gz +2781b3ae500e089497fcbee97bf73441 liferea-0.9.0b.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -u -r1.6.2.1 -r1.6.2.2 --- liferea.spec 18 Jan 2005 16:17:07 -0000 1.6.2.1 +++ liferea.spec 18 Jan 2005 22:42:24 -0000 1.6.2.2 @@ -1,14 +1,13 @@ Name: liferea Version: 0.9.0 -Release: 1 +Release: 1.b Epoch: 0 Summary: An RSS/RDF feed reader. Group: Applications/Internet License: GPL URL: http://liferea.sourceforge.net/ -Source0: http://download.sourceforge.net/liferea/liferea-0.9.0.tar.gz -Source2: %{name}.desktop +Source0: http://download.sourceforge.net/liferea/liferea-0.9.0b.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel @@ -31,7 +30,7 @@ %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{version}b %build @@ -48,7 +47,7 @@ desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ - %{SOURCE2} + %{name}.desktop %clean @@ -83,6 +82,10 @@ %changelog +* Tue Jan 18 2005 Brian Pepple - 0:0.9.0-1.b +- Updated to 0.9.0b. +- Remove seperate desktop file. + * Fri Jan 14 2005 Brian Pepple - 0:0.9.0-1 - Updated to 0.9.0. --- liferea.desktop DELETED --- From fedora-extras-commits at redhat.com Thu Jan 20 10:42:44 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 20 Jan 2005 05:42:44 -0500 Subject: rpms/thttpd/devel thttpd.spec,1.4,1.5 Message-ID: <200501201042.j0KAgifx006892@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/thttpd/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv6886 Modified Files: thttpd.spec Log Message: Fix for log files > 2GB. Index: thttpd.spec =================================================================== RCS file: /cvs/extras/rpms/thttpd/devel/thttpd.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- thttpd.spec 16 Nov 2004 18:49:15 -0000 1.4 +++ thttpd.spec 20 Jan 2005 10:42:42 -0000 1.5 @@ -6,7 +6,7 @@ Summary: Tiny, turbo, throttleable lightweight http server Name: thttpd Version: 2.25b -Release: %{?prever:0.%{prever}.}4 +Release: %{?prever:0.%{prever}.}5 License: BSD Group: System Environment/Daemons URL: http://www.acme.com/software/thttpd/ @@ -42,7 +42,8 @@ %{!?_with_indexes: %{__perl} -pi -e 's/#define GENERATE_INDEXES/#undef GENERATE_INDEXES/g' config.h} %{!?_with_showversion: %{__perl} -pi -e 's/#define SHOW_SERVER_VERSION/#undef SHOW_SERVER_VERSION/g' config.h} %{!?_with_expliciterrors: %{__perl} -pi -e 's/#define EXPLICIT_ERROR_PAGES/#undef EXPLICIT_ERROR_PAGES/g' config.h} -%{__make} %{?_smp_mflags} WEBDIR=%{webroot}/html CGIBINDIR=%{webroot}/cgi-bin +%{__make} %{?_smp_mflags} WEBDIR=%{webroot}/html CGIBINDIR=%{webroot}/cgi-bin \ + CCOPT="%{optflags} -D_FILE_OFFSET_BITS=64" %install @@ -140,6 +141,9 @@ %changelog +* Thu Jan 20 2005 Matthias Saou 2.25b-5 +- Compile with -D_FILE_OFFSET_BITS=64 to support > 2GB log files. + * Tue Nov 16 2004 Matthias Saou 2.25b-4 - Bump release to provide Extras upgrade path. - Re-brand Fedora where it was freshrpms previously. From fedora-extras-commits at redhat.com Sat Jan 22 11:50:34 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 22 Jan 2005 06:50:34 -0500 Subject: rpms/perl-MailTools/devel .cvsignore, 1.3, 1.4 perl-MailTools.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200501221150.j0MBoYYI014957@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-MailTools/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv14951 Modified Files: .cvsignore perl-MailTools.spec sources Log Message: Update to 1.66. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 05:05:20 -0000 1.3 +++ .cvsignore 22 Jan 2005 11:50:32 -0000 1.4 @@ -1 +1 @@ -MailTools-1.64.tar.gz +MailTools-1.66.tar.gz Index: perl-MailTools.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/devel/perl-MailTools.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-MailTools.spec 10 Dec 2004 22:03:08 -0000 1.5 +++ perl-MailTools.spec 22 Jan 2005 11:50:32 -0000 1.6 @@ -2,13 +2,13 @@ Summary: MailTools module for Perl Name: perl-MailTools -Version: 1.64 +Version: 1.66 Release: 1 Epoch: 0 License: Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/MailTools/ -Source0: http://www.cpan.org/authors/id/M/MA/MARKOV/MailTools-1.64.tar.gz +Source0: http://www.cpan.org/authors/id/M/MA/MARKOV/MailTools-1.66.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -52,6 +52,9 @@ %changelog +* Sat Jan 22 2005 Ville Skytt?? - 0:1.66-1 +- Update to 1.66. + * Wed Aug 18 2004 Ville Skytt?? - 0:1.64-0.fdr.1 - Update to 1.64, patch applied upstream. - Bring up to date with current fedora.us Perl spec template. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 05:05:20 -0000 1.3 +++ sources 22 Jan 2005 11:50:32 -0000 1.4 @@ -1 +1 @@ -e417665e33aa1e9b00642c300e92ed06 MailTools-1.64.tar.gz +fe2dcdb1b58bd7cfc6f92559e6dcc7f7 MailTools-1.66.tar.gz From fedora-extras-commits at redhat.com Sat Jan 22 11:53:17 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 22 Jan 2005 06:53:17 -0500 Subject: rpms/perl-MIME-tools/devel .cvsignore, 1.2, 1.3 perl-MIME-tools.spec, 1.5, 1.6 sources, 1.2, 1.3 Message-ID: <200501221153.j0MBrH5J015000@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-MIME-tools/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv14994 Modified Files: .cvsignore perl-MIME-tools.spec sources Log Message: Update to 5.417. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-MIME-tools/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:04:35 -0000 1.2 +++ .cvsignore 22 Jan 2005 11:53:15 -0000 1.3 @@ -1 +1 @@ -MIME-tools-5.411a-RP-Patched-02.tar.gz +MIME-tools-5.417.tar.gz Index: perl-MIME-tools.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MIME-tools/devel/perl-MIME-tools.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-MIME-tools.spec 10 Dec 2004 22:03:08 -0000 1.5 +++ perl-MIME-tools.spec 22 Jan 2005 11:53:15 -0000 1.6 @@ -1,19 +1,21 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-MIME-tools -Version: 5.411 -Release: 6 +Version: 5.417 +Release: 1 Epoch: 0 Summary: Modules for parsing and creating MIME entities in Perl Group: Development/Libraries License: Artistic URL: http://search.cpan.org/dist/MIME-tools/ -Source0: http://www.mimedefang.org/static/MIME-tools-5.411a-RP-Patched-02.tar.gz +Source0: http://www.cpan.org/authors/id/D/DS/DSKOLL/MIME-tools-5.417.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-broot-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(IO::Stringy), perl(MIME::Base64), perl-MailTools +BuildRequires: perl(IO::Stringy) perl(MIME::Base64) >= 2.20 perl-MailTools +BuildRequires: perl >= 1:5.6.1 perl(MIME::QuotedPrint) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description MIME-tools is a collection of Perl5 MIME:: modules for parsing, @@ -23,28 +25,32 @@ %prep -%setup -q -n MIME-tools-%{version}a-RP-Patched-02 +%setup -q -n MIME-tools-%{version} chmod 644 examples/* # avoid dependencies %build -CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS" +%{__perl} Makefile.PL INSTALLDIRS=vendor +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install \ - PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \ - INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib} -find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \ - -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';' +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 ';' +rm -f $RPM_BUILD_ROOT%{perl_vendorlib}/set-version.pl chmod -R u+w $RPM_BUILD_ROOT/* %check || : -make test +if %{__perl} -MMIME::QuotedPrint \ + -e 'exit ($MIME::QuotedPrint::VERSION < 3.03)' ; then + make test +else + # Expected failures: 4, 5 and 7-11 of t/Misc.t + make test || : +fi %clean @@ -53,12 +59,28 @@ %files %defattr(-,root,root,-) -%doc COPYING README README-OR-DIE docs examples +%doc ChangeLog COPYING README README-OR-DIE examples %{perl_vendorlib}/MIME %{_mandir}/man3/MIME::*.3* %changelog +* Sat Jan 22 2005 Ville Skytt?? - 0:5.417-1 +- Update to 5.417. + +* Wed Jan 5 2005 Ville Skytt?? - 0:5.416-0.fdr.1 +- Update to 5.416. + +* Thu Oct 28 2004 Ville Skytt?? - 0:5.415-0.fdr.1 +- Update to 5.415. + +* Thu Oct 7 2004 Ville Skytt?? - 0:5.414-0.fdr.1 +- Update to 5.414. + +* Wed Sep 15 2004 Ville Skytt?? - 0:5.413-0.fdr.1 +- Update to 5.413, includes the mimedefang patches. +- Bring up to date with current fedora.us Perl spec template. + * Sat Feb 7 2004 Ville Skytt?? - 0:5.411-0.fdr.6.a - Install into vendor dirs. - BuildRequire perl-MailTools (bug 373). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-MIME-tools/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:04:35 -0000 1.2 +++ sources 22 Jan 2005 11:53:15 -0000 1.3 @@ -1 +1 @@ -9e726e08980647fe717dbceb8146106f MIME-tools-5.411a-RP-Patched-02.tar.gz +a92299db8729f0f7886ada6e3539b265 MIME-tools-5.417.tar.gz From fedora-extras-commits at redhat.com Sat Jan 22 13:32:13 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 22 Jan 2005 08:32:13 -0500 Subject: rpms/hddtemp/FC-2 hddtemp.db, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200501221332.j0MDWDvU016660@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/hddtemp/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv16639/FC-2 Modified Files: .cvsignore sources Added Files: hddtemp.db Log Message: Move hddtemp.db from lookaside cache to CVS for reproducible builds. It's an upstream text file whose name doesn't change between revisions. --- NEW FILE hddtemp.db --- # # DATABASE VERSION 03C (01/01/2004) # # Insert a regular expression for support of the model or the serie of your hard drive. # If you don't know what to put in the second field, put the number # that appears most often for your brand :o) # A value of zero meens that we know that the drive doesn't have # a temperature sensor (you can set the unit to C or F). # ############################################################################ # The following list was found at (http://www.almico.com/sfhardware.php) # If your drive is in the list send me a mail. # # Manufacturer Model Size Notes # FUJITSU FUJITSU MPF3102AH 10.0GB # FUJITSU FUJITSU MPG3204AH E 20.0GB # FUJITSU FUJITSU MPG3307AT 30.0GB # FUJITSU FUJITSU MPG3409AH 40.0GB # FUJITSU FUJITSU MPG3409AH EF 40.0GB # HITACHI HITACHI_DK23CA-10 9.8GB # HITACHI HITACHI_DK23CA-15 14.7GB # HITACHI HITACHI_DK23CA-30 29.3GB # MAXTOR MAXTOR 4K020H1 19.9GB # SAMSUNG SAMSUNG SV3012H 29.4GB # SEAGATE ST310210A 10.0GB # SEAGATE ST310211A 9.8GB # SEAGATE ST310215A 10.0GB # SEAGATE ST315320A 14.9GB # SEAGATE ST320410A 19.6GB # SEAGATE ST320413A 19.6GB # SEAGATE ST320420A 19.9GB # SEAGATE ST330610A 29.3GB # SEAGATE ST330620A 29.3GB # SEAGATE ST330621A 29.3GB # SEAGATE ST330630A 29.9GB # SEAGATE ST340016A 39.1GB # SEAGATE ST340810ACE 39.1GB # SEAGATE ST380020ACE 78.2GB # SEAGATE ST380021A 78.2GB # WESTERN DIGITAL WDC AC210200D 10.0GB # WESTERN DIGITAL WDC AC29100D 8.9GB # WESTERN DIGITAL WDC AC420400D 19.9GB # WESTERN DIGITAL WDC WD102AA 10.0GB # ################################################# ######################################## ############# Fujitsu drives ######################################## "FUJITSU MHM2100AT" 0 C "Fujitsu MHM2100AT" "FUJITSU MHN2200AT" 194 C "Fujitsu MHN2200AT" "FUJITSU MHN2300AT" 194 C "Fujitsu MHN2300AT" "FUJITSU MHR2020AT" 194 C "Fujitsu MHR2020AT" "FUJITSU MHR2030AT" 194 C "Fujitsu MHR2030AT" "FUJITSU MHS2030AT" 194 C "Fujitsu MHS2030AT" "FUJITSU MHS2040AT" 194 C "Fujitsu MHS2040AT" "FUJITSU MHS2060AT" 194 C "Fujitsu MHS2060AT (Apple PowerBook G4)" "FUJITSU MHT2030AT" 194 C "Fujitsu MHT2030AT" "FUJITSU MHT2040AT" 194 C "Fujitsu MHT2040AT" "FUJITSU MPF3204AH" 194 C "Fujitsu MPF3204AH" "FUJITSU MPG3204AT.*" 194 C "Fujitsu MPG3204AT" "FUJITSU MPG3307AT" 194 C "Fujitsu MPG3307AT" "FUJITSU MPG3409AT.*" 194 C "Fujitsu MPG3409AT E" "FUJITSU MPG3409AH.*" 194 C "Fujitsu MPG3409AH E" "FUJITSU MPG3204AH" 194 C "Fujitsu MPG3204AH" ######################################## ############# Hitachi drives ######################################## "HITACHI_DK228A-65" 0 C "Hitachi DK228A-65" "HITACHI_DK23CA-20" 194 C "Hitachi DK23CA-20" "HITACHI_DK23CA-30B" 194 C "Hitachi DK23CA-30B" "HITACHI_DK23CA-75" 194 C "Hitachi DK23CA-75" "HITACHI_DK23DA-[234]0" 194 C "Hitachi DK23DA series" "HITACHI_DK23EA-[346]0" 194 C "Hitachi DK23EA series" "HITACHI_DK23FB-60" 194 C "Hitachi DK23FB60" "HTS726060M9AT00" 194 C "Hitachi Travelstar 60GB" ######################################## ############# IBM drives ######################################## # DJSA serie is using F0h command to report temperature and also have # SMART capabilties but it was reported not to work. # "DJSA-2(30|32|10|20|05)" 0 C "IBM Travelstar 20GN, 32GH, 30GT series" "IBM-DARA-212000" 0 C "IBM Travelstar 12GN" "IBM-DTTA-35*" 0 C "IBM Deskstar 16GP serie" # according to specifications they do not seems to have sensor # but I prefer waiting for a report #"IBM-DTTA-37*" 0 C "IBM Deskstar 14GXP serie" "IBM-DJNA-35.*" 231 C "IBM Deskstar 25 GP serie" "IBM-DJNA-37.*" 231 C "IBM Deskstar 22 GXP serie" "IBM-DHEA-(34330|36480)" 0 C "IBM Deskstar 5 serie" "IBM-DHEA-(34331|36481|38451)" 0 C "IBM Deskstar 8 serie" "IBM-DPTA-37.*" 231 C "IBM Deskstar 34GXP serie" "IBM-DPTA-35.*" 231 C "IBM Deskstar 37GP serie" "IBM-DTLA-30[57]0[123467][05]" 194 C "IBM Deskstar 40GV & 75GXP series" "IC25N0[1234]0ATCS04-0" 194 C "IBM Travelstar 40GN serie" "IC25N0[24]0ATC[SX]05-0" 194 C "IBM Travelstar 40GNX serie" "IC25N0(15|20|30)ATDA04-0" 194 C "IBM Travelstar 30GN serie" "IC25T048ATDA05-0" 194 C "IBM Travelstar 48GH serie" "IC25T060ATC[SX]05-0" 194 C "IBM Travelstar 60GH serie" "IC35L0[12346]0AVER07" 194 C "IBM Deskstar 60GXP serie" "IC35L[01][02468]0AVV[AN]07*" 194 C "IBM Deskstar 120GXP serie" "IC35L[01][23689]0AVV207*" 194 C "IBM Deskstar 180GXP serie" ######################################## ############# Maxtor drives ######################################## #"Maxtor 2B0[012][04568]H1" ??? C "Maxtor Fireball 541DX" "Maxtor 2F020J0" 194 C "Maxtor 2F020J0" "Maxtor 2F030J0" 194 C "Maxtor 2F030J0" # which one must I trust ? #"Maxtor 4D040H2" 9 C "Maxtor DiamondMax D540X-4D" #"Maxtor 4D040H2" 0 C "Maxtor 4D040H2" #"Maxtor 4D080H4" 12 C "Maxtor DiamondMax D540X-4D" #"Maxtor 4D080H4" 9 C "Maxtor DiamondMax D540X-4D" "MAXTOR 4K0[468]0H[234]" 194 C "Maxtor DiamondMax D540X serie" "Maxtor 4[RA](16|12|08|06)0[LJ]0" 194 C "Maxtor DiamondMax 16" "Maxtor 51024U2" 0 C "Maxtor DiamondMax Plus 40" "Maxtor 5A250J0" 194 C "Maxtor Maxline 2 250GB 5400RPM" "Maxtor 5T0[24]0H[24]" 0 C "Maxtor DiamondMax Plus 60" "Maxtor 6E0[234]0L0" 194 C "Maxtor DiamondMax Plus 8" "MAXTOR 6L0[2468]0[LJ][1234]" 194 C "Maxtor DiamondMax Plus D740X family" "Maxtor 6Y(06|08|12|16|20)0[LPM]0" 194 C "Maxtor DiamondMax Plus 9" "Maxtor 94098U8" 11 C "Maxtor DiamondMax 40 94098U8" ######################################## ############# Quantum drives ######################################## "QUANTUM FIREBALLP AS40.0" 0 C "Quantum Fireball AS40" "QUANTUM FIREBALL CX10.2A" 0 C "Quantum Fireball CX10.2A" #"QUANTUM FIREBALLlct10 20" 4 C "Quantum Fireball CT10 20GB" # I suspect the QUANTUM FIREBALL_TM2110A to have a sensor in field 9... # "QUANTUM FIREBALL_TM2110A" 9 C "Quantum Fireball TM2110A" ######################################## ############# Samsung drives ######################################## # somenone reported a problem with the SP8004H which reports a temperature # 10?C below the ambient temperature "SAMSUNG SW0434A" 0 C "Samsung SW0434A" "SAMSUNG SP(2001|4002|6003|8004|40A2)H" 194 C "Samsung SpinPoint P40 serie" "SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)N" 194 C "Samsung SpinPoint P80 serie" "SAMSUNG SV0432A" 0 C "Samsung SV0432A" "SAMSUNG SV3002H" 0 C "Samsung SpinPoint V30 serie" "SAMSUNG SV(2001|4002|6003|8004)H" 194 C "Samsung SpinPoint V40 serie" #"SAMSUNG SV(0221|0602|0813|1204)H" 9 C "Samsung SpinPoint V60 serie" #"SAMSUNG SV1204H" 194 C "Samsung 120G" "SAMSUNG SV(0401|0802|1203|1604)N" 194 C "Samsung SpinPoint V80 serie" ######################################## ############# Seagate drives ######################################## "Seagate Technology 1275MB - ST31276A" 0 C "Seagate ST31276A" "ST3412A" 0 C "Seagate ST3412A" "ST38641A" 0 C "Seagate ST38641A" "ST310210A" 0 C "Seagate ST310210A" "ST310211A" 194 C "Seagate ST310211A" "ST310220A" 0 C "Seagate ST310220A" # SEAGATE ST313021A 13.0GB "ST313021A" 0 C "Seagate U8 ST313021A" "ST310240A" 0 C "Seagate Medalist 10240 Ultra ATA-3" "ST315320A" 194 C "Seagate ST315320A" "ST320423A" 0 C "Seagate U10 20423, Ultra ATA/66" "ST320011A" 194 C "Seagate ST320011A" "ST320014A" 194 C "Seagate ST320014A (5400 rpm, 20Gb)" "ST320410A" 194 C "Seagate ST320410A" "ST320413A" 194 C "Seagate ST320413A" "ST320414A" 194 C "Seagate ST320414A" "ST320420A" 194 C "Seagate Barracuda II ST320420A" "ST330620A" 194 C "Seagate ST330620A" "ST330621A" 194 C "Seagate ST330621A" "ST330630A" 194 C "Seagate Barracuda ST330630A" "ST340014A" 194 C "Seagate Barracuda 7200.7 40Gb" "ST340016A" 194 C "Seagate ST340016A" "ST340810A" 194 C "Seagate U Series 40810 (40Gb, Ultra ATA/100, 5400 rpm)" "ST340823A" 194 C "Seagate U Series 5 40823" "ST340824A" 194 C "Seagate Barracuda III" "ST360015A" 194 C "Seagate Barracuda V ST360015A" "ST360020A" 194 C "Seagate U Series 60020" "ST360021A" 194 C "Seagate Barracuda IV ST360021A" "ST380011A" 194 C "Seagate Barracuda 7200.7 80GB" "ST380013AS" 194 C "Seagate Barracuda 7200.7 80GB (Serial ATA)" "ST380020A" 194 C "Seagate U Series 80020 (80Gb, Ultra ATA/100, 5400 rpm)" "ST380021A" 194 C "Seagate Barracuda IV ST380021A" "ST380023A" 194 C "Seagate Barracuda V ST380023A" "ST39111A" 194 C "Seagate ST39111A (from Sun Ultra)" "ST3120020A" 194 C "Seagate ST3120020A" "ST3120022A" 194 C "Seagate Baraccuda 7200.7 120GB" "ST3120023A" 194 C "Seagate Barracuda V ST3120023A" "ST3120024A" 194 C "Seagate Barracuda V ST3120024A" "ST3120026A" 194 C "Seagate Barracuda V ST3120026A" "ST3160023AS" 194 C "Seagate Barracuda V ST3160023AS (160Gb, Serial ATA)" "ST94011A" 194 C "Seagate ST94011A" ######################################## ############# TOSHIBA Laptops ######################################## "MK4313MAT" 220 C "Toshiba MK4313MAT" "TOSHIBA MK1517GAP" 0 C "Toshiba MK1517GAP" "TOSHIBA MK3017GAP" 0 C "Toshiba MK3017GAP" "TOSHIBA MK3021GAS" 194 C "Toshiba MK3021GAS" #"TOSHIBA MK4019GAX" 222 C "Toshiba MK4019GAX" "TOSHIBA MK6021GAS" 194 C "Toshiba MK6021GAS" "TOSHIBA MK2018GAS" 226 F "Toshiba MK2018GAS" "TOSHIBA MK6022GAX" 194 C "Toshiba MK6022GAX" ######################################## ############# Western Digital drives ######################################## # WDC AC310100B and WDC AC2850F are reported not working # no more informations were given "WDC WD200BB-00AUA1" 0 C "Western Digital Caviar WD200BB" "WDC WD360GD-00FNA0" 194 C "Western Digital SATA Raptor 36.7GB" "WDC WD400BB-(18CA|00DE)A0" 0 C "Western Digital Caviar WD400BB" "WDC WD600BB-32BSA0" 0 C "Western Digital 600BB-32BSA0" "WDC WD800BB-00CAA1" 0 C "Western Digital WD800BB-00CAA1" "WDC WD800BB-22DKA0" 194 C "Western Digital 800BB-22DKA0" "WDC WD100EB-00BHF0" 0 C "Western Digital 100EB-00BHF0" "WDC WD400EB-00CPF0" 0 C "Western Digital 400EB-00CPF0" "WDC WD800JB-00ETA0" 194 C "Western Digital 80GB Special Edition 8MB" "WDC WD1600JB-00EVA0" 194 C "Western Digital 160GB Special Edition 8MB" "WDC WD2000JB-34EVA0" 194 C "Western Digital 200GB Special Edition 8MB" "WDC WD2500JB-32FUA0" 194 C "Western Digital 250GB Special Edition 8MB" "WDC AC420400D" 231 C "Western Digital Caviar AC420400D" "WDC AC418000D" 231 C "Western Digital AC418000D" "WDC WD135BA" 231 C "Wetsern Digital WD135BA" # not sure for next # "WDC WD800JB-00CRA1" 9 C "Western Digital Caviar WD800JB" # "WDC WD800JB-00CRA1" 199 C "Western Digital Caviar WD800JB" # "WDC WD1200JB-00CRA1" 9 C "Western Digital 1200JB-00CRA1" # "WDC WD273BA" 9 C "Western Digital WD273BA" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hddtemp/FC-2/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:34:04 -0000 1.3 +++ .cvsignore 22 Jan 2005 13:32:11 -0000 1.4 @@ -1,2 +1 @@ hddtemp-0.3-beta12.tar.bz2 -hddtemp.db Index: sources =================================================================== RCS file: /cvs/extras/rpms/hddtemp/FC-2/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:34:04 -0000 1.3 +++ sources 22 Jan 2005 13:32:11 -0000 1.4 @@ -1,2 +1 @@ 51f19658fa6e745eee62f6e100838884 hddtemp-0.3-beta12.tar.bz2 -4cd1caa5573efae5eedd36ee91b41b2c hddtemp.db From fedora-extras-commits at redhat.com Sat Jan 22 13:32:13 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 22 Jan 2005 08:32:13 -0500 Subject: rpms/hddtemp/FC-1 hddtemp.db, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200501221332.j0MDWDTH016657@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/hddtemp/FC-1 In directory cvs.fedora.redhat.com:/tmp/cvs-serv16639/FC-1 Modified Files: .cvsignore sources Added Files: hddtemp.db Log Message: Move hddtemp.db from lookaside cache to CVS for reproducible builds. It's an upstream text file whose name doesn't change between revisions. --- NEW FILE hddtemp.db --- # # DATABASE VERSION 03C (01/01/2004) # # Insert a regular expression for support of the model or the serie of your hard drive. # If you don't know what to put in the second field, put the number # that appears most often for your brand :o) # A value of zero meens that we know that the drive doesn't have # a temperature sensor (you can set the unit to C or F). # ############################################################################ # The following list was found at (http://www.almico.com/sfhardware.php) # If your drive is in the list send me a mail. # # Manufacturer Model Size Notes # FUJITSU FUJITSU MPF3102AH 10.0GB # FUJITSU FUJITSU MPG3204AH E 20.0GB # FUJITSU FUJITSU MPG3307AT 30.0GB # FUJITSU FUJITSU MPG3409AH 40.0GB # FUJITSU FUJITSU MPG3409AH EF 40.0GB # HITACHI HITACHI_DK23CA-10 9.8GB # HITACHI HITACHI_DK23CA-15 14.7GB # HITACHI HITACHI_DK23CA-30 29.3GB # MAXTOR MAXTOR 4K020H1 19.9GB # SAMSUNG SAMSUNG SV3012H 29.4GB # SEAGATE ST310210A 10.0GB # SEAGATE ST310211A 9.8GB # SEAGATE ST310215A 10.0GB # SEAGATE ST315320A 14.9GB # SEAGATE ST320410A 19.6GB # SEAGATE ST320413A 19.6GB # SEAGATE ST320420A 19.9GB # SEAGATE ST330610A 29.3GB # SEAGATE ST330620A 29.3GB # SEAGATE ST330621A 29.3GB # SEAGATE ST330630A 29.9GB # SEAGATE ST340016A 39.1GB # SEAGATE ST340810ACE 39.1GB # SEAGATE ST380020ACE 78.2GB # SEAGATE ST380021A 78.2GB # WESTERN DIGITAL WDC AC210200D 10.0GB # WESTERN DIGITAL WDC AC29100D 8.9GB # WESTERN DIGITAL WDC AC420400D 19.9GB # WESTERN DIGITAL WDC WD102AA 10.0GB # ################################################# ######################################## ############# Fujitsu drives ######################################## "FUJITSU MHM2100AT" 0 C "Fujitsu MHM2100AT" "FUJITSU MHN2200AT" 194 C "Fujitsu MHN2200AT" "FUJITSU MHN2300AT" 194 C "Fujitsu MHN2300AT" "FUJITSU MHR2020AT" 194 C "Fujitsu MHR2020AT" "FUJITSU MHR2030AT" 194 C "Fujitsu MHR2030AT" "FUJITSU MHS2030AT" 194 C "Fujitsu MHS2030AT" "FUJITSU MHS2040AT" 194 C "Fujitsu MHS2040AT" "FUJITSU MHS2060AT" 194 C "Fujitsu MHS2060AT (Apple PowerBook G4)" "FUJITSU MHT2030AT" 194 C "Fujitsu MHT2030AT" "FUJITSU MHT2040AT" 194 C "Fujitsu MHT2040AT" "FUJITSU MPF3204AH" 194 C "Fujitsu MPF3204AH" "FUJITSU MPG3204AT.*" 194 C "Fujitsu MPG3204AT" "FUJITSU MPG3307AT" 194 C "Fujitsu MPG3307AT" "FUJITSU MPG3409AT.*" 194 C "Fujitsu MPG3409AT E" "FUJITSU MPG3409AH.*" 194 C "Fujitsu MPG3409AH E" "FUJITSU MPG3204AH" 194 C "Fujitsu MPG3204AH" ######################################## ############# Hitachi drives ######################################## "HITACHI_DK228A-65" 0 C "Hitachi DK228A-65" "HITACHI_DK23CA-20" 194 C "Hitachi DK23CA-20" "HITACHI_DK23CA-30B" 194 C "Hitachi DK23CA-30B" "HITACHI_DK23CA-75" 194 C "Hitachi DK23CA-75" "HITACHI_DK23DA-[234]0" 194 C "Hitachi DK23DA series" "HITACHI_DK23EA-[346]0" 194 C "Hitachi DK23EA series" "HITACHI_DK23FB-60" 194 C "Hitachi DK23FB60" "HTS726060M9AT00" 194 C "Hitachi Travelstar 60GB" ######################################## ############# IBM drives ######################################## # DJSA serie is using F0h command to report temperature and also have # SMART capabilties but it was reported not to work. # "DJSA-2(30|32|10|20|05)" 0 C "IBM Travelstar 20GN, 32GH, 30GT series" "IBM-DARA-212000" 0 C "IBM Travelstar 12GN" "IBM-DTTA-35*" 0 C "IBM Deskstar 16GP serie" # according to specifications they do not seems to have sensor # but I prefer waiting for a report #"IBM-DTTA-37*" 0 C "IBM Deskstar 14GXP serie" "IBM-DJNA-35.*" 231 C "IBM Deskstar 25 GP serie" "IBM-DJNA-37.*" 231 C "IBM Deskstar 22 GXP serie" "IBM-DHEA-(34330|36480)" 0 C "IBM Deskstar 5 serie" "IBM-DHEA-(34331|36481|38451)" 0 C "IBM Deskstar 8 serie" "IBM-DPTA-37.*" 231 C "IBM Deskstar 34GXP serie" "IBM-DPTA-35.*" 231 C "IBM Deskstar 37GP serie" "IBM-DTLA-30[57]0[123467][05]" 194 C "IBM Deskstar 40GV & 75GXP series" "IC25N0[1234]0ATCS04-0" 194 C "IBM Travelstar 40GN serie" "IC25N0[24]0ATC[SX]05-0" 194 C "IBM Travelstar 40GNX serie" "IC25N0(15|20|30)ATDA04-0" 194 C "IBM Travelstar 30GN serie" "IC25T048ATDA05-0" 194 C "IBM Travelstar 48GH serie" "IC25T060ATC[SX]05-0" 194 C "IBM Travelstar 60GH serie" "IC35L0[12346]0AVER07" 194 C "IBM Deskstar 60GXP serie" "IC35L[01][02468]0AVV[AN]07*" 194 C "IBM Deskstar 120GXP serie" "IC35L[01][23689]0AVV207*" 194 C "IBM Deskstar 180GXP serie" ######################################## ############# Maxtor drives ######################################## #"Maxtor 2B0[012][04568]H1" ??? C "Maxtor Fireball 541DX" "Maxtor 2F020J0" 194 C "Maxtor 2F020J0" "Maxtor 2F030J0" 194 C "Maxtor 2F030J0" # which one must I trust ? #"Maxtor 4D040H2" 9 C "Maxtor DiamondMax D540X-4D" #"Maxtor 4D040H2" 0 C "Maxtor 4D040H2" #"Maxtor 4D080H4" 12 C "Maxtor DiamondMax D540X-4D" #"Maxtor 4D080H4" 9 C "Maxtor DiamondMax D540X-4D" "MAXTOR 4K0[468]0H[234]" 194 C "Maxtor DiamondMax D540X serie" "Maxtor 4[RA](16|12|08|06)0[LJ]0" 194 C "Maxtor DiamondMax 16" "Maxtor 51024U2" 0 C "Maxtor DiamondMax Plus 40" "Maxtor 5A250J0" 194 C "Maxtor Maxline 2 250GB 5400RPM" "Maxtor 5T0[24]0H[24]" 0 C "Maxtor DiamondMax Plus 60" "Maxtor 6E0[234]0L0" 194 C "Maxtor DiamondMax Plus 8" "MAXTOR 6L0[2468]0[LJ][1234]" 194 C "Maxtor DiamondMax Plus D740X family" "Maxtor 6Y(06|08|12|16|20)0[LPM]0" 194 C "Maxtor DiamondMax Plus 9" "Maxtor 94098U8" 11 C "Maxtor DiamondMax 40 94098U8" ######################################## ############# Quantum drives ######################################## "QUANTUM FIREBALLP AS40.0" 0 C "Quantum Fireball AS40" "QUANTUM FIREBALL CX10.2A" 0 C "Quantum Fireball CX10.2A" #"QUANTUM FIREBALLlct10 20" 4 C "Quantum Fireball CT10 20GB" # I suspect the QUANTUM FIREBALL_TM2110A to have a sensor in field 9... # "QUANTUM FIREBALL_TM2110A" 9 C "Quantum Fireball TM2110A" ######################################## ############# Samsung drives ######################################## # somenone reported a problem with the SP8004H which reports a temperature # 10?C below the ambient temperature "SAMSUNG SW0434A" 0 C "Samsung SW0434A" "SAMSUNG SP(2001|4002|6003|8004|40A2)H" 194 C "Samsung SpinPoint P40 serie" "SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)N" 194 C "Samsung SpinPoint P80 serie" "SAMSUNG SV0432A" 0 C "Samsung SV0432A" "SAMSUNG SV3002H" 0 C "Samsung SpinPoint V30 serie" "SAMSUNG SV(2001|4002|6003|8004)H" 194 C "Samsung SpinPoint V40 serie" #"SAMSUNG SV(0221|0602|0813|1204)H" 9 C "Samsung SpinPoint V60 serie" #"SAMSUNG SV1204H" 194 C "Samsung 120G" "SAMSUNG SV(0401|0802|1203|1604)N" 194 C "Samsung SpinPoint V80 serie" ######################################## ############# Seagate drives ######################################## "Seagate Technology 1275MB - ST31276A" 0 C "Seagate ST31276A" "ST3412A" 0 C "Seagate ST3412A" "ST38641A" 0 C "Seagate ST38641A" "ST310210A" 0 C "Seagate ST310210A" "ST310211A" 194 C "Seagate ST310211A" "ST310220A" 0 C "Seagate ST310220A" # SEAGATE ST313021A 13.0GB "ST313021A" 0 C "Seagate U8 ST313021A" "ST310240A" 0 C "Seagate Medalist 10240 Ultra ATA-3" "ST315320A" 194 C "Seagate ST315320A" "ST320423A" 0 C "Seagate U10 20423, Ultra ATA/66" "ST320011A" 194 C "Seagate ST320011A" "ST320014A" 194 C "Seagate ST320014A (5400 rpm, 20Gb)" "ST320410A" 194 C "Seagate ST320410A" "ST320413A" 194 C "Seagate ST320413A" "ST320414A" 194 C "Seagate ST320414A" "ST320420A" 194 C "Seagate Barracuda II ST320420A" "ST330620A" 194 C "Seagate ST330620A" "ST330621A" 194 C "Seagate ST330621A" "ST330630A" 194 C "Seagate Barracuda ST330630A" "ST340014A" 194 C "Seagate Barracuda 7200.7 40Gb" "ST340016A" 194 C "Seagate ST340016A" "ST340810A" 194 C "Seagate U Series 40810 (40Gb, Ultra ATA/100, 5400 rpm)" "ST340823A" 194 C "Seagate U Series 5 40823" "ST340824A" 194 C "Seagate Barracuda III" "ST360015A" 194 C "Seagate Barracuda V ST360015A" "ST360020A" 194 C "Seagate U Series 60020" "ST360021A" 194 C "Seagate Barracuda IV ST360021A" "ST380011A" 194 C "Seagate Barracuda 7200.7 80GB" "ST380013AS" 194 C "Seagate Barracuda 7200.7 80GB (Serial ATA)" "ST380020A" 194 C "Seagate U Series 80020 (80Gb, Ultra ATA/100, 5400 rpm)" "ST380021A" 194 C "Seagate Barracuda IV ST380021A" "ST380023A" 194 C "Seagate Barracuda V ST380023A" "ST39111A" 194 C "Seagate ST39111A (from Sun Ultra)" "ST3120020A" 194 C "Seagate ST3120020A" "ST3120022A" 194 C "Seagate Baraccuda 7200.7 120GB" "ST3120023A" 194 C "Seagate Barracuda V ST3120023A" "ST3120024A" 194 C "Seagate Barracuda V ST3120024A" "ST3120026A" 194 C "Seagate Barracuda V ST3120026A" "ST3160023AS" 194 C "Seagate Barracuda V ST3160023AS (160Gb, Serial ATA)" "ST94011A" 194 C "Seagate ST94011A" ######################################## ############# TOSHIBA Laptops ######################################## "MK4313MAT" 220 C "Toshiba MK4313MAT" "TOSHIBA MK1517GAP" 0 C "Toshiba MK1517GAP" "TOSHIBA MK3017GAP" 0 C "Toshiba MK3017GAP" "TOSHIBA MK3021GAS" 194 C "Toshiba MK3021GAS" #"TOSHIBA MK4019GAX" 222 C "Toshiba MK4019GAX" "TOSHIBA MK6021GAS" 194 C "Toshiba MK6021GAS" "TOSHIBA MK2018GAS" 226 F "Toshiba MK2018GAS" "TOSHIBA MK6022GAX" 194 C "Toshiba MK6022GAX" ######################################## ############# Western Digital drives ######################################## # WDC AC310100B and WDC AC2850F are reported not working # no more informations were given "WDC WD200BB-00AUA1" 0 C "Western Digital Caviar WD200BB" "WDC WD360GD-00FNA0" 194 C "Western Digital SATA Raptor 36.7GB" "WDC WD400BB-(18CA|00DE)A0" 0 C "Western Digital Caviar WD400BB" "WDC WD600BB-32BSA0" 0 C "Western Digital 600BB-32BSA0" "WDC WD800BB-00CAA1" 0 C "Western Digital WD800BB-00CAA1" "WDC WD800BB-22DKA0" 194 C "Western Digital 800BB-22DKA0" "WDC WD100EB-00BHF0" 0 C "Western Digital 100EB-00BHF0" "WDC WD400EB-00CPF0" 0 C "Western Digital 400EB-00CPF0" "WDC WD800JB-00ETA0" 194 C "Western Digital 80GB Special Edition 8MB" "WDC WD1600JB-00EVA0" 194 C "Western Digital 160GB Special Edition 8MB" "WDC WD2000JB-34EVA0" 194 C "Western Digital 200GB Special Edition 8MB" "WDC WD2500JB-32FUA0" 194 C "Western Digital 250GB Special Edition 8MB" "WDC AC420400D" 231 C "Western Digital Caviar AC420400D" "WDC AC418000D" 231 C "Western Digital AC418000D" "WDC WD135BA" 231 C "Wetsern Digital WD135BA" # not sure for next # "WDC WD800JB-00CRA1" 9 C "Western Digital Caviar WD800JB" # "WDC WD800JB-00CRA1" 199 C "Western Digital Caviar WD800JB" # "WDC WD1200JB-00CRA1" 9 C "Western Digital 1200JB-00CRA1" # "WDC WD273BA" 9 C "Western Digital WD273BA" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hddtemp/FC-1/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:33:49 -0000 1.3 +++ .cvsignore 22 Jan 2005 13:32:11 -0000 1.4 @@ -1,2 +1 @@ hddtemp-0.3-beta12.tar.bz2 -hddtemp.db Index: sources =================================================================== RCS file: /cvs/extras/rpms/hddtemp/FC-1/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:33:49 -0000 1.3 +++ sources 22 Jan 2005 13:32:11 -0000 1.4 @@ -1,2 +1 @@ 51f19658fa6e745eee62f6e100838884 hddtemp-0.3-beta12.tar.bz2 -4cd1caa5573efae5eedd36ee91b41b2c hddtemp.db From fedora-extras-commits at redhat.com Sat Jan 22 13:32:13 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 22 Jan 2005 08:32:13 -0500 Subject: rpms/hddtemp/RHL-8 hddtemp.db, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200501221332.j0MDWD7p016663@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/hddtemp/RHL-8 In directory cvs.fedora.redhat.com:/tmp/cvs-serv16639/RHL-8 Modified Files: .cvsignore sources Added Files: hddtemp.db Log Message: Move hddtemp.db from lookaside cache to CVS for reproducible builds. It's an upstream text file whose name doesn't change between revisions. --- NEW FILE hddtemp.db --- # # DATABASE VERSION 03C (01/01/2004) # # Insert a regular expression for support of the model or the serie of your hard drive. # If you don't know what to put in the second field, put the number # that appears most often for your brand :o) # A value of zero meens that we know that the drive doesn't have # a temperature sensor (you can set the unit to C or F). # ############################################################################ # The following list was found at (http://www.almico.com/sfhardware.php) # If your drive is in the list send me a mail. # # Manufacturer Model Size Notes # FUJITSU FUJITSU MPF3102AH 10.0GB # FUJITSU FUJITSU MPG3204AH E 20.0GB # FUJITSU FUJITSU MPG3307AT 30.0GB # FUJITSU FUJITSU MPG3409AH 40.0GB # FUJITSU FUJITSU MPG3409AH EF 40.0GB # HITACHI HITACHI_DK23CA-10 9.8GB # HITACHI HITACHI_DK23CA-15 14.7GB # HITACHI HITACHI_DK23CA-30 29.3GB # MAXTOR MAXTOR 4K020H1 19.9GB # SAMSUNG SAMSUNG SV3012H 29.4GB # SEAGATE ST310210A 10.0GB # SEAGATE ST310211A 9.8GB # SEAGATE ST310215A 10.0GB # SEAGATE ST315320A 14.9GB # SEAGATE ST320410A 19.6GB # SEAGATE ST320413A 19.6GB # SEAGATE ST320420A 19.9GB # SEAGATE ST330610A 29.3GB # SEAGATE ST330620A 29.3GB # SEAGATE ST330621A 29.3GB # SEAGATE ST330630A 29.9GB # SEAGATE ST340016A 39.1GB # SEAGATE ST340810ACE 39.1GB # SEAGATE ST380020ACE 78.2GB # SEAGATE ST380021A 78.2GB # WESTERN DIGITAL WDC AC210200D 10.0GB # WESTERN DIGITAL WDC AC29100D 8.9GB # WESTERN DIGITAL WDC AC420400D 19.9GB # WESTERN DIGITAL WDC WD102AA 10.0GB # ################################################# ######################################## ############# Fujitsu drives ######################################## "FUJITSU MHM2100AT" 0 C "Fujitsu MHM2100AT" "FUJITSU MHN2200AT" 194 C "Fujitsu MHN2200AT" "FUJITSU MHN2300AT" 194 C "Fujitsu MHN2300AT" "FUJITSU MHR2020AT" 194 C "Fujitsu MHR2020AT" "FUJITSU MHR2030AT" 194 C "Fujitsu MHR2030AT" "FUJITSU MHS2030AT" 194 C "Fujitsu MHS2030AT" "FUJITSU MHS2040AT" 194 C "Fujitsu MHS2040AT" "FUJITSU MHS2060AT" 194 C "Fujitsu MHS2060AT (Apple PowerBook G4)" "FUJITSU MHT2030AT" 194 C "Fujitsu MHT2030AT" "FUJITSU MHT2040AT" 194 C "Fujitsu MHT2040AT" "FUJITSU MPF3204AH" 194 C "Fujitsu MPF3204AH" "FUJITSU MPG3204AT.*" 194 C "Fujitsu MPG3204AT" "FUJITSU MPG3307AT" 194 C "Fujitsu MPG3307AT" "FUJITSU MPG3409AT.*" 194 C "Fujitsu MPG3409AT E" "FUJITSU MPG3409AH.*" 194 C "Fujitsu MPG3409AH E" "FUJITSU MPG3204AH" 194 C "Fujitsu MPG3204AH" ######################################## ############# Hitachi drives ######################################## "HITACHI_DK228A-65" 0 C "Hitachi DK228A-65" "HITACHI_DK23CA-20" 194 C "Hitachi DK23CA-20" "HITACHI_DK23CA-30B" 194 C "Hitachi DK23CA-30B" "HITACHI_DK23CA-75" 194 C "Hitachi DK23CA-75" "HITACHI_DK23DA-[234]0" 194 C "Hitachi DK23DA series" "HITACHI_DK23EA-[346]0" 194 C "Hitachi DK23EA series" "HITACHI_DK23FB-60" 194 C "Hitachi DK23FB60" "HTS726060M9AT00" 194 C "Hitachi Travelstar 60GB" ######################################## ############# IBM drives ######################################## # DJSA serie is using F0h command to report temperature and also have # SMART capabilties but it was reported not to work. # "DJSA-2(30|32|10|20|05)" 0 C "IBM Travelstar 20GN, 32GH, 30GT series" "IBM-DARA-212000" 0 C "IBM Travelstar 12GN" "IBM-DTTA-35*" 0 C "IBM Deskstar 16GP serie" # according to specifications they do not seems to have sensor # but I prefer waiting for a report #"IBM-DTTA-37*" 0 C "IBM Deskstar 14GXP serie" "IBM-DJNA-35.*" 231 C "IBM Deskstar 25 GP serie" "IBM-DJNA-37.*" 231 C "IBM Deskstar 22 GXP serie" "IBM-DHEA-(34330|36480)" 0 C "IBM Deskstar 5 serie" "IBM-DHEA-(34331|36481|38451)" 0 C "IBM Deskstar 8 serie" "IBM-DPTA-37.*" 231 C "IBM Deskstar 34GXP serie" "IBM-DPTA-35.*" 231 C "IBM Deskstar 37GP serie" "IBM-DTLA-30[57]0[123467][05]" 194 C "IBM Deskstar 40GV & 75GXP series" "IC25N0[1234]0ATCS04-0" 194 C "IBM Travelstar 40GN serie" "IC25N0[24]0ATC[SX]05-0" 194 C "IBM Travelstar 40GNX serie" "IC25N0(15|20|30)ATDA04-0" 194 C "IBM Travelstar 30GN serie" "IC25T048ATDA05-0" 194 C "IBM Travelstar 48GH serie" "IC25T060ATC[SX]05-0" 194 C "IBM Travelstar 60GH serie" "IC35L0[12346]0AVER07" 194 C "IBM Deskstar 60GXP serie" "IC35L[01][02468]0AVV[AN]07*" 194 C "IBM Deskstar 120GXP serie" "IC35L[01][23689]0AVV207*" 194 C "IBM Deskstar 180GXP serie" ######################################## ############# Maxtor drives ######################################## #"Maxtor 2B0[012][04568]H1" ??? C "Maxtor Fireball 541DX" "Maxtor 2F020J0" 194 C "Maxtor 2F020J0" "Maxtor 2F030J0" 194 C "Maxtor 2F030J0" # which one must I trust ? #"Maxtor 4D040H2" 9 C "Maxtor DiamondMax D540X-4D" #"Maxtor 4D040H2" 0 C "Maxtor 4D040H2" #"Maxtor 4D080H4" 12 C "Maxtor DiamondMax D540X-4D" #"Maxtor 4D080H4" 9 C "Maxtor DiamondMax D540X-4D" "MAXTOR 4K0[468]0H[234]" 194 C "Maxtor DiamondMax D540X serie" "Maxtor 4[RA](16|12|08|06)0[LJ]0" 194 C "Maxtor DiamondMax 16" "Maxtor 51024U2" 0 C "Maxtor DiamondMax Plus 40" "Maxtor 5A250J0" 194 C "Maxtor Maxline 2 250GB 5400RPM" "Maxtor 5T0[24]0H[24]" 0 C "Maxtor DiamondMax Plus 60" "Maxtor 6E0[234]0L0" 194 C "Maxtor DiamondMax Plus 8" "MAXTOR 6L0[2468]0[LJ][1234]" 194 C "Maxtor DiamondMax Plus D740X family" "Maxtor 6Y(06|08|12|16|20)0[LPM]0" 194 C "Maxtor DiamondMax Plus 9" "Maxtor 94098U8" 11 C "Maxtor DiamondMax 40 94098U8" ######################################## ############# Quantum drives ######################################## "QUANTUM FIREBALLP AS40.0" 0 C "Quantum Fireball AS40" "QUANTUM FIREBALL CX10.2A" 0 C "Quantum Fireball CX10.2A" #"QUANTUM FIREBALLlct10 20" 4 C "Quantum Fireball CT10 20GB" # I suspect the QUANTUM FIREBALL_TM2110A to have a sensor in field 9... # "QUANTUM FIREBALL_TM2110A" 9 C "Quantum Fireball TM2110A" ######################################## ############# Samsung drives ######################################## # somenone reported a problem with the SP8004H which reports a temperature # 10?C below the ambient temperature "SAMSUNG SW0434A" 0 C "Samsung SW0434A" "SAMSUNG SP(2001|4002|6003|8004|40A2)H" 194 C "Samsung SpinPoint P40 serie" "SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)N" 194 C "Samsung SpinPoint P80 serie" "SAMSUNG SV0432A" 0 C "Samsung SV0432A" "SAMSUNG SV3002H" 0 C "Samsung SpinPoint V30 serie" "SAMSUNG SV(2001|4002|6003|8004)H" 194 C "Samsung SpinPoint V40 serie" #"SAMSUNG SV(0221|0602|0813|1204)H" 9 C "Samsung SpinPoint V60 serie" #"SAMSUNG SV1204H" 194 C "Samsung 120G" "SAMSUNG SV(0401|0802|1203|1604)N" 194 C "Samsung SpinPoint V80 serie" ######################################## ############# Seagate drives ######################################## "Seagate Technology 1275MB - ST31276A" 0 C "Seagate ST31276A" "ST3412A" 0 C "Seagate ST3412A" "ST38641A" 0 C "Seagate ST38641A" "ST310210A" 0 C "Seagate ST310210A" "ST310211A" 194 C "Seagate ST310211A" "ST310220A" 0 C "Seagate ST310220A" # SEAGATE ST313021A 13.0GB "ST313021A" 0 C "Seagate U8 ST313021A" "ST310240A" 0 C "Seagate Medalist 10240 Ultra ATA-3" "ST315320A" 194 C "Seagate ST315320A" "ST320423A" 0 C "Seagate U10 20423, Ultra ATA/66" "ST320011A" 194 C "Seagate ST320011A" "ST320014A" 194 C "Seagate ST320014A (5400 rpm, 20Gb)" "ST320410A" 194 C "Seagate ST320410A" "ST320413A" 194 C "Seagate ST320413A" "ST320414A" 194 C "Seagate ST320414A" "ST320420A" 194 C "Seagate Barracuda II ST320420A" "ST330620A" 194 C "Seagate ST330620A" "ST330621A" 194 C "Seagate ST330621A" "ST330630A" 194 C "Seagate Barracuda ST330630A" "ST340014A" 194 C "Seagate Barracuda 7200.7 40Gb" "ST340016A" 194 C "Seagate ST340016A" "ST340810A" 194 C "Seagate U Series 40810 (40Gb, Ultra ATA/100, 5400 rpm)" "ST340823A" 194 C "Seagate U Series 5 40823" "ST340824A" 194 C "Seagate Barracuda III" "ST360015A" 194 C "Seagate Barracuda V ST360015A" "ST360020A" 194 C "Seagate U Series 60020" "ST360021A" 194 C "Seagate Barracuda IV ST360021A" "ST380011A" 194 C "Seagate Barracuda 7200.7 80GB" "ST380013AS" 194 C "Seagate Barracuda 7200.7 80GB (Serial ATA)" "ST380020A" 194 C "Seagate U Series 80020 (80Gb, Ultra ATA/100, 5400 rpm)" "ST380021A" 194 C "Seagate Barracuda IV ST380021A" "ST380023A" 194 C "Seagate Barracuda V ST380023A" "ST39111A" 194 C "Seagate ST39111A (from Sun Ultra)" "ST3120020A" 194 C "Seagate ST3120020A" "ST3120022A" 194 C "Seagate Baraccuda 7200.7 120GB" "ST3120023A" 194 C "Seagate Barracuda V ST3120023A" "ST3120024A" 194 C "Seagate Barracuda V ST3120024A" "ST3120026A" 194 C "Seagate Barracuda V ST3120026A" "ST3160023AS" 194 C "Seagate Barracuda V ST3160023AS (160Gb, Serial ATA)" "ST94011A" 194 C "Seagate ST94011A" ######################################## ############# TOSHIBA Laptops ######################################## "MK4313MAT" 220 C "Toshiba MK4313MAT" "TOSHIBA MK1517GAP" 0 C "Toshiba MK1517GAP" "TOSHIBA MK3017GAP" 0 C "Toshiba MK3017GAP" "TOSHIBA MK3021GAS" 194 C "Toshiba MK3021GAS" #"TOSHIBA MK4019GAX" 222 C "Toshiba MK4019GAX" "TOSHIBA MK6021GAS" 194 C "Toshiba MK6021GAS" "TOSHIBA MK2018GAS" 226 F "Toshiba MK2018GAS" "TOSHIBA MK6022GAX" 194 C "Toshiba MK6022GAX" ######################################## ############# Western Digital drives ######################################## # WDC AC310100B and WDC AC2850F are reported not working # no more informations were given "WDC WD200BB-00AUA1" 0 C "Western Digital Caviar WD200BB" "WDC WD360GD-00FNA0" 194 C "Western Digital SATA Raptor 36.7GB" "WDC WD400BB-(18CA|00DE)A0" 0 C "Western Digital Caviar WD400BB" "WDC WD600BB-32BSA0" 0 C "Western Digital 600BB-32BSA0" "WDC WD800BB-00CAA1" 0 C "Western Digital WD800BB-00CAA1" "WDC WD800BB-22DKA0" 194 C "Western Digital 800BB-22DKA0" "WDC WD100EB-00BHF0" 0 C "Western Digital 100EB-00BHF0" "WDC WD400EB-00CPF0" 0 C "Western Digital 400EB-00CPF0" "WDC WD800JB-00ETA0" 194 C "Western Digital 80GB Special Edition 8MB" "WDC WD1600JB-00EVA0" 194 C "Western Digital 160GB Special Edition 8MB" "WDC WD2000JB-34EVA0" 194 C "Western Digital 200GB Special Edition 8MB" "WDC WD2500JB-32FUA0" 194 C "Western Digital 250GB Special Edition 8MB" "WDC AC420400D" 231 C "Western Digital Caviar AC420400D" "WDC AC418000D" 231 C "Western Digital AC418000D" "WDC WD135BA" 231 C "Wetsern Digital WD135BA" # not sure for next # "WDC WD800JB-00CRA1" 9 C "Western Digital Caviar WD800JB" # "WDC WD800JB-00CRA1" 199 C "Western Digital Caviar WD800JB" # "WDC WD1200JB-00CRA1" 9 C "Western Digital 1200JB-00CRA1" # "WDC WD273BA" 9 C "Western Digital WD273BA" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hddtemp/RHL-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:33:28 -0000 1.2 +++ .cvsignore 22 Jan 2005 13:32:11 -0000 1.3 @@ -1,2 +1 @@ hddtemp-0.3-beta11.tar.gz -hddtemp.db Index: sources =================================================================== RCS file: /cvs/extras/rpms/hddtemp/RHL-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:33:28 -0000 1.2 +++ sources 22 Jan 2005 13:32:11 -0000 1.3 @@ -1,2 +1 @@ 79851534a7557a22418a3510a8f22234 hddtemp-0.3-beta11.tar.gz -f816512c3feee3cc9a92a9a8d27e9cff hddtemp.db From fedora-extras-commits at redhat.com Sat Jan 22 13:32:13 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 22 Jan 2005 08:32:13 -0500 Subject: rpms/hddtemp/RHL-9 hddtemp.db, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200501221332.j0MDWDo5016671@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/hddtemp/RHL-9 In directory cvs.fedora.redhat.com:/tmp/cvs-serv16639/RHL-9 Modified Files: .cvsignore sources Added Files: hddtemp.db Log Message: Move hddtemp.db from lookaside cache to CVS for reproducible builds. It's an upstream text file whose name doesn't change between revisions. --- NEW FILE hddtemp.db --- # # DATABASE VERSION 03C (01/01/2004) # # Insert a regular expression for support of the model or the serie of your hard drive. # If you don't know what to put in the second field, put the number # that appears most often for your brand :o) # A value of zero meens that we know that the drive doesn't have # a temperature sensor (you can set the unit to C or F). # ############################################################################ # The following list was found at (http://www.almico.com/sfhardware.php) # If your drive is in the list send me a mail. # # Manufacturer Model Size Notes # FUJITSU FUJITSU MPF3102AH 10.0GB # FUJITSU FUJITSU MPG3204AH E 20.0GB # FUJITSU FUJITSU MPG3307AT 30.0GB # FUJITSU FUJITSU MPG3409AH 40.0GB # FUJITSU FUJITSU MPG3409AH EF 40.0GB # HITACHI HITACHI_DK23CA-10 9.8GB # HITACHI HITACHI_DK23CA-15 14.7GB # HITACHI HITACHI_DK23CA-30 29.3GB # MAXTOR MAXTOR 4K020H1 19.9GB # SAMSUNG SAMSUNG SV3012H 29.4GB # SEAGATE ST310210A 10.0GB # SEAGATE ST310211A 9.8GB # SEAGATE ST310215A 10.0GB # SEAGATE ST315320A 14.9GB # SEAGATE ST320410A 19.6GB # SEAGATE ST320413A 19.6GB # SEAGATE ST320420A 19.9GB # SEAGATE ST330610A 29.3GB # SEAGATE ST330620A 29.3GB # SEAGATE ST330621A 29.3GB # SEAGATE ST330630A 29.9GB # SEAGATE ST340016A 39.1GB # SEAGATE ST340810ACE 39.1GB # SEAGATE ST380020ACE 78.2GB # SEAGATE ST380021A 78.2GB # WESTERN DIGITAL WDC AC210200D 10.0GB # WESTERN DIGITAL WDC AC29100D 8.9GB # WESTERN DIGITAL WDC AC420400D 19.9GB # WESTERN DIGITAL WDC WD102AA 10.0GB # ################################################# ######################################## ############# Fujitsu drives ######################################## "FUJITSU MHM2100AT" 0 C "Fujitsu MHM2100AT" "FUJITSU MHN2200AT" 194 C "Fujitsu MHN2200AT" "FUJITSU MHN2300AT" 194 C "Fujitsu MHN2300AT" "FUJITSU MHR2020AT" 194 C "Fujitsu MHR2020AT" "FUJITSU MHR2030AT" 194 C "Fujitsu MHR2030AT" "FUJITSU MHS2030AT" 194 C "Fujitsu MHS2030AT" "FUJITSU MHS2040AT" 194 C "Fujitsu MHS2040AT" "FUJITSU MHS2060AT" 194 C "Fujitsu MHS2060AT (Apple PowerBook G4)" "FUJITSU MHT2030AT" 194 C "Fujitsu MHT2030AT" "FUJITSU MHT2040AT" 194 C "Fujitsu MHT2040AT" "FUJITSU MPF3204AH" 194 C "Fujitsu MPF3204AH" "FUJITSU MPG3204AT.*" 194 C "Fujitsu MPG3204AT" "FUJITSU MPG3307AT" 194 C "Fujitsu MPG3307AT" "FUJITSU MPG3409AT.*" 194 C "Fujitsu MPG3409AT E" "FUJITSU MPG3409AH.*" 194 C "Fujitsu MPG3409AH E" "FUJITSU MPG3204AH" 194 C "Fujitsu MPG3204AH" ######################################## ############# Hitachi drives ######################################## "HITACHI_DK228A-65" 0 C "Hitachi DK228A-65" "HITACHI_DK23CA-20" 194 C "Hitachi DK23CA-20" "HITACHI_DK23CA-30B" 194 C "Hitachi DK23CA-30B" "HITACHI_DK23CA-75" 194 C "Hitachi DK23CA-75" "HITACHI_DK23DA-[234]0" 194 C "Hitachi DK23DA series" "HITACHI_DK23EA-[346]0" 194 C "Hitachi DK23EA series" "HITACHI_DK23FB-60" 194 C "Hitachi DK23FB60" "HTS726060M9AT00" 194 C "Hitachi Travelstar 60GB" ######################################## ############# IBM drives ######################################## # DJSA serie is using F0h command to report temperature and also have # SMART capabilties but it was reported not to work. # "DJSA-2(30|32|10|20|05)" 0 C "IBM Travelstar 20GN, 32GH, 30GT series" "IBM-DARA-212000" 0 C "IBM Travelstar 12GN" "IBM-DTTA-35*" 0 C "IBM Deskstar 16GP serie" # according to specifications they do not seems to have sensor # but I prefer waiting for a report #"IBM-DTTA-37*" 0 C "IBM Deskstar 14GXP serie" "IBM-DJNA-35.*" 231 C "IBM Deskstar 25 GP serie" "IBM-DJNA-37.*" 231 C "IBM Deskstar 22 GXP serie" "IBM-DHEA-(34330|36480)" 0 C "IBM Deskstar 5 serie" "IBM-DHEA-(34331|36481|38451)" 0 C "IBM Deskstar 8 serie" "IBM-DPTA-37.*" 231 C "IBM Deskstar 34GXP serie" "IBM-DPTA-35.*" 231 C "IBM Deskstar 37GP serie" "IBM-DTLA-30[57]0[123467][05]" 194 C "IBM Deskstar 40GV & 75GXP series" "IC25N0[1234]0ATCS04-0" 194 C "IBM Travelstar 40GN serie" "IC25N0[24]0ATC[SX]05-0" 194 C "IBM Travelstar 40GNX serie" "IC25N0(15|20|30)ATDA04-0" 194 C "IBM Travelstar 30GN serie" "IC25T048ATDA05-0" 194 C "IBM Travelstar 48GH serie" "IC25T060ATC[SX]05-0" 194 C "IBM Travelstar 60GH serie" "IC35L0[12346]0AVER07" 194 C "IBM Deskstar 60GXP serie" "IC35L[01][02468]0AVV[AN]07*" 194 C "IBM Deskstar 120GXP serie" "IC35L[01][23689]0AVV207*" 194 C "IBM Deskstar 180GXP serie" ######################################## ############# Maxtor drives ######################################## #"Maxtor 2B0[012][04568]H1" ??? C "Maxtor Fireball 541DX" "Maxtor 2F020J0" 194 C "Maxtor 2F020J0" "Maxtor 2F030J0" 194 C "Maxtor 2F030J0" # which one must I trust ? #"Maxtor 4D040H2" 9 C "Maxtor DiamondMax D540X-4D" #"Maxtor 4D040H2" 0 C "Maxtor 4D040H2" #"Maxtor 4D080H4" 12 C "Maxtor DiamondMax D540X-4D" #"Maxtor 4D080H4" 9 C "Maxtor DiamondMax D540X-4D" "MAXTOR 4K0[468]0H[234]" 194 C "Maxtor DiamondMax D540X serie" "Maxtor 4[RA](16|12|08|06)0[LJ]0" 194 C "Maxtor DiamondMax 16" "Maxtor 51024U2" 0 C "Maxtor DiamondMax Plus 40" "Maxtor 5A250J0" 194 C "Maxtor Maxline 2 250GB 5400RPM" "Maxtor 5T0[24]0H[24]" 0 C "Maxtor DiamondMax Plus 60" "Maxtor 6E0[234]0L0" 194 C "Maxtor DiamondMax Plus 8" "MAXTOR 6L0[2468]0[LJ][1234]" 194 C "Maxtor DiamondMax Plus D740X family" "Maxtor 6Y(06|08|12|16|20)0[LPM]0" 194 C "Maxtor DiamondMax Plus 9" "Maxtor 94098U8" 11 C "Maxtor DiamondMax 40 94098U8" ######################################## ############# Quantum drives ######################################## "QUANTUM FIREBALLP AS40.0" 0 C "Quantum Fireball AS40" "QUANTUM FIREBALL CX10.2A" 0 C "Quantum Fireball CX10.2A" #"QUANTUM FIREBALLlct10 20" 4 C "Quantum Fireball CT10 20GB" # I suspect the QUANTUM FIREBALL_TM2110A to have a sensor in field 9... # "QUANTUM FIREBALL_TM2110A" 9 C "Quantum Fireball TM2110A" ######################################## ############# Samsung drives ######################################## # somenone reported a problem with the SP8004H which reports a temperature # 10?C below the ambient temperature "SAMSUNG SW0434A" 0 C "Samsung SW0434A" "SAMSUNG SP(2001|4002|6003|8004|40A2)H" 194 C "Samsung SpinPoint P40 serie" "SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)N" 194 C "Samsung SpinPoint P80 serie" "SAMSUNG SV0432A" 0 C "Samsung SV0432A" "SAMSUNG SV3002H" 0 C "Samsung SpinPoint V30 serie" "SAMSUNG SV(2001|4002|6003|8004)H" 194 C "Samsung SpinPoint V40 serie" #"SAMSUNG SV(0221|0602|0813|1204)H" 9 C "Samsung SpinPoint V60 serie" #"SAMSUNG SV1204H" 194 C "Samsung 120G" "SAMSUNG SV(0401|0802|1203|1604)N" 194 C "Samsung SpinPoint V80 serie" ######################################## ############# Seagate drives ######################################## "Seagate Technology 1275MB - ST31276A" 0 C "Seagate ST31276A" "ST3412A" 0 C "Seagate ST3412A" "ST38641A" 0 C "Seagate ST38641A" "ST310210A" 0 C "Seagate ST310210A" "ST310211A" 194 C "Seagate ST310211A" "ST310220A" 0 C "Seagate ST310220A" # SEAGATE ST313021A 13.0GB "ST313021A" 0 C "Seagate U8 ST313021A" "ST310240A" 0 C "Seagate Medalist 10240 Ultra ATA-3" "ST315320A" 194 C "Seagate ST315320A" "ST320423A" 0 C "Seagate U10 20423, Ultra ATA/66" "ST320011A" 194 C "Seagate ST320011A" "ST320014A" 194 C "Seagate ST320014A (5400 rpm, 20Gb)" "ST320410A" 194 C "Seagate ST320410A" "ST320413A" 194 C "Seagate ST320413A" "ST320414A" 194 C "Seagate ST320414A" "ST320420A" 194 C "Seagate Barracuda II ST320420A" "ST330620A" 194 C "Seagate ST330620A" "ST330621A" 194 C "Seagate ST330621A" "ST330630A" 194 C "Seagate Barracuda ST330630A" "ST340014A" 194 C "Seagate Barracuda 7200.7 40Gb" "ST340016A" 194 C "Seagate ST340016A" "ST340810A" 194 C "Seagate U Series 40810 (40Gb, Ultra ATA/100, 5400 rpm)" "ST340823A" 194 C "Seagate U Series 5 40823" "ST340824A" 194 C "Seagate Barracuda III" "ST360015A" 194 C "Seagate Barracuda V ST360015A" "ST360020A" 194 C "Seagate U Series 60020" "ST360021A" 194 C "Seagate Barracuda IV ST360021A" "ST380011A" 194 C "Seagate Barracuda 7200.7 80GB" "ST380013AS" 194 C "Seagate Barracuda 7200.7 80GB (Serial ATA)" "ST380020A" 194 C "Seagate U Series 80020 (80Gb, Ultra ATA/100, 5400 rpm)" "ST380021A" 194 C "Seagate Barracuda IV ST380021A" "ST380023A" 194 C "Seagate Barracuda V ST380023A" "ST39111A" 194 C "Seagate ST39111A (from Sun Ultra)" "ST3120020A" 194 C "Seagate ST3120020A" "ST3120022A" 194 C "Seagate Baraccuda 7200.7 120GB" "ST3120023A" 194 C "Seagate Barracuda V ST3120023A" "ST3120024A" 194 C "Seagate Barracuda V ST3120024A" "ST3120026A" 194 C "Seagate Barracuda V ST3120026A" "ST3160023AS" 194 C "Seagate Barracuda V ST3160023AS (160Gb, Serial ATA)" "ST94011A" 194 C "Seagate ST94011A" ######################################## ############# TOSHIBA Laptops ######################################## "MK4313MAT" 220 C "Toshiba MK4313MAT" "TOSHIBA MK1517GAP" 0 C "Toshiba MK1517GAP" "TOSHIBA MK3017GAP" 0 C "Toshiba MK3017GAP" "TOSHIBA MK3021GAS" 194 C "Toshiba MK3021GAS" #"TOSHIBA MK4019GAX" 222 C "Toshiba MK4019GAX" "TOSHIBA MK6021GAS" 194 C "Toshiba MK6021GAS" "TOSHIBA MK2018GAS" 226 F "Toshiba MK2018GAS" "TOSHIBA MK6022GAX" 194 C "Toshiba MK6022GAX" ######################################## ############# Western Digital drives ######################################## # WDC AC310100B and WDC AC2850F are reported not working # no more informations were given "WDC WD200BB-00AUA1" 0 C "Western Digital Caviar WD200BB" "WDC WD360GD-00FNA0" 194 C "Western Digital SATA Raptor 36.7GB" "WDC WD400BB-(18CA|00DE)A0" 0 C "Western Digital Caviar WD400BB" "WDC WD600BB-32BSA0" 0 C "Western Digital 600BB-32BSA0" "WDC WD800BB-00CAA1" 0 C "Western Digital WD800BB-00CAA1" "WDC WD800BB-22DKA0" 194 C "Western Digital 800BB-22DKA0" "WDC WD100EB-00BHF0" 0 C "Western Digital 100EB-00BHF0" "WDC WD400EB-00CPF0" 0 C "Western Digital 400EB-00CPF0" "WDC WD800JB-00ETA0" 194 C "Western Digital 80GB Special Edition 8MB" "WDC WD1600JB-00EVA0" 194 C "Western Digital 160GB Special Edition 8MB" "WDC WD2000JB-34EVA0" 194 C "Western Digital 200GB Special Edition 8MB" "WDC WD2500JB-32FUA0" 194 C "Western Digital 250GB Special Edition 8MB" "WDC AC420400D" 231 C "Western Digital Caviar AC420400D" "WDC AC418000D" 231 C "Western Digital AC418000D" "WDC WD135BA" 231 C "Wetsern Digital WD135BA" # not sure for next # "WDC WD800JB-00CRA1" 9 C "Western Digital Caviar WD800JB" # "WDC WD800JB-00CRA1" 199 C "Western Digital Caviar WD800JB" # "WDC WD1200JB-00CRA1" 9 C "Western Digital 1200JB-00CRA1" # "WDC WD273BA" 9 C "Western Digital WD273BA" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hddtemp/RHL-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:33:28 -0000 1.2 +++ .cvsignore 22 Jan 2005 13:32:11 -0000 1.3 @@ -1,2 +1 @@ hddtemp-0.3-beta11.tar.gz -hddtemp.db Index: sources =================================================================== RCS file: /cvs/extras/rpms/hddtemp/RHL-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:33:28 -0000 1.2 +++ sources 22 Jan 2005 13:32:11 -0000 1.3 @@ -1,2 +1 @@ 79851534a7557a22418a3510a8f22234 hddtemp-0.3-beta11.tar.gz -f816512c3feee3cc9a92a9a8d27e9cff hddtemp.db From fedora-extras-commits at redhat.com Sat Jan 22 13:32:13 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 22 Jan 2005 08:32:13 -0500 Subject: rpms/hddtemp/devel hddtemp.db, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200501221332.j0MDWDSP016676@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/hddtemp/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv16639/devel Modified Files: .cvsignore sources Added Files: hddtemp.db Log Message: Move hddtemp.db from lookaside cache to CVS for reproducible builds. It's an upstream text file whose name doesn't change between revisions. --- NEW FILE hddtemp.db --- # # DATABASE VERSION 03C (01/01/2004) # # Insert a regular expression for support of the model or the serie of your hard drive. # If you don't know what to put in the second field, put the number # that appears most often for your brand :o) # A value of zero meens that we know that the drive doesn't have # a temperature sensor (you can set the unit to C or F). # ############################################################################ # The following list was found at (http://www.almico.com/sfhardware.php) # If your drive is in the list send me a mail. # # Manufacturer Model Size Notes # FUJITSU FUJITSU MPF3102AH 10.0GB # FUJITSU FUJITSU MPG3204AH E 20.0GB # FUJITSU FUJITSU MPG3307AT 30.0GB # FUJITSU FUJITSU MPG3409AH 40.0GB # FUJITSU FUJITSU MPG3409AH EF 40.0GB # HITACHI HITACHI_DK23CA-10 9.8GB # HITACHI HITACHI_DK23CA-15 14.7GB # HITACHI HITACHI_DK23CA-30 29.3GB # MAXTOR MAXTOR 4K020H1 19.9GB # SAMSUNG SAMSUNG SV3012H 29.4GB # SEAGATE ST310210A 10.0GB # SEAGATE ST310211A 9.8GB # SEAGATE ST310215A 10.0GB # SEAGATE ST315320A 14.9GB # SEAGATE ST320410A 19.6GB # SEAGATE ST320413A 19.6GB # SEAGATE ST320420A 19.9GB # SEAGATE ST330610A 29.3GB # SEAGATE ST330620A 29.3GB # SEAGATE ST330621A 29.3GB # SEAGATE ST330630A 29.9GB # SEAGATE ST340016A 39.1GB # SEAGATE ST340810ACE 39.1GB # SEAGATE ST380020ACE 78.2GB # SEAGATE ST380021A 78.2GB # WESTERN DIGITAL WDC AC210200D 10.0GB # WESTERN DIGITAL WDC AC29100D 8.9GB # WESTERN DIGITAL WDC AC420400D 19.9GB # WESTERN DIGITAL WDC WD102AA 10.0GB # ################################################# ######################################## ############# Fujitsu drives ######################################## "FUJITSU MHM2100AT" 0 C "Fujitsu MHM2100AT" "FUJITSU MHN2200AT" 194 C "Fujitsu MHN2200AT" "FUJITSU MHN2300AT" 194 C "Fujitsu MHN2300AT" "FUJITSU MHR2020AT" 194 C "Fujitsu MHR2020AT" "FUJITSU MHR2030AT" 194 C "Fujitsu MHR2030AT" "FUJITSU MHS2030AT" 194 C "Fujitsu MHS2030AT" "FUJITSU MHS2040AT" 194 C "Fujitsu MHS2040AT" "FUJITSU MHS2060AT" 194 C "Fujitsu MHS2060AT (Apple PowerBook G4)" "FUJITSU MHT2030AT" 194 C "Fujitsu MHT2030AT" "FUJITSU MHT2040AT" 194 C "Fujitsu MHT2040AT" "FUJITSU MPF3204AH" 194 C "Fujitsu MPF3204AH" "FUJITSU MPG3204AT.*" 194 C "Fujitsu MPG3204AT" "FUJITSU MPG3307AT" 194 C "Fujitsu MPG3307AT" "FUJITSU MPG3409AT.*" 194 C "Fujitsu MPG3409AT E" "FUJITSU MPG3409AH.*" 194 C "Fujitsu MPG3409AH E" "FUJITSU MPG3204AH" 194 C "Fujitsu MPG3204AH" ######################################## ############# Hitachi drives ######################################## "HITACHI_DK228A-65" 0 C "Hitachi DK228A-65" "HITACHI_DK23CA-20" 194 C "Hitachi DK23CA-20" "HITACHI_DK23CA-30B" 194 C "Hitachi DK23CA-30B" "HITACHI_DK23CA-75" 194 C "Hitachi DK23CA-75" "HITACHI_DK23DA-[234]0" 194 C "Hitachi DK23DA series" "HITACHI_DK23EA-[346]0" 194 C "Hitachi DK23EA series" "HITACHI_DK23FB-60" 194 C "Hitachi DK23FB60" "HTS726060M9AT00" 194 C "Hitachi Travelstar 60GB" ######################################## ############# IBM drives ######################################## # DJSA serie is using F0h command to report temperature and also have # SMART capabilties but it was reported not to work. # "DJSA-2(30|32|10|20|05)" 0 C "IBM Travelstar 20GN, 32GH, 30GT series" "IBM-DARA-212000" 0 C "IBM Travelstar 12GN" "IBM-DTTA-35*" 0 C "IBM Deskstar 16GP serie" # according to specifications they do not seems to have sensor # but I prefer waiting for a report #"IBM-DTTA-37*" 0 C "IBM Deskstar 14GXP serie" "IBM-DJNA-35.*" 231 C "IBM Deskstar 25 GP serie" "IBM-DJNA-37.*" 231 C "IBM Deskstar 22 GXP serie" "IBM-DHEA-(34330|36480)" 0 C "IBM Deskstar 5 serie" "IBM-DHEA-(34331|36481|38451)" 0 C "IBM Deskstar 8 serie" "IBM-DPTA-37.*" 231 C "IBM Deskstar 34GXP serie" "IBM-DPTA-35.*" 231 C "IBM Deskstar 37GP serie" "IBM-DTLA-30[57]0[123467][05]" 194 C "IBM Deskstar 40GV & 75GXP series" "IC25N0[1234]0ATCS04-0" 194 C "IBM Travelstar 40GN serie" "IC25N0[24]0ATC[SX]05-0" 194 C "IBM Travelstar 40GNX serie" "IC25N0(15|20|30)ATDA04-0" 194 C "IBM Travelstar 30GN serie" "IC25T048ATDA05-0" 194 C "IBM Travelstar 48GH serie" "IC25T060ATC[SX]05-0" 194 C "IBM Travelstar 60GH serie" "IC35L0[12346]0AVER07" 194 C "IBM Deskstar 60GXP serie" "IC35L[01][02468]0AVV[AN]07*" 194 C "IBM Deskstar 120GXP serie" "IC35L[01][23689]0AVV207*" 194 C "IBM Deskstar 180GXP serie" ######################################## ############# Maxtor drives ######################################## #"Maxtor 2B0[012][04568]H1" ??? C "Maxtor Fireball 541DX" "Maxtor 2F020J0" 194 C "Maxtor 2F020J0" "Maxtor 2F030J0" 194 C "Maxtor 2F030J0" # which one must I trust ? #"Maxtor 4D040H2" 9 C "Maxtor DiamondMax D540X-4D" #"Maxtor 4D040H2" 0 C "Maxtor 4D040H2" #"Maxtor 4D080H4" 12 C "Maxtor DiamondMax D540X-4D" #"Maxtor 4D080H4" 9 C "Maxtor DiamondMax D540X-4D" "MAXTOR 4K0[468]0H[234]" 194 C "Maxtor DiamondMax D540X serie" "Maxtor 4[RA](16|12|08|06)0[LJ]0" 194 C "Maxtor DiamondMax 16" "Maxtor 51024U2" 0 C "Maxtor DiamondMax Plus 40" "Maxtor 5A250J0" 194 C "Maxtor Maxline 2 250GB 5400RPM" "Maxtor 5T0[24]0H[24]" 0 C "Maxtor DiamondMax Plus 60" "Maxtor 6E0[234]0L0" 194 C "Maxtor DiamondMax Plus 8" "MAXTOR 6L0[2468]0[LJ][1234]" 194 C "Maxtor DiamondMax Plus D740X family" "Maxtor 6Y(06|08|12|16|20)0[LPM]0" 194 C "Maxtor DiamondMax Plus 9" "Maxtor 94098U8" 11 C "Maxtor DiamondMax 40 94098U8" ######################################## ############# Quantum drives ######################################## "QUANTUM FIREBALLP AS40.0" 0 C "Quantum Fireball AS40" "QUANTUM FIREBALL CX10.2A" 0 C "Quantum Fireball CX10.2A" #"QUANTUM FIREBALLlct10 20" 4 C "Quantum Fireball CT10 20GB" # I suspect the QUANTUM FIREBALL_TM2110A to have a sensor in field 9... # "QUANTUM FIREBALL_TM2110A" 9 C "Quantum Fireball TM2110A" ######################################## ############# Samsung drives ######################################## # somenone reported a problem with the SP8004H which reports a temperature # 10?C below the ambient temperature "SAMSUNG SW0434A" 0 C "Samsung SW0434A" "SAMSUNG SP(2001|4002|6003|8004|40A2)H" 194 C "Samsung SpinPoint P40 serie" "SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)N" 194 C "Samsung SpinPoint P80 serie" "SAMSUNG SV0432A" 0 C "Samsung SV0432A" "SAMSUNG SV3002H" 0 C "Samsung SpinPoint V30 serie" "SAMSUNG SV(2001|4002|6003|8004)H" 194 C "Samsung SpinPoint V40 serie" #"SAMSUNG SV(0221|0602|0813|1204)H" 9 C "Samsung SpinPoint V60 serie" #"SAMSUNG SV1204H" 194 C "Samsung 120G" "SAMSUNG SV(0401|0802|1203|1604)N" 194 C "Samsung SpinPoint V80 serie" ######################################## ############# Seagate drives ######################################## "Seagate Technology 1275MB - ST31276A" 0 C "Seagate ST31276A" "ST3412A" 0 C "Seagate ST3412A" "ST38641A" 0 C "Seagate ST38641A" "ST310210A" 0 C "Seagate ST310210A" "ST310211A" 194 C "Seagate ST310211A" "ST310220A" 0 C "Seagate ST310220A" # SEAGATE ST313021A 13.0GB "ST313021A" 0 C "Seagate U8 ST313021A" "ST310240A" 0 C "Seagate Medalist 10240 Ultra ATA-3" "ST315320A" 194 C "Seagate ST315320A" "ST320423A" 0 C "Seagate U10 20423, Ultra ATA/66" "ST320011A" 194 C "Seagate ST320011A" "ST320014A" 194 C "Seagate ST320014A (5400 rpm, 20Gb)" "ST320410A" 194 C "Seagate ST320410A" "ST320413A" 194 C "Seagate ST320413A" "ST320414A" 194 C "Seagate ST320414A" "ST320420A" 194 C "Seagate Barracuda II ST320420A" "ST330620A" 194 C "Seagate ST330620A" "ST330621A" 194 C "Seagate ST330621A" "ST330630A" 194 C "Seagate Barracuda ST330630A" "ST340014A" 194 C "Seagate Barracuda 7200.7 40Gb" "ST340016A" 194 C "Seagate ST340016A" "ST340810A" 194 C "Seagate U Series 40810 (40Gb, Ultra ATA/100, 5400 rpm)" "ST340823A" 194 C "Seagate U Series 5 40823" "ST340824A" 194 C "Seagate Barracuda III" "ST360015A" 194 C "Seagate Barracuda V ST360015A" "ST360020A" 194 C "Seagate U Series 60020" "ST360021A" 194 C "Seagate Barracuda IV ST360021A" "ST380011A" 194 C "Seagate Barracuda 7200.7 80GB" "ST380013AS" 194 C "Seagate Barracuda 7200.7 80GB (Serial ATA)" "ST380020A" 194 C "Seagate U Series 80020 (80Gb, Ultra ATA/100, 5400 rpm)" "ST380021A" 194 C "Seagate Barracuda IV ST380021A" "ST380023A" 194 C "Seagate Barracuda V ST380023A" "ST39111A" 194 C "Seagate ST39111A (from Sun Ultra)" "ST3120020A" 194 C "Seagate ST3120020A" "ST3120022A" 194 C "Seagate Baraccuda 7200.7 120GB" "ST3120023A" 194 C "Seagate Barracuda V ST3120023A" "ST3120024A" 194 C "Seagate Barracuda V ST3120024A" "ST3120026A" 194 C "Seagate Barracuda V ST3120026A" "ST3160023AS" 194 C "Seagate Barracuda V ST3160023AS (160Gb, Serial ATA)" "ST94011A" 194 C "Seagate ST94011A" ######################################## ############# TOSHIBA Laptops ######################################## "MK4313MAT" 220 C "Toshiba MK4313MAT" "TOSHIBA MK1517GAP" 0 C "Toshiba MK1517GAP" "TOSHIBA MK3017GAP" 0 C "Toshiba MK3017GAP" "TOSHIBA MK3021GAS" 194 C "Toshiba MK3021GAS" #"TOSHIBA MK4019GAX" 222 C "Toshiba MK4019GAX" "TOSHIBA MK6021GAS" 194 C "Toshiba MK6021GAS" "TOSHIBA MK2018GAS" 226 F "Toshiba MK2018GAS" "TOSHIBA MK6022GAX" 194 C "Toshiba MK6022GAX" ######################################## ############# Western Digital drives ######################################## # WDC AC310100B and WDC AC2850F are reported not working # no more informations were given "WDC WD200BB-00AUA1" 0 C "Western Digital Caviar WD200BB" "WDC WD360GD-00FNA0" 194 C "Western Digital SATA Raptor 36.7GB" "WDC WD400BB-(18CA|00DE)A0" 0 C "Western Digital Caviar WD400BB" "WDC WD600BB-32BSA0" 0 C "Western Digital 600BB-32BSA0" "WDC WD800BB-00CAA1" 0 C "Western Digital WD800BB-00CAA1" "WDC WD800BB-22DKA0" 194 C "Western Digital 800BB-22DKA0" "WDC WD100EB-00BHF0" 0 C "Western Digital 100EB-00BHF0" "WDC WD400EB-00CPF0" 0 C "Western Digital 400EB-00CPF0" "WDC WD800JB-00ETA0" 194 C "Western Digital 80GB Special Edition 8MB" "WDC WD1600JB-00EVA0" 194 C "Western Digital 160GB Special Edition 8MB" "WDC WD2000JB-34EVA0" 194 C "Western Digital 200GB Special Edition 8MB" "WDC WD2500JB-32FUA0" 194 C "Western Digital 250GB Special Edition 8MB" "WDC AC420400D" 231 C "Western Digital Caviar AC420400D" "WDC AC418000D" 231 C "Western Digital AC418000D" "WDC WD135BA" 231 C "Wetsern Digital WD135BA" # not sure for next # "WDC WD800JB-00CRA1" 9 C "Western Digital Caviar WD800JB" # "WDC WD800JB-00CRA1" 199 C "Western Digital Caviar WD800JB" # "WDC WD1200JB-00CRA1" 9 C "Western Digital 1200JB-00CRA1" # "WDC WD273BA" 9 C "Western Digital WD273BA" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hddtemp/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:34:04 -0000 1.3 +++ .cvsignore 22 Jan 2005 13:32:11 -0000 1.4 @@ -1,2 +1 @@ hddtemp-0.3-beta12.tar.bz2 -hddtemp.db Index: sources =================================================================== RCS file: /cvs/extras/rpms/hddtemp/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Dec 2004 22:43:31 -0000 1.4 +++ sources 22 Jan 2005 13:32:11 -0000 1.5 @@ -1,2 +1 @@ 51f19658fa6e745eee62f6e100838884 hddtemp-0.3-beta12.tar.bz2 -0a5add4df5f20d8a7471bd48e6842762 hddtemp.db From fedora-extras-commits at redhat.com Sat Jan 22 13:39:08 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 22 Jan 2005 08:39:08 -0500 Subject: rpms/hddtemp/devel hddtemp.db,1.1,1.2 hddtemp.spec,1.6,1.7 Message-ID: <200501221339.j0MDd8WN016810@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/hddtemp/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv16794 Modified Files: hddtemp.db hddtemp.spec Log Message: Update hddtemp.db to 2005-01-17. Index: hddtemp.db =================================================================== RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.db,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hddtemp.db 22 Jan 2005 13:32:11 -0000 1.1 +++ hddtemp.db 22 Jan 2005 13:39:06 -0000 1.2 @@ -1,6 +1,4 @@ # -# DATABASE VERSION 03C (01/01/2004) -# # Insert a regular expression for support of the model or the serie of your hard drive. # If you don't know what to put in the second field, put the number # that appears most often for your brand :o) @@ -44,6 +42,12 @@ # ################################################# +######################################## +############# ExcelStor drives +######################################## +# "ExcelStor Technology CT215" ??? ? "ExcelStor CT215" +"ExcelStor Technology J3.0" 194 C "ExcelStor Technology 3xy (xy GB)" + ######################################## ############# Fujitsu drives @@ -57,7 +61,12 @@ "FUJITSU MHS2040AT" 194 C "Fujitsu MHS2040AT" "FUJITSU MHS2060AT" 194 C "Fujitsu MHS2060AT (Apple PowerBook G4)" "FUJITSU MHT2030AT" 194 C "Fujitsu MHT2030AT" +"FUJITSU MHT2040AH" 194 C "Fujitsu MHT2040AH" "FUJITSU MHT2040AT" 194 C "Fujitsu MHT2040AT" +"FUJITSU MHT2060AH" 194 C "Fujitsu MHT2060AH" +"FUJITSU MHT2060AT" 194 C "Fujitsu MHT2060AT" +"FUJITSU MHT2080AH" 194 C "Fujitsu MHT2080AH" +"FUJITSU MHN2150AT" 194 C "Fujitsu MHN2150AT" "FUJITSU MPF3204AH" 194 C "Fujitsu MPF3204AH" "FUJITSU MPG3204AT.*" 194 C "Fujitsu MPG3204AT" "FUJITSU MPG3307AT" 194 C "Fujitsu MPG3307AT" @@ -65,20 +74,28 @@ "FUJITSU MPG3409AH.*" 194 C "Fujitsu MPG3409AH E" "FUJITSU MPG3204AH" 194 C "Fujitsu MPG3204AH" - ######################################## ############# Hitachi drives ######################################## - "HITACHI_DK228A-65" 0 C "Hitachi DK228A-65" "HITACHI_DK23CA-20" 194 C "Hitachi DK23CA-20" "HITACHI_DK23CA-30B" 194 C "Hitachi DK23CA-30B" "HITACHI_DK23CA-75" 194 C "Hitachi DK23CA-75" "HITACHI_DK23DA-[234]0" 194 C "Hitachi DK23DA series" "HITACHI_DK23EA-[346]0" 194 C "Hitachi DK23EA series" -"HITACHI_DK23FB-60" 194 C "Hitachi DK23FB60" +"HITACHI_DK23EB-40" 194 C "Hitachi DK23EB series" +"HITACHI_DK23FB-[46]0" 194 C "Hitachi DK23FB series" +"HTS424040M9AT00" 194 C "Hitachi Travelstar 4K40 40GB 2MB cache (4200RPM)" +"HTS548020M9AT00" 194 C "Hitachi Travelstar 20GB (5400RPM)" +"HTS548030M9AT00" 194 C "Hitachi Travelstar 30GB (5400RPM)" +"HTS548040M9AT00" 194 C "Hitachi Travelstar 40GB (5400RPM)" +"HTS548060M9AT00" 194 C "Hitachi Travelstar 60GB (5400RPM)" +"HTS548080M9AT00" 194 C "Hitachi Travelstar 80GB (5400RPM)" "HTS726060M9AT00" 194 C "Hitachi Travelstar 60GB" - +"HDS722516VLAT[28]0" 194 C "Hitachi Deskstar 7K250 160GB 2/8MB cache" +"HDS722525VLAT80" 194 C "Hitachi Deskstar 7K250 200/250GB, 7200RPM, 8MB, Parallel-ATA" +"HDS722580VLAT20" 194 C "Deskstar 7K250 60GB" +"HDS728080PLAT20" 194 C "Hitachi Deskstar 7K80 80GB" ######################################## ############# IBM drives @@ -105,6 +122,8 @@ "IC25N0[1234]0ATCS04-0" 194 C "IBM Travelstar 40GN serie" "IC25N0[24]0ATC[SX]05-0" 194 C "IBM Travelstar 40GNX serie" "IC25N0(15|20|30)ATDA04-0" 194 C "IBM Travelstar 30GN serie" +"IC25N0[23468]0ATMR04*" 194 C "Hitachi Travelstar 80GN" +"IC25N040ATMR04-0" 194 C "Hitachi Travelstar 40GB" "IC25T048ATDA05-0" 194 C "IBM Travelstar 48GH serie" "IC25T060ATC[SX]05-0" 194 C "IBM Travelstar 60GH serie" "IC35L0[12346]0AVER07" 194 C "IBM Deskstar 60GXP serie" @@ -112,35 +131,32 @@ "IC35L[01][23689]0AVV207*" 194 C "IBM Deskstar 180GXP serie" + ######################################## ############# Maxtor drives ######################################## - -#"Maxtor 2B0[012][04568]H1" ??? C "Maxtor Fireball 541DX" -"Maxtor 2F020J0" 194 C "Maxtor 2F020J0" -"Maxtor 2F030J0" 194 C "Maxtor 2F030J0" +#"Maxtor 2B0[012][04568]H1" ??? C "Maxtor Fireball 541DX" +"Maxtor 2F0[234]0[LJ]0" 194 C "Maxtor Fireball 3" # which one must I trust ? -#"Maxtor 4D040H2" 9 C "Maxtor DiamondMax D540X-4D" -#"Maxtor 4D040H2" 0 C "Maxtor 4D040H2" -#"Maxtor 4D080H4" 12 C "Maxtor DiamondMax D540X-4D" -#"Maxtor 4D080H4" 9 C "Maxtor DiamondMax D540X-4D" -"MAXTOR 4K0[468]0H[234]" 194 C "Maxtor DiamondMax D540X serie" -"Maxtor 4[RA](16|12|08|06)0[LJ]0" 194 C "Maxtor DiamondMax 16" -"Maxtor 51024U2" 0 C "Maxtor DiamondMax Plus 40" -"Maxtor 5A250J0" 194 C "Maxtor Maxline 2 250GB 5400RPM" -"Maxtor 5T0[24]0H[24]" 0 C "Maxtor DiamondMax Plus 60" -"Maxtor 6E0[234]0L0" 194 C "Maxtor DiamondMax Plus 8" -"MAXTOR 6L0[2468]0[LJ][1234]" 194 C "Maxtor DiamondMax Plus D740X family" -"Maxtor 6Y(06|08|12|16|20)0[LPM]0" 194 C "Maxtor DiamondMax Plus 9" -"Maxtor 94098U8" 11 C "Maxtor DiamondMax 40 94098U8" - - - +#"Maxtor 4D040H2" 9 C "Maxtor DiamondMax D540X-4D" +#"Maxtor 4D040H2" 0 C "Maxtor 4D040H2" +#"Maxtor 4D080H4" 12 C "Maxtor DiamondMax D540X-4D" +#"Maxtor 4D080H4" 9 C "Maxtor DiamondMax D540X-4D" +"MAXTOR 4K0[468]0H[234]" 194 C "Maxtor DiamondMax D540X serie" +"Maxtor 4[RA](25|16|12|08|06)0[LJ]0" 194 C "Maxtor DiamondMax 16" +"Maxtor 5(1024|1369|2049|2732|3073|4098)U(2|3|4|6|8)" 0 C "Maxtor DiamondMax Plus 40" +"Maxtor 5A250J0" 194 C "Maxtor MaXline II 250GB 5400RPM" +"Maxtor 5A300J0" 194 C "Maxtor 5A300J0" +"Maxtor 5T0[24]0H[24]" 0 C "Maxtor DiamondMax Plus 60" +"Maxtor 6E0[234]0L0" 194 C "Maxtor DiamondMax Plus 8" +"MAXTOR 6L0[2468]0[LJ][1234]" 194 C "Maxtor DiamondMax Plus D740X family" +"Maxtor 6[YB](04|06|08|12|16|20|25)0[LPM]0" 194 C "Maxtor DiamondMax Plus 9" +"Maxtor 7Y250[PM]0" 194 C "Maxtor MaXLine Plus II 250GB 7200RPM" +"Maxtor 94098U8" 11 C "Maxtor DiamondMax 40 94098U8" ######################################## ############# Quantum drives ######################################## - "QUANTUM FIREBALLP AS40.0" 0 C "Quantum Fireball AS40" "QUANTUM FIREBALL CX10.2A" 0 C "Quantum Fireball CX10.2A" #"QUANTUM FIREBALLlct10 20" 4 C "Quantum Fireball CT10 20GB" @@ -148,14 +164,19 @@ # "QUANTUM FIREBALL_TM2110A" 9 C "Quantum Fireball TM2110A" + ######################################## ############# Samsung drives ######################################## # somenone reported a problem with the SP8004H which reports a temperature # 10?C below the ambient temperature +"SAMSUNG MP0(302|402|603|804)H" 194 C "Samsung SpinPoint M40 2.5inch" "SAMSUNG SW0434A" 0 C "Samsung SW0434A" "SAMSUNG SP(2001|4002|6003|8004|40A2)H" 194 C "Samsung SpinPoint P40 serie" "SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)N" 194 C "Samsung SpinPoint P80 serie" +"SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)C" 194 C "Samsung SpinPoint P80 series - SATA" +"SAMSUNG SP0411N" 194 C "Samsung SpinPoint PL40 serie" +"SAMSUNG SP(0812|1213|1614)C" 194 C "Samsung Spinpoint 160G SATA" "SAMSUNG SV0432A" 0 C "Samsung SV0432A" "SAMSUNG SV3002H" 0 C "Samsung SpinPoint V30 serie" "SAMSUNG SV(2001|4002|6003|8004)H" 194 C "Samsung SpinPoint V40 serie" @@ -164,10 +185,10 @@ "SAMSUNG SV(0401|0802|1203|1604)N" 194 C "Samsung SpinPoint V80 serie" + ######################################## ############# Seagate drives ######################################## - "Seagate Technology 1275MB - ST31276A" 0 C "Seagate ST31276A" "ST3412A" 0 C "Seagate ST3412A" "ST38641A" 0 C "Seagate ST38641A" @@ -189,6 +210,7 @@ "ST330621A" 194 C "Seagate ST330621A" "ST330630A" 194 C "Seagate Barracuda ST330630A" "ST340014A" 194 C "Seagate Barracuda 7200.7 40Gb" +"ST340015A" 194 C "Seagate Barracuda 5400.1 40GB" "ST340016A" 194 C "Seagate ST340016A" "ST340810A" 194 C "Seagate U Series 40810 (40Gb, Ultra ATA/100, 5400 rpm)" "ST340823A" 194 C "Seagate U Series 5 40823" @@ -197,9 +219,11 @@ "ST360020A" 194 C "Seagate U Series 60020" "ST360021A" 194 C "Seagate Barracuda IV ST360021A" "ST380011A" 194 C "Seagate Barracuda 7200.7 80GB" +"ST380013A" 194 C "Seagate Barracuda 7200.7 80GB" "ST380013AS" 194 C "Seagate Barracuda 7200.7 80GB (Serial ATA)" "ST380020A" 194 C "Seagate U Series 80020 (80Gb, Ultra ATA/100, 5400 rpm)" "ST380021A" 194 C "Seagate Barracuda IV ST380021A" +"ST380022A" 194 C "Seagate Barracuda U7 80022, Ultra ATA/100" "ST380023A" 194 C "Seagate Barracuda V ST380023A" "ST39111A" 194 C "Seagate ST39111A (from Sun Ultra)" "ST3120020A" 194 C "Seagate ST3120020A" @@ -207,50 +231,64 @@ "ST3120023A" 194 C "Seagate Barracuda V ST3120023A" "ST3120024A" 194 C "Seagate Barracuda V ST3120024A" "ST3120026A" 194 C "Seagate Barracuda V ST3120026A" -"ST3160023AS" 194 C "Seagate Barracuda V ST3160023AS (160Gb, Serial ATA)" -"ST94011A" 194 C "Seagate ST94011A" - - +"ST3160021A" 194 C "Seagate Barracuda 7200.7 - ST3160021A" +"ST3160023(A|AS)" 194 C "Seagate Barracuda V ST3160023A and AS (160Gb, ATA100 and Serial ATA)" +"ST3200822A" 194 C "Seagate Barracuda 7200.7 Plus 200GB" +"ST94[08]11A" 194 C "Seagate ST94011A" ######################################## ############# TOSHIBA Laptops ######################################## - "MK4313MAT" 220 C "Toshiba MK4313MAT" "TOSHIBA MK1517GAP" 0 C "Toshiba MK1517GAP" +"TOSHIBA MK2018GAS" 226 F "Toshiba MK2018GAS" +"TOSHIBA MK2023GAS" 194 C "Toshiba MK2023GAS" "TOSHIBA MK3017GAP" 0 C "Toshiba MK3017GAP" "TOSHIBA MK3021GAS" 194 C "Toshiba MK3021GAS" #"TOSHIBA MK4019GAX" 222 C "Toshiba MK4019GAX" "TOSHIBA MK6021GAS" 194 C "Toshiba MK6021GAS" -"TOSHIBA MK2018GAS" 226 F "Toshiba MK2018GAS" "TOSHIBA MK6022GAX" 194 C "Toshiba MK6022GAX" +"TOSHIBA MK6025GAS" 194 C "Toshiba MK6025GAS" +"TOSHIBA MK8025GAS" 194 C "Toshiba MK8025GAS" +"TOSHIBA MK8026GAX" 194 C "Toshiba MK8026GAX" +"MK4025GAS" 194 C "Toshiba MK4025GAS" ######################################## ############# Western Digital drives ######################################## - # WDC AC310100B and WDC AC2850F are reported not working # no more informations were given -"WDC WD200BB-00AUA1" 0 C "Western Digital Caviar WD200BB" -"WDC WD360GD-00FNA0" 194 C "Western Digital SATA Raptor 36.7GB" -"WDC WD400BB-(18CA|00DE)A0" 0 C "Western Digital Caviar WD400BB" -"WDC WD600BB-32BSA0" 0 C "Western Digital 600BB-32BSA0" -"WDC WD800BB-00CAA1" 0 C "Western Digital WD800BB-00CAA1" -"WDC WD800BB-22DKA0" 194 C "Western Digital 800BB-22DKA0" -"WDC WD100EB-00BHF0" 0 C "Western Digital 100EB-00BHF0" -"WDC WD400EB-00CPF0" 0 C "Western Digital 400EB-00CPF0" -"WDC WD800JB-00ETA0" 194 C "Western Digital 80GB Special Edition 8MB" -"WDC WD1600JB-00EVA0" 194 C "Western Digital 160GB Special Edition 8MB" -"WDC WD2000JB-34EVA0" 194 C "Western Digital 200GB Special Edition 8MB" -"WDC WD2500JB-32FUA0" 194 C "Western Digital 250GB Special Edition 8MB" -"WDC AC420400D" 231 C "Western Digital Caviar AC420400D" -"WDC AC418000D" 231 C "Western Digital AC418000D" -"WDC WD135BA" 231 C "Wetsern Digital WD135BA" +"WDC WD100EB-00BHF0" 0 C "Western Digital 100EB-00BHF0" +"WDC WD200BB-00AUA1" 0 C "Western Digital Caviar WD200BB" +#"WDC WD200BB-60DGA0" 0 C "Western Digital Caviar WD200BB" +"WDC WD360GD-00FNA0" 194 C "Western Digital SATA Raptor 36.7GB" +"WDC WD400BB-(18CA|00DE)A0" 0 C "Western Digital Caviar WD400BB" +"WDC WD400EB-00CPF0" 0 C "Western Digital 400EB-00CPF0" +"WDC WD400JB-00FMA0" 194 C "Western Digital Caviar 40GB Special Edition 8MB" +"WDC WD600BB-32BSA0" 0 C "Western Digital 600BB-32BSA0" +"WDC WD600LB-00DNA0" 194 C "Western Digital 60GB" +"WDC WD800BB-00CAA1" 0 C "Western Digital WD800BB-00CAA1" +"WDC WD800BB-22DKA0" 194 C "Western Digital 800BB-22DKA0" +"WDC WD800BB-32CCB0" 194 C "Western Digital 800BB-32CCB0" +"WDC WD800BB-55JKA0" 194 C "Western Digital 800BB-55JKA0" +"WDC WD800JB-00CRA1" 0 C "Western Digital Caviar WD800JB" +"WDC WD800JB-00(ET|FM|FS)A0" 194 C "Western Digital Caviar 80GB Special Edition 8MB" +"WDC WD800JB-00JJA0" 194 C "Western Digital WD800JB" +"WDC WD800JD-00HKA0" 194 C "Western Digital SATA 80GB, 8MB Cache" +"WDC WD1200JB-00(EV|FU|GV)A0" 194 C "Western Digital Caviar 120GB Special Edition 8MB" +"WDC WD1200JD-00GBB0" 194 C "Western Digital WD1200JD" +"WDC WD1200LB-55EDA0" 194 C "Western Digital WD1220LB" +"WDC WD1600BB-00DWA0" 194 C "Western Digital Caviar WD1600BB" +"WDC WD1600JB-00(EV|FU|GV)A0" 194 C "Western Digital Caviar 160GB Special Edition 8MB" +"WDC WD2000JB-(00EV|34EV|00FU|00GV|98GV)A0" 194 C "Western Digital Caviar 200GB Special Edition 8MB" +"WDC WD2500JB-(00FU|32FU|00GV)A0" 194 C "Western Digital Caviar 250GB Special Edition 8MB" +"WDC AC420400D" 231 C "Western Digital Caviar AC420400D" +"WDC AC418000D" 231 C "Western Digital AC418000D" +"WDC WD135BA" 231 C "Western Digital WD135BA" + # not sure for next -# "WDC WD800JB-00CRA1" 9 C "Western Digital Caviar WD800JB" -# "WDC WD800JB-00CRA1" 199 C "Western Digital Caviar WD800JB" # "WDC WD1200JB-00CRA1" 9 C "Western Digital 1200JB-00CRA1" # "WDC WD273BA" 9 C "Western Digital WD273BA" Index: hddtemp.spec =================================================================== RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- hddtemp.spec 4 Dec 2004 22:43:31 -0000 1.6 +++ hddtemp.spec 22 Jan 2005 13:39:06 -0000 1.7 @@ -1,6 +1,6 @@ Name: hddtemp Version: 0.3 -Release: 0.1.beta12 +Release: 0.2.beta12 Epoch: 0 Summary: Hard disk temperature tool @@ -92,6 +92,9 @@ %changelog +* Sat Jan 22 2005 Ville Skytt?? - 0:0.3-0.2.beta12 +- Update hddtemp.db to 2005-01-17. + * Sat Dec 4 2004 Ville Skytt?? - 0:0.3-0.1.beta12 - Init script and sysconfig cleanups. - Build with dependency tracking disabled. From fedora-extras-commits at redhat.com Sat Jan 22 20:27:04 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 22 Jan 2005 15:27:04 -0500 Subject: rpms/rdiff-backup/devel sources,1.2,1.3 rdiff-backup.spec,1.4,1.5 Message-ID: <200501222027.j0MKR4tO022435@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/rdiff-backup/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22429 Modified Files: sources rdiff-backup.spec Log Message: Update to 0.12.7 in reply to bug #144419. Index: sources =================================================================== RCS file: /cvs/extras/rpms/rdiff-backup/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:17:55 -0000 1.2 +++ sources 22 Jan 2005 20:27:02 -0000 1.3 @@ -1 +1 @@ -49d7baedd303fb278a65682064ec8c64 rdiff-backup-0.12.6.tar.gz +12fb0085861483eab379cb578fa9c849 rdiff-backup-0.12.7.tar.gz Index: rdiff-backup.spec =================================================================== RCS file: /cvs/extras/rpms/rdiff-backup/devel/rdiff-backup.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rdiff-backup.spec 10 Dec 2004 22:03:10 -0000 1.4 +++ rdiff-backup.spec 22 Jan 2005 20:27:02 -0000 1.5 @@ -1,19 +1,19 @@ -%define PYTHON_VERSION %(python -c 'import sys; print sys.version[:3],') -%define NEXT_PYTHON_VERSION %(python -c 'import sys; print "%d.%d" % (sys.version_info[0], sys.version_info[1]+1),') +%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -Version: 0.12.6 +Version: 0.12.7 Summary: Convenient and transparent local/remote incremental mirror/backup Name: rdiff-backup Release: 1 Epoch: 0 -URL: http://rdiff-backup.stanford.edu/ -Source: http://rdiff-backup.stanford.edu/OLD/%{version}/%{name}-%{version}.tar.gz +URL: http://www.nongnu.org/rdiff-backup/ +Source: http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz License: GPL Group: Applications/Archiving BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: python >= 0:%{PYTHON_VERSION}, python < 0:%{NEXT_PYTHON_VERSION} BuildRequires: python-devel >= 0:2.2, librsync-devel >= 0:0.9.6 +Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") + %description rdiff-backup is a script, written in Python, that backs up one directory to another and is intended to be run periodically (nightly @@ -33,9 +33,10 @@ python setup.py build %install +rm -rf $RPM_BUILD_ROOT python setup.py install --root $RPM_BUILD_ROOT # Produce .pyo files for %ghost directive later -python -Oc 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT/%{_libdir}/python%{PYTHON_VERSION}/site-packages/rdiff_backup'")' +python -Oc 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT/%{python_sitearch}/rdiff_backup'")' %clean rm -rf $RPM_BUILD_ROOT @@ -44,17 +45,24 @@ %defattr(-,root,root) %{_bindir}/rdiff-backup %{_mandir}/man1/rdiff-backup* -%dir %{_libdir}/python%{PYTHON_VERSION}/site-packages/rdiff_backup -%{_libdir}/python%{PYTHON_VERSION}/site-packages/rdiff_backup/*.py -%{_libdir}/python%{PYTHON_VERSION}/site-packages/rdiff_backup/*.pyc -%{_libdir}/python%{PYTHON_VERSION}/site-packages/rdiff_backup/*.so -%ghost %{_libdir}/python%{PYTHON_VERSION}/site-packages/rdiff_backup/*.pyo +%dir %{python_sitearch}/rdiff_backup +%{python_sitearch}/rdiff_backup/*.py +%{python_sitearch}/rdiff_backup/*.pyc +%{python_sitearch}/rdiff_backup/*.so +%ghost %{python_sitearch}/rdiff_backup/*.pyo %doc CHANGELOG COPYING FAQ.html README %changelog +* Sat Jan 22 2005 Michael Schwendt - 0:0.12.7-1 +- Update to 0.12.7 which was released May 31st, 2004. +- Enhance spec with python-abi and arch-dependent sitelib paths. +- Update URL and Source. + * Sun Oct 05 2003 Ben Escoto - 0:0.12.5-0.fdr.1 - Added epochs to python versions, more concise %%defines, %%ghost files + * Thu Aug 16 2003 Ben Escoto - 0:0.12.3-0.fdr.4 - Implemented various suggestions of Fedora QA + * Sun Nov 4 2001 Ben Escoto - Initial RPM From fedora-extras-commits at redhat.com Sun Jan 23 00:58:12 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 22 Jan 2005 19:58:12 -0500 Subject: rpms/liferea/devel liferea.spec,1.6,1.7 sources,1.4,1.5 Message-ID: <200501230058.j0N0wCEr025527@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/liferea/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25521 Modified Files: liferea.spec sources Log Message: Merging from testing branch. Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- liferea.spec 12 Jan 2005 20:05:46 -0000 1.6 +++ liferea.spec 23 Jan 2005 00:58:10 -0000 1.7 @@ -1,5 +1,5 @@ Name: liferea -Version: 0.6.4 +Version: 0.9.0 Release: 1.b Epoch: 0 Summary: An RSS/RDF feed reader. @@ -7,8 +7,7 @@ Group: Applications/Internet License: GPL URL: http://liferea.sourceforge.net/ -Source0: http://download.sourceforge.net/liferea/liferea-0.6.4b.tar.gz -Source2: %{name}.desktop +Source0: http://download.sourceforge.net/liferea/liferea-0.9.0b.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel @@ -48,7 +47,7 @@ desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ - %{SOURCE2} + %{name}.desktop %clean @@ -83,6 +82,13 @@ %changelog +* Tue Jan 18 2005 Brian Pepple - 0:0.9.0-1.b +- Updated to 0.9.0b. +- Remove seperate desktop file. + +* Fri Jan 14 2005 Brian Pepple - 0:0.9.0-1 +- Updated to 0.9.0. + * Wed Jan 12 2005 Brian Pepple - 0:0.6.4-1.b - Updated to 0.6.4b. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 12 Jan 2005 20:05:46 -0000 1.4 +++ sources 23 Jan 2005 00:58:10 -0000 1.5 @@ -1 +1 @@ -d45086ee3fc098cc9ca146bece0ddf9f liferea-0.6.4b.tar.gz +2781b3ae500e089497fcbee97bf73441 liferea-0.9.0b.tar.gz From fedora-extras-commits at redhat.com Sun Jan 23 05:36:39 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 23 Jan 2005 00:36:39 -0500 Subject: rpms/libfwbuilder - New directory Message-ID: <200501230536.j0N5ad1R029099@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/libfwbuilder In directory cvs.fedora.redhat.com:/tmp/cvs-serv29086/libfwbuilder Log Message: Directory /cvs/extras/rpms/libfwbuilder added to the repository From fedora-extras-commits at redhat.com Sun Jan 23 05:36:39 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 23 Jan 2005 00:36:39 -0500 Subject: rpms/libfwbuilder/devel - New directory Message-ID: <200501230536.j0N5adjk029102@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/libfwbuilder/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv29086/libfwbuilder/devel Log Message: Directory /cvs/extras/rpms/libfwbuilder/devel added to the repository From fedora-extras-commits at redhat.com Sun Jan 23 05:37:02 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 23 Jan 2005 00:37:02 -0500 Subject: rpms/libfwbuilder Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501230537.j0N5b27j029179@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/libfwbuilder In directory cvs.fedora.redhat.com:/tmp/cvs-serv29164 Added Files: Makefile import.log Log Message: Setup of module libfwbuilder --- NEW FILE Makefile --- # Top level Makefile for module libfwbuilder all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 23 05:37:02 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 23 Jan 2005 00:37:02 -0500 Subject: rpms/libfwbuilder/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501230537.j0N5b2UU029182@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/libfwbuilder/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv29164/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libfwbuilder --- NEW 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 Jan 23 05:37:39 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 23 Jan 2005 00:37:39 -0500 Subject: rpms/libfwbuilder import.log,1.1,1.2 Message-ID: <200501230537.j0N5bdZI029311@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/libfwbuilder In directory cvs.fedora.redhat.com:/tmp/cvs-serv29296 Modified Files: import.log Log Message: auto-import libfwbuilder-2.0.5-1 on branch devel from libfwbuilder-2.0.5-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 23 Jan 2005 05:37:00 -0000 1.1 +++ import.log 23 Jan 2005 05:37:37 -0000 1.2 @@ -0,0 +1 @@ +libfwbuilder-2_0_5-1:HEAD:libfwbuilder-2.0.5-1.src.rpm:1106458651 From fedora-extras-commits at redhat.com Sun Jan 23 05:37:39 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 23 Jan 2005 00:37:39 -0500 Subject: rpms/libfwbuilder/devel libfwbuilder.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501230537.j0N5bdKm029315@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/libfwbuilder/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv29296/devel Modified Files: .cvsignore sources Added Files: libfwbuilder.spec Log Message: auto-import libfwbuilder-2.0.5-1 on branch devel from libfwbuilder-2.0.5-1.src.rpm --- NEW FILE libfwbuilder.spec --- Name: libfwbuilder Summary: Firewall Builder API Version: 2.0.5 Release: 1 License: GPL Group: "System Environment/Libraries" Packager: Steve Grubb Url: http://www.fwbuilder.org/ Source: %{name}-%{version}.tar.gz Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: libxslt-devel, libxml2-devel BuildRequires: qt-devel >= 3.0.0 BuildRequires: openssl-devel #BuildRequires: net-snmp-devel Provides: %name = %version %description Firewall Builder API library and compiler framework %files %defattr(-,root,root) %doc doc/AUTHORS doc/COPYING doc/ChangeLog doc/Credits doc/INSTALL doc/README doc/PatchAcceptancePolicy.txt %dir %{_datadir}/libfwbuilder %{_datadir}/libfwbuilder/* %{_libdir}/*.so.* %{_libdir}/*.so %package devel Summary: Firewall Builder API Libraries and Header Files Group: "Development/Libraries" Requires: %{name} = %{version}-%{release} Provides: %name-devel = %version-%release %description devel This package contains the libraries and header files that programmer would need to develop applications using Firewall Builder API. %files devel %defattr(-, root, root) %{_bindir}/libfwbuilder-config-2 /usr/include/fwb-2.0/fwbuilder /usr/include/fwb-2.0/fwcompiler %prep %setup -q %build ./configure --enable-auto-docdir --libdir=%{_libdir} --prefix=%{_prefix} --with-templatedir=%{_datadir}/libfwbuilder --disable-static --enable-shared make QTDIR=`cat qtdir` all %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT make QTDIR=`cat qtdir` DDIR=$RPM_BUILD_ROOT install # prevent including twice the doc rm -fr $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version} %clean [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %changelog * Sat Jan 22 2005 Steve Grubb 2.0.5 - Created base spec file Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Jan 2005 05:37:00 -0000 1.1 +++ .cvsignore 23 Jan 2005 05:37:37 -0000 1.2 @@ -0,0 +1 @@ +libfwbuilder-2.0.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jan 2005 05:37:00 -0000 1.1 +++ sources 23 Jan 2005 05:37:37 -0000 1.2 @@ -0,0 +1 @@ +7fe07b07e13d21e20d10185276c2318e libfwbuilder-2.0.5.tar.gz From fedora-extras-commits at redhat.com Sun Jan 23 05:38:39 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 23 Jan 2005 00:38:39 -0500 Subject: rpms/fwbuilder - New directory Message-ID: <200501230538.j0N5cd03029469@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/fwbuilder In directory cvs.fedora.redhat.com:/tmp/cvs-serv29456/fwbuilder Log Message: Directory /cvs/extras/rpms/fwbuilder added to the repository From fedora-extras-commits at redhat.com Sun Jan 23 05:38:39 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 23 Jan 2005 00:38:39 -0500 Subject: rpms/fwbuilder/devel - New directory Message-ID: <200501230538.j0N5cd9Y029472@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/fwbuilder/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv29456/fwbuilder/devel Log Message: Directory /cvs/extras/rpms/fwbuilder/devel added to the repository From fedora-extras-commits at redhat.com Sun Jan 23 05:38:57 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 23 Jan 2005 00:38:57 -0500 Subject: rpms/fwbuilder Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501230538.j0N5cvN6029550@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/fwbuilder In directory cvs.fedora.redhat.com:/tmp/cvs-serv29535 Added Files: Makefile import.log Log Message: Setup of module fwbuilder --- NEW FILE Makefile --- # Top level Makefile for module fwbuilder all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 23 05:38:57 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 23 Jan 2005 00:38:57 -0500 Subject: rpms/fwbuilder/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501230538.j0N5cvau029553@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/fwbuilder/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv29535/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module fwbuilder --- NEW 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 Jan 23 05:40:03 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 23 Jan 2005 00:40:03 -0500 Subject: rpms/fwbuilder import.log,1.1,1.2 Message-ID: <200501230540.j0N5e32E029694@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/fwbuilder In directory cvs.fedora.redhat.com:/tmp/cvs-serv29679 Modified Files: import.log Log Message: auto-import fwbuilder-2.0.5-1 on branch devel from fwbuilder-2.0.5-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 23 Jan 2005 05:38:55 -0000 1.1 +++ import.log 23 Jan 2005 05:40:01 -0000 1.2 @@ -0,0 +1 @@ +fwbuilder-2_0_5-1:HEAD:fwbuilder-2.0.5-1.src.rpm:1106458795 From fedora-extras-commits at redhat.com Sun Jan 23 05:40:03 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 23 Jan 2005 00:40:03 -0500 Subject: rpms/fwbuilder/devel fwbuilder.desktop, NONE, 1.1 fwbuilder.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501230540.j0N5e3m5029698@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/fwbuilder/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv29679/devel Modified Files: .cvsignore sources Added Files: fwbuilder.desktop fwbuilder.spec Log Message: auto-import fwbuilder-2.0.5-1 on branch devel from fwbuilder-2.0.5-1.src.rpm --- NEW FILE fwbuilder.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Firewall Builder Comment=Design IPTables Firewall Rules Icon=/usr/share/pixmaps/fwbuilder/firewall.png Categories=Application;SystemSetup Exec=/usr/bin/fwbuilder Type=Application StartupNotify=true Terminal=false --- NEW FILE fwbuilder.spec --- Name: fwbuilder Summary: Firewall Builder Version: 2.0.5 Release: 1 License: GPL Group: "Applications/System" Packager: Steve Grubb Url: http://www.fwbuilder.org/ Source: %{name}-%{version}.tar.gz Source1: fwbuilder.desktop Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: qt-devel >= 3.0.0 BuildRequires: desktop-file-utils BuildRequires: libfwbuilder-devel = 2.0.5 Requires: libfwbuilder = 2.0.5 Provides: %name = %version %description Firewall Builder consists of a GUI and set of policy compilers for various firewall platforms. It helps users maintain a database of objects and allows policy editing using simple drag-and-drop operations. GUI generates firewall description in the form of XML file, which compilers then interpret and generate platform-specific code. Several algorithms are provided for automated network objects discovery and bulk import of data. The GUI and policy compilers are completely independent, this provides for a consistent abstract model and the same GUI for different firewall platforms. %prep %setup -q %build ./configure --prefix=%{_prefix} --with-templatedir=%{_datadir}/fwbuilder make QTDIR=`cat qtdir` all %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT make QTDIR=`cat qtdir` DDIR=$RPM_BUILD_ROOT install rm -fr $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version} # Add an icon for the menu system mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/fwbuilder install -c -m644 src/gui/icons/firewall.png $RPM_BUILD_ROOT/usr/share/pixmaps/fwbuilder # Add menu entry desktop-file-install --vendor system \ --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ --add-category X-Red-Hat-Base \ %{SOURCE1} %clean [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %dir %{_datadir}/fwbuilder %dir %{_datadir}/pixmaps/fwbuilder %{_datadir}/fwbuilder/locale/* %{_datadir}/fwbuilder/platform/* %{_datadir}/fwbuilder/os/* %{_datadir}/fwbuilder/resources.xml %{_datadir}/fwbuilder/objects_init.xml %{_datadir}/fwbuilder/templates.xml %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/fwbuilder/firewall.png %{_bindir}/fwbuilder %{_bindir}/fwblookup %{_bindir}/fwbedit %{_bindir}/fwb_install %{_bindir}/fwb_compile_all %doc doc/AUTHORS %doc doc/COPYING %doc doc/Credits %doc doc/ChangeLog %doc doc/PatchAcceptancePolicy.txt %doc doc/README.floppyfw %doc doc/ReleaseNotes_2_0.html %doc doc/ReleaseNotes_2_0.txt %doc doc/ReleaseNotes_2.0.1.html %doc doc/ReleaseNotes_2.0.1.txt %doc doc/ReleaseNotes_2.0.2.html %doc doc/ReleaseNotes_2.0.2.txt %doc doc/ReleaseNotes_2.0.3.html %doc doc/ReleaseNotes_2.0.3.txt %doc doc/ReleaseNotes_2.0.4.html %doc doc/ReleaseNotes_2.0.4.txt %doc doc/ReleaseNotes_2.0.5.html %doc doc/ReleaseNotes_2.0.5.txt %{_mandir}/man1/fwbuilder.1* %{_mandir}/man1/fwblookup.1* %{_mandir}/man1/fwbedit.1* %{_mandir}/man1/fwb_install.1* %{_mandir}/man1/fwb_compile_all.1* %package pf Summary: Policy Compiler for OpenBSD PF Group: "Applications/System" Requires: %{name} = %{version}-%{release} %description pf Policy compiler for OpenBSD PF %files pf %defattr(-,root,root) %{_bindir}/fwb_pf %doc doc/README.pf %{_mandir}/man1/fwb_pf.1* %package ipf Summary: Policy Pompiler for ipfilter Group: "Applications/System" Requires: %{name} = %{version}-%{release} %description ipf Policy compiler for ipfilter %files ipf %defattr(-,root,root) %{_bindir}/fwb_ipf %doc doc/README.ipf %{_mandir}/man1/fwb_ipf.1* %package ipfw Summary: Policy Compiler for ipfw Group: "Applications/System" Requires: %{name} = %{version}-%{release} %description ipfw Policy compiler for ipfw %files ipfw %defattr(-,root,root) %{_bindir}/fwb_ipfw %doc doc/README.ipfw %{_mandir}/man1/fwb_ipfw.1* %package ipt Summary: Policy Compiler for IPTables Group: "Applications/System" Requires: %{name} = %{version}-%{release} %description ipt Policy compiler for IPTables %files ipt %defattr(-,root,root) %{_bindir}/fwb_ipt %doc doc/README.ipt %{_mandir}/man1/fwb_ipt.1* %changelog * Sat Jan 22 2005 Steve Grubb 2.0.5 - Created base spec file Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Jan 2005 05:38:55 -0000 1.1 +++ .cvsignore 23 Jan 2005 05:40:01 -0000 1.2 @@ -0,0 +1 @@ +fwbuilder-2.0.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jan 2005 05:38:55 -0000 1.1 +++ sources 23 Jan 2005 05:40:01 -0000 1.2 @@ -0,0 +1 @@ +03fe6aaa6f8c7728bd3015a4df187c70 fwbuilder-2.0.5.tar.gz From fedora-extras-commits at redhat.com Sun Jan 23 05:42:14 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 23 Jan 2005 00:42:14 -0500 Subject: rpms/fwbuilder/devel fwbuilder.spec,1.1,1.2 Message-ID: <200501230542.j0N5gEkK029817@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/fwbuilder/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv29805 Modified Files: fwbuilder.spec Log Message: minor spec cleanup Index: fwbuilder.spec =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/devel/fwbuilder.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fwbuilder.spec 23 Jan 2005 05:40:01 -0000 1.1 +++ fwbuilder.spec 23 Jan 2005 05:42:12 -0000 1.2 @@ -1,19 +1,16 @@ Name: fwbuilder Summary: Firewall Builder Version: 2.0.5 -Release: 1 +Release: 2 License: GPL -Group: "Applications/System" -Packager: Steve Grubb -Url: http://www.fwbuilder.org/ +Group: Applications/System +URL: http://www.fwbuilder.org/ Source: %{name}-%{version}.tar.gz Source1: fwbuilder.desktop Buildroot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: qt-devel >= 3.0.0 +BuildRequires: qt-devel >= 1:3.0.0 BuildRequires: desktop-file-utils BuildRequires: libfwbuilder-devel = 2.0.5 -Requires: libfwbuilder = 2.0.5 -Provides: %name = %version %description Firewall Builder consists of a GUI and set of policy compilers for @@ -30,13 +27,15 @@ %setup -q %build +[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh ./configure --prefix=%{_prefix} --with-templatedir=%{_datadir}/fwbuilder -make QTDIR=`cat qtdir` all +make all %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -make QTDIR=`cat qtdir` DDIR=$RPM_BUILD_ROOT install -rm -fr $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version} +rm -rf $RPM_BUILD_ROOT +[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh +make DDIR=$RPM_BUILD_ROOT install +rm -rf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version} # Add an icon for the menu system mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/fwbuilder @@ -49,7 +48,7 @@ %{SOURCE1} %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) @@ -95,7 +94,7 @@ %package pf Summary: Policy Compiler for OpenBSD PF -Group: "Applications/System" +Group: Applications/System Requires: %{name} = %{version}-%{release} %description pf @@ -110,7 +109,7 @@ %package ipf Summary: Policy Pompiler for ipfilter -Group: "Applications/System" +Group: Applications/System Requires: %{name} = %{version}-%{release} %description ipf @@ -125,7 +124,7 @@ %package ipfw Summary: Policy Compiler for ipfw -Group: "Applications/System" +Group: Applications/System Requires: %{name} = %{version}-%{release} %description ipfw @@ -140,7 +139,7 @@ %package ipt Summary: Policy Compiler for IPTables -Group: "Applications/System" +Group: Applications/System Requires: %{name} = %{version}-%{release} %description ipt @@ -153,6 +152,9 @@ %{_mandir}/man1/fwb_ipt.1* %changelog +* Sat Jan 22 2005 Warren Togami 2.0.5-2 +- minor spec cleanup + * Sat Jan 22 2005 Steve Grubb 2.0.5 - Created base spec file From fedora-extras-commits at redhat.com Sun Jan 23 05:43:02 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 23 Jan 2005 00:43:02 -0500 Subject: rpms/libfwbuilder/devel libfwbuilder.spec,1.1,1.2 Message-ID: <200501230543.j0N5h2ia029877@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/libfwbuilder/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv29864 Modified Files: libfwbuilder.spec Log Message: spec cleanup Index: libfwbuilder.spec =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/devel/libfwbuilder.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libfwbuilder.spec 23 Jan 2005 05:37:37 -0000 1.1 +++ libfwbuilder.spec 23 Jan 2005 05:43:00 -0000 1.2 @@ -1,25 +1,23 @@ Name: libfwbuilder Summary: Firewall Builder API Version: 2.0.5 -Release: 1 +Release: 2 License: GPL -Group: "System Environment/Libraries" -Packager: Steve Grubb +Group: System Environment/Libraries Url: http://www.fwbuilder.org/ Source: %{name}-%{version}.tar.gz Buildroot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: libxslt-devel, libxml2-devel -BuildRequires: qt-devel >= 3.0.0 +BuildRequires: qt-devel >= 1:3.0.0 +BuildRequires: libxslt-devel BuildRequires: openssl-devel #BuildRequires: net-snmp-devel -Provides: %name = %version %description Firewall Builder API library and compiler framework %files %defattr(-,root,root) -%doc doc/AUTHORS doc/COPYING doc/ChangeLog doc/Credits doc/INSTALL doc/README doc/PatchAcceptancePolicy.txt +%doc doc/AUTHORS doc/COPYING doc/ChangeLog doc/Credits doc/README doc/PatchAcceptancePolicy.txt %dir %{_datadir}/libfwbuilder %{_datadir}/libfwbuilder/* %{_libdir}/*.so.* @@ -30,7 +28,8 @@ Summary: Firewall Builder API Libraries and Header Files Group: "Development/Libraries" Requires: %{name} = %{version}-%{release} -Provides: %name-devel = %version-%release +Requires: libxslt-devel +Requires: openssl-devel %description devel This package contains the libraries and header files that programmer would @@ -39,8 +38,8 @@ %files devel %defattr(-, root, root) %{_bindir}/libfwbuilder-config-2 -/usr/include/fwb-2.0/fwbuilder -/usr/include/fwb-2.0/fwcompiler +%{_includedir}/fwb-2.0/fwbuilder +%{_includedir}/fwb-2.0/fwcompiler %prep @@ -48,19 +47,21 @@ %build +[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh ./configure --enable-auto-docdir --libdir=%{_libdir} --prefix=%{_prefix} --with-templatedir=%{_datadir}/libfwbuilder --disable-static --enable-shared -make QTDIR=`cat qtdir` all +make all %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -make QTDIR=`cat qtdir` DDIR=$RPM_BUILD_ROOT install +[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh +rm -rf $RPM_BUILD_ROOT +make DDIR=$RPM_BUILD_ROOT install # prevent including twice the doc -rm -fr $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version} +rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version} %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig @@ -69,6 +70,9 @@ %changelog +* Sat Jan 22 2005 Warren Togami 2.0.5-2 +- spec cleanup + * Sat Jan 22 2005 Steve Grubb 2.0.5 - Created base spec file From wtogami at redhat.com Sun Jan 23 06:00:06 2005 From: wtogami at redhat.com (Warren Togami) Date: Sat, 22 Jan 2005 20:00:06 -1000 Subject: APPROVED: fwbuilder, libfwbuilder Message-ID: <41F33D66.8000908@redhat.com> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 fwbuilder libfwbuilder Pass my inspection after cleanup and are approved for adding to Fedora Extras. sgrubb at redhat.com will be responsible for these packages. PUBLISH APPROVAL by wtogami at redhat.com on Sat Jan 22th, 2005 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) iD8DBQFB8z0za93+jlSirPERAtBeAJ0emEFBydx5zg5TfjY2po/kGAC06wCeI1+/ oLz+veXEjssEU47vRyIiqU8= =9vCj -----END PGP SIGNATURE----- From fedora-extras-commits at redhat.com Sun Jan 23 13:59:39 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sun, 23 Jan 2005 08:59:39 -0500 Subject: rpms/librsync/devel librsync.spec,1.5,1.6 Message-ID: <200501231359.j0NDxdva007669@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/librsync/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv7663 Modified Files: librsync.spec Log Message: Fix build on x86_64. Index: librsync.spec =================================================================== RCS file: /cvs/extras/rpms/librsync/devel/librsync.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- librsync.spec 10 Dec 2004 22:03:05 -0000 1.5 +++ librsync.spec 23 Jan 2005 13:59:37 -0000 1.6 @@ -1,7 +1,7 @@ Summary: Rsync libraries Name: librsync Version: 0.9.7 -Release: 1 +Release: 2 Epoch: 0 License: LGPL Group: System Environment/Libraries @@ -9,6 +9,7 @@ URL: http://librsync.sf.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel, bzip2-devel, popt +Buildrequires: libtool %description librsync implements the "rsync" algorithm, which allows remote @@ -46,6 +47,7 @@ %setup -q %build +autoreconf -f %configure --enable-shared make %{?_smp_mflags} @@ -77,6 +79,9 @@ %exclude %{_libdir}/librsync.la %changelog +* Sun Jan 23 2005 Michael Schwendt - 0:0.9.7-2 +- Recreate autotools files with autoreconf to fix x86_64 build. + * Wed Nov 10 2004 Adrian Reber - 0:0.9.7-0.fdr.1 - updated to 0.9.7 (#2248) - changed source URL to be downloadable with wget From fedora-extras-commits at redhat.com Sun Jan 23 16:23:28 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:23:28 -0500 Subject: rpms/cvs2cl import.log,1.5,1.6 Message-ID: <200501231623.j0NGNSkk010284@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/cvs2cl In directory cvs.fedora.redhat.com:/tmp/cvs-serv10273 Modified Files: import.log Log Message: auto-import cvs2cl-2.58-0.fdr.1.rh80 on branch RHL-8 from cvs2cl-2.58-0.fdr.1.rh80.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 8 Nov 2004 04:12:29 -0000 1.5 +++ import.log 23 Jan 2005 16:23:26 -0000 1.6 @@ -2,3 +2,4 @@ cvs2cl-2_57-0_fdr_1_rh90:HEAD:cvs2cl-2.57-0.fdr.1.rh90.src.rpm:1099887088 cvs2cl-2_57-0_fdr_1_1:HEAD:cvs2cl-2.57-0.fdr.1.1.src.rpm:1099887094 cvs2cl-2_57-0_fdr_1_2:HEAD:cvs2cl-2.57-0.fdr.1.2.src.rpm:1099887149 +cvs2cl-2_58-0_fdr_1_rh80:RHL-8:cvs2cl-2.58-0.fdr.1.rh80.src.rpm:1106497375 From fedora-extras-commits at redhat.com Sun Jan 23 16:23:28 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:23:28 -0500 Subject: rpms/cvs2cl/RHL-8 cvs2cl.pl,1.1,1.2 cvs2cl.spec,1.1,1.2 Message-ID: <200501231623.j0NGNSxk010288@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/cvs2cl/RHL-8 In directory cvs.fedora.redhat.com:/tmp/cvs-serv10273/RHL-8 Modified Files: cvs2cl.pl cvs2cl.spec Log Message: auto-import cvs2cl-2.58-0.fdr.1.rh80 on branch RHL-8 from cvs2cl-2.58-0.fdr.1.rh80.src.rpm Index: cvs2cl.pl =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/RHL-8/cvs2cl.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cvs2cl.pl 8 Nov 2004 04:11:22 -0000 1.1 +++ cvs2cl.pl 23 Jan 2005 16:23:26 -0000 1.2 @@ -19,6 +19,7 @@ use File::Basename qw( fileparse ); use Getopt::Long qw( GetOptions ); use Text::Wrap qw( ); +use Time::Local qw( timegm ); use User::pwent qw( getpwnam ); # The Plan: @@ -956,7 +957,20 @@ # ------------------------------------- sub output_tagdate { - # NOT YET DONE + my $self = shift; + my ($fh, $time, $tag) = @_; + + my ($y, $m, $d, $H, $M, $S) = (gmtime($time))[5,4,3,2,1,0]; + + # Ideally, this would honor $UTC_Times and use +HH:MM syntax + my $isoDate = sprintf("%04d-%02d-%02dT%02d:%02d:%02dZ", + $y + 1900, $m + 1, $d, $H, $M, $S); + + print $fh "\n"; + print $fh "$isoDate\n"; + print $fh "$tag\n"; + print $fh "\n\n"; + return; } # ------------------------------------- @@ -1052,11 +1066,6 @@ my $follow_branches = $self->{follow_branches}; my $follow_only = $self->{follow_only}; -#print STDERR "IG: ", join(',', keys %{$self->{ignore_tags}}), "\n"; -#print STDERR "IX: ", join(',', @{$qunk->{tags}}), "\n" if defined $qunk->{tags}; -#print STDERR "IQ: ", join(',', keys %{$qunk->{branch_numbers}}), "\n" if defined $qunk->{branch_numbers}; -#use Data::Dumper; print STDERR Dumper $qunk; - for my $ignore_tag (keys %{$self->{ignore_tags}}) { return if defined $qunk->{tags} and grep $_ eq $ignore_tag, @{$qunk->{tags}}; @@ -1096,12 +1105,13 @@ ($branch_number . ".") ) { if ( $followsub ) { return 1; - } elsif (length($revision) == length($branch_number)+2 ) { +# } elsif ( length($revision) == length($branch_number)+2 ) { + } elsif ( substr($revision, length($branch_number)+1) =~ /^\d+$/ ) { return 1; } } elsif ( length($branch_number) > length($revision) and - $No_Ancestors ) { + ! $No_Ancestors ) { # Non-trivial case: check if rev is ancestral to branch # r_left still has the trailing "." @@ -1214,13 +1224,13 @@ # XML output includes everything else, we might as well make # it always include Day Of Week too, for consistency. my $authorhash = $changelog{$time}; - if ($Show_Tag_Dates) { + if ( $Show_Tag_Dates || $XML_Output ) { my %tags; while (my ($author,$mesghash) = each %$authorhash) { while (my ($msg,$qunk) = each %$mesghash) { - foreach my $qunkref2 (@$qunk) { + for my $qunkref2 (@$qunk) { if (defined ($qunkref2->tags)) { - foreach my $tag (@{$qunkref2->tags}) { + for my $tag (@{$qunkref2->tags}) { $tags{$tag} = 1; } } @@ -1925,22 +1935,38 @@ sub read_changelog { my ($self, $command) = @_; -# my $grand_poobah = CVS::Utils::ChangeLog::EntrySet->new; - + local (*READER, *WRITER); + my $pid; if (! $Input_From_Stdin) { - my $Log_Source_Command = join(' ', @$command); - &main::debug ("(run \"${Log_Source_Command}\")\n"); - open (LOG_SOURCE, "$Log_Source_Command |") - or die "unable to run \"${Log_Source_Command}\""; + pipe(READER, WRITER) + or die "Couldn't form pipe: $!\n"; + $pid = fork; + die "Couldn't fork: $!\n" + if ! defined $pid; + if ( ! $pid ) { # child + open STDOUT, '>&=' . fileno WRITER + or die "Couldn't dup stderr to ", fileno WRITER, "\n"; + # strangely, some perls give spurious warnings about STDIN being opened + # for output only these close calls precede the STDOUT reopen above. + # I think they must be reusing fd 1. + close READER; + close STDIN; + + exec @$command; + } + + close WRITER; + + &main::debug ("(run \"@$command\")\n"); } else { - open (LOG_SOURCE, "-") or die "unable to open stdin for reading"; + open READER, '-' or die "unable to open stdin for reading"; } - binmode LOG_SOURCE; + binmode READER; XX_Log_Source: - while () { + while () { chomp; s!\r$!!; @@ -1968,17 +1994,19 @@ # log message texts: $self->{rev_msg} .= $_ . "\n"; # Normally, just accumulate the message... } else { + my $noadd = 0; if ( ! $self->{rev_msg} or $self->{rev_msg} =~ /^\s*(\.\s*)?$/ or index($self->{rev_msg}, EMPTY_LOG_MESSAGE) > -1 ) { # ... until a msg separator is encountered: # Ensure the message contains something: - $self->clear_msg + $self->clear_msg, $noadd = 1 if $Prune_Empty_Msgs; $self->{rev_msg} = "[no log message]\n"; } - $self->add_file_entry; + $self->add_file_entry + unless $noadd; if ( $_ eq FILE_SEPARATOR ) { $self->clear_file; @@ -1988,9 +2016,15 @@ } } - close LOG_SOURCE - or die sprintf("Problem reading log input (exit/signal/core: %d/%d/%d)\n", - $? >> 8, $? & 127, $? & 128); + close READER + or die "Couldn't close pipe reader: $!\n"; + if ( defined $pid ) { + my $rv; + waitpid $pid, 0; + 0 == $? + or $!=1, die sprintf("Problem reading log input (pid/exit/signal/core: %d/%d/%d/%d)\n", + $pid, $? >> 8, $? & 127, $? & 128); + } return; } @@ -2127,9 +2161,8 @@ ($base, undef, undef) = fileparse($path); my $xpath = $Case_Insensitive ? lc($path) : $path; - if ( grep index($path, $_) > -1, @Ignore_Files ) { - return; - } + return + if grep $path =~ /$_/, @Ignore_Files; } $self->{filename} = $path; @@ -2399,7 +2432,7 @@ my $accumulation_date = maybe_grab_accumulation_date; if ($accumulation_date) { # Insert -d immediately after 'cvs log' - my $Log_Date_Command = "-d\'>${accumulation_date}\'"; + my $Log_Date_Command = "-d>${accumulation_date}"; my ($log_index) = grep $command->[$_] eq 'log', 0..$#$command; splice @$command, $log_index+1, 0, $Log_Date_Command; @@ -2456,6 +2489,7 @@ } # ------------------------------------- + sub parse_options { # Check this internally before setting the global variable. my $output_file; @@ -2605,7 +2639,7 @@ ) or die "options parsing failed\n"; - push @log_source_command, map "'$_'", @ARGV; + push @log_source_command, map "$_", @ARGV; ## Check for contradictions... @@ -2858,7 +2892,8 @@ =item B<-I> I, B<--ignore> I Ignore files whose names match I. This option may be used multiple -times. +times. The regexp is a perl regular expression. It is matched as is; you may +want to prefix with a ^ or suffix with a $ to anchor the match. =item B<-C>, B<--case-insensitive> @@ -3038,6 +3073,14 @@ Note that the rules for quoting under windows shells are different. +=item * + +To run in an automated environment such as CGI or PHP, suidperl may be needed +in order to execute as the correct user to enable /cvsroot read lock files to +be written for the 'cvs log' command. This is likely just a case of changing +the /usr/bin/perl command to /usr/bin/suidperl, and explicitly declaring the +PATH variable. + =back =head1 EXAMPLES @@ -3099,6 +3142,8 @@ =item Terry Kane +=item Pete Kempf + =item Akos Kiss =item Claus Klein @@ -3121,7 +3166,11 @@ =item Thomas Parmelan -=item Johanne Stezenbach +=item Jordan Russell + +=item Jacek Sliwerski + +=item Johannes Stezenbach =item Joseph Walton Index: cvs2cl.spec =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/RHL-8/cvs2cl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cvs2cl.spec 8 Nov 2004 04:11:22 -0000 1.1 +++ cvs2cl.spec 23 Jan 2005 16:23:26 -0000 1.2 @@ -1,5 +1,5 @@ Name: cvs2cl -Version: 2.57 +Version: 2.58 Release: 0.fdr.1.rh80 Epoch: 0 Summary: Utility which generates ChangeLogs from CVS working copies @@ -67,6 +67,9 @@ %changelog +* Sun Jan 16 2005 Marius L. J??hndal - 0:2.58-0.fdr.1 +- Updated to 2.58. + * Sat Jul 10 2004 Marius L. J??hndal - 0:2.57-0.fdr.1 - Updated to 2.57. - Moved XML and XSLT files from _datadir/sgml to _datadir/xml. From fedora-extras-commits at redhat.com Sun Jan 23 16:24:59 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:24:59 -0500 Subject: rpms/cvs2cl import.log,1.6,1.7 Message-ID: <200501231624.j0NGOxAi010395@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/cvs2cl In directory cvs.fedora.redhat.com:/tmp/cvs-serv10385 Modified Files: import.log Log Message: auto-import cvs2cl-2.58-0.fdr.1.rh90 on branch RHL-9 from cvs2cl-2.58-0.fdr.1.rh90.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 23 Jan 2005 16:23:26 -0000 1.6 +++ import.log 23 Jan 2005 16:24:57 -0000 1.7 @@ -3,3 +3,4 @@ cvs2cl-2_57-0_fdr_1_1:HEAD:cvs2cl-2.57-0.fdr.1.1.src.rpm:1099887094 cvs2cl-2_57-0_fdr_1_2:HEAD:cvs2cl-2.57-0.fdr.1.2.src.rpm:1099887149 cvs2cl-2_58-0_fdr_1_rh80:RHL-8:cvs2cl-2.58-0.fdr.1.rh80.src.rpm:1106497375 +cvs2cl-2_58-0_fdr_1_rh90:RHL-9:cvs2cl-2.58-0.fdr.1.rh90.src.rpm:1106497476 From fedora-extras-commits at redhat.com Sun Jan 23 16:24:59 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:24:59 -0500 Subject: rpms/cvs2cl/RHL-9 cvs2cl.pl,1.1,1.2 cvs2cl.spec,1.2,1.3 Message-ID: <200501231624.j0NGOxtv010398@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/cvs2cl/RHL-9 In directory cvs.fedora.redhat.com:/tmp/cvs-serv10385/RHL-9 Modified Files: cvs2cl.pl cvs2cl.spec Log Message: auto-import cvs2cl-2.58-0.fdr.1.rh90 on branch RHL-9 from cvs2cl-2.58-0.fdr.1.rh90.src.rpm Index: cvs2cl.pl =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/RHL-9/cvs2cl.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cvs2cl.pl 8 Nov 2004 04:11:22 -0000 1.1 +++ cvs2cl.pl 23 Jan 2005 16:24:57 -0000 1.2 @@ -19,6 +19,7 @@ use File::Basename qw( fileparse ); use Getopt::Long qw( GetOptions ); use Text::Wrap qw( ); +use Time::Local qw( timegm ); use User::pwent qw( getpwnam ); # The Plan: @@ -956,7 +957,20 @@ # ------------------------------------- sub output_tagdate { - # NOT YET DONE + my $self = shift; + my ($fh, $time, $tag) = @_; + + my ($y, $m, $d, $H, $M, $S) = (gmtime($time))[5,4,3,2,1,0]; + + # Ideally, this would honor $UTC_Times and use +HH:MM syntax + my $isoDate = sprintf("%04d-%02d-%02dT%02d:%02d:%02dZ", + $y + 1900, $m + 1, $d, $H, $M, $S); + + print $fh "\n"; + print $fh "$isoDate\n"; + print $fh "$tag\n"; + print $fh "\n\n"; + return; } # ------------------------------------- @@ -1052,11 +1066,6 @@ my $follow_branches = $self->{follow_branches}; my $follow_only = $self->{follow_only}; -#print STDERR "IG: ", join(',', keys %{$self->{ignore_tags}}), "\n"; -#print STDERR "IX: ", join(',', @{$qunk->{tags}}), "\n" if defined $qunk->{tags}; -#print STDERR "IQ: ", join(',', keys %{$qunk->{branch_numbers}}), "\n" if defined $qunk->{branch_numbers}; -#use Data::Dumper; print STDERR Dumper $qunk; - for my $ignore_tag (keys %{$self->{ignore_tags}}) { return if defined $qunk->{tags} and grep $_ eq $ignore_tag, @{$qunk->{tags}}; @@ -1096,12 +1105,13 @@ ($branch_number . ".") ) { if ( $followsub ) { return 1; - } elsif (length($revision) == length($branch_number)+2 ) { +# } elsif ( length($revision) == length($branch_number)+2 ) { + } elsif ( substr($revision, length($branch_number)+1) =~ /^\d+$/ ) { return 1; } } elsif ( length($branch_number) > length($revision) and - $No_Ancestors ) { + ! $No_Ancestors ) { # Non-trivial case: check if rev is ancestral to branch # r_left still has the trailing "." @@ -1214,13 +1224,13 @@ # XML output includes everything else, we might as well make # it always include Day Of Week too, for consistency. my $authorhash = $changelog{$time}; - if ($Show_Tag_Dates) { + if ( $Show_Tag_Dates || $XML_Output ) { my %tags; while (my ($author,$mesghash) = each %$authorhash) { while (my ($msg,$qunk) = each %$mesghash) { - foreach my $qunkref2 (@$qunk) { + for my $qunkref2 (@$qunk) { if (defined ($qunkref2->tags)) { - foreach my $tag (@{$qunkref2->tags}) { + for my $tag (@{$qunkref2->tags}) { $tags{$tag} = 1; } } @@ -1925,22 +1935,38 @@ sub read_changelog { my ($self, $command) = @_; -# my $grand_poobah = CVS::Utils::ChangeLog::EntrySet->new; - + local (*READER, *WRITER); + my $pid; if (! $Input_From_Stdin) { - my $Log_Source_Command = join(' ', @$command); - &main::debug ("(run \"${Log_Source_Command}\")\n"); - open (LOG_SOURCE, "$Log_Source_Command |") - or die "unable to run \"${Log_Source_Command}\""; + pipe(READER, WRITER) + or die "Couldn't form pipe: $!\n"; + $pid = fork; + die "Couldn't fork: $!\n" + if ! defined $pid; + if ( ! $pid ) { # child + open STDOUT, '>&=' . fileno WRITER + or die "Couldn't dup stderr to ", fileno WRITER, "\n"; + # strangely, some perls give spurious warnings about STDIN being opened + # for output only these close calls precede the STDOUT reopen above. + # I think they must be reusing fd 1. + close READER; + close STDIN; + + exec @$command; + } + + close WRITER; + + &main::debug ("(run \"@$command\")\n"); } else { - open (LOG_SOURCE, "-") or die "unable to open stdin for reading"; + open READER, '-' or die "unable to open stdin for reading"; } - binmode LOG_SOURCE; + binmode READER; XX_Log_Source: - while () { + while () { chomp; s!\r$!!; @@ -1968,17 +1994,19 @@ # log message texts: $self->{rev_msg} .= $_ . "\n"; # Normally, just accumulate the message... } else { + my $noadd = 0; if ( ! $self->{rev_msg} or $self->{rev_msg} =~ /^\s*(\.\s*)?$/ or index($self->{rev_msg}, EMPTY_LOG_MESSAGE) > -1 ) { # ... until a msg separator is encountered: # Ensure the message contains something: - $self->clear_msg + $self->clear_msg, $noadd = 1 if $Prune_Empty_Msgs; $self->{rev_msg} = "[no log message]\n"; } - $self->add_file_entry; + $self->add_file_entry + unless $noadd; if ( $_ eq FILE_SEPARATOR ) { $self->clear_file; @@ -1988,9 +2016,15 @@ } } - close LOG_SOURCE - or die sprintf("Problem reading log input (exit/signal/core: %d/%d/%d)\n", - $? >> 8, $? & 127, $? & 128); + close READER + or die "Couldn't close pipe reader: $!\n"; + if ( defined $pid ) { + my $rv; + waitpid $pid, 0; + 0 == $? + or $!=1, die sprintf("Problem reading log input (pid/exit/signal/core: %d/%d/%d/%d)\n", + $pid, $? >> 8, $? & 127, $? & 128); + } return; } @@ -2127,9 +2161,8 @@ ($base, undef, undef) = fileparse($path); my $xpath = $Case_Insensitive ? lc($path) : $path; - if ( grep index($path, $_) > -1, @Ignore_Files ) { - return; - } + return + if grep $path =~ /$_/, @Ignore_Files; } $self->{filename} = $path; @@ -2399,7 +2432,7 @@ my $accumulation_date = maybe_grab_accumulation_date; if ($accumulation_date) { # Insert -d immediately after 'cvs log' - my $Log_Date_Command = "-d\'>${accumulation_date}\'"; + my $Log_Date_Command = "-d>${accumulation_date}"; my ($log_index) = grep $command->[$_] eq 'log', 0..$#$command; splice @$command, $log_index+1, 0, $Log_Date_Command; @@ -2456,6 +2489,7 @@ } # ------------------------------------- + sub parse_options { # Check this internally before setting the global variable. my $output_file; @@ -2605,7 +2639,7 @@ ) or die "options parsing failed\n"; - push @log_source_command, map "'$_'", @ARGV; + push @log_source_command, map "$_", @ARGV; ## Check for contradictions... @@ -2858,7 +2892,8 @@ =item B<-I> I, B<--ignore> I Ignore files whose names match I. This option may be used multiple -times. +times. The regexp is a perl regular expression. It is matched as is; you may +want to prefix with a ^ or suffix with a $ to anchor the match. =item B<-C>, B<--case-insensitive> @@ -3038,6 +3073,14 @@ Note that the rules for quoting under windows shells are different. +=item * + +To run in an automated environment such as CGI or PHP, suidperl may be needed +in order to execute as the correct user to enable /cvsroot read lock files to +be written for the 'cvs log' command. This is likely just a case of changing +the /usr/bin/perl command to /usr/bin/suidperl, and explicitly declaring the +PATH variable. + =back =head1 EXAMPLES @@ -3099,6 +3142,8 @@ =item Terry Kane +=item Pete Kempf + =item Akos Kiss =item Claus Klein @@ -3121,7 +3166,11 @@ =item Thomas Parmelan -=item Johanne Stezenbach +=item Jordan Russell + +=item Jacek Sliwerski + +=item Johannes Stezenbach =item Joseph Walton Index: cvs2cl.spec =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/RHL-9/cvs2cl.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cvs2cl.spec 8 Nov 2004 04:11:28 -0000 1.2 +++ cvs2cl.spec 23 Jan 2005 16:24:57 -0000 1.3 @@ -1,5 +1,5 @@ Name: cvs2cl -Version: 2.57 +Version: 2.58 Release: 0.fdr.1.rh90 Epoch: 0 Summary: Utility which generates ChangeLogs from CVS working copies @@ -67,6 +67,9 @@ %changelog +* Sun Jan 16 2005 Marius L. J??hndal - 0:2.58-0.fdr.1 +- Updated to 2.58. + * Sat Jul 10 2004 Marius L. J??hndal - 0:2.57-0.fdr.1 - Updated to 2.57. - Moved XML and XSLT files from _datadir/sgml to _datadir/xml. From fedora-extras-commits at redhat.com Sun Jan 23 16:25:58 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:25:58 -0500 Subject: rpms/cvs2cl import.log,1.7,1.8 Message-ID: <200501231625.j0NGPwRh010507@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/cvs2cl In directory cvs.fedora.redhat.com:/tmp/cvs-serv10498 Modified Files: import.log Log Message: auto-import cvs2cl-2.58-0.fdr.1.1 on branch FC-1 from cvs2cl-2.58-0.fdr.1.1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 23 Jan 2005 16:24:57 -0000 1.7 +++ import.log 23 Jan 2005 16:25:56 -0000 1.8 @@ -4,3 +4,4 @@ cvs2cl-2_57-0_fdr_1_2:HEAD:cvs2cl-2.57-0.fdr.1.2.src.rpm:1099887149 cvs2cl-2_58-0_fdr_1_rh80:RHL-8:cvs2cl-2.58-0.fdr.1.rh80.src.rpm:1106497375 cvs2cl-2_58-0_fdr_1_rh90:RHL-9:cvs2cl-2.58-0.fdr.1.rh90.src.rpm:1106497476 +cvs2cl-2_58-0_fdr_1_1:FC-1:cvs2cl-2.58-0.fdr.1.1.src.rpm:1106497541 From fedora-extras-commits at redhat.com Sun Jan 23 16:25:58 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:25:58 -0500 Subject: rpms/cvs2cl/FC-1 cvs2cl.pl,1.1,1.2 cvs2cl.spec,1.3,1.4 Message-ID: <200501231625.j0NGPw91010511@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/cvs2cl/FC-1 In directory cvs.fedora.redhat.com:/tmp/cvs-serv10498/FC-1 Modified Files: cvs2cl.pl cvs2cl.spec Log Message: auto-import cvs2cl-2.58-0.fdr.1.1 on branch FC-1 from cvs2cl-2.58-0.fdr.1.1.src.rpm Index: cvs2cl.pl =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/FC-1/cvs2cl.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cvs2cl.pl 8 Nov 2004 04:11:22 -0000 1.1 +++ cvs2cl.pl 23 Jan 2005 16:25:56 -0000 1.2 @@ -19,6 +19,7 @@ use File::Basename qw( fileparse ); use Getopt::Long qw( GetOptions ); use Text::Wrap qw( ); +use Time::Local qw( timegm ); use User::pwent qw( getpwnam ); # The Plan: @@ -956,7 +957,20 @@ # ------------------------------------- sub output_tagdate { - # NOT YET DONE + my $self = shift; + my ($fh, $time, $tag) = @_; + + my ($y, $m, $d, $H, $M, $S) = (gmtime($time))[5,4,3,2,1,0]; + + # Ideally, this would honor $UTC_Times and use +HH:MM syntax + my $isoDate = sprintf("%04d-%02d-%02dT%02d:%02d:%02dZ", + $y + 1900, $m + 1, $d, $H, $M, $S); + + print $fh "\n"; + print $fh "$isoDate\n"; + print $fh "$tag\n"; + print $fh "\n\n"; + return; } # ------------------------------------- @@ -1052,11 +1066,6 @@ my $follow_branches = $self->{follow_branches}; my $follow_only = $self->{follow_only}; -#print STDERR "IG: ", join(',', keys %{$self->{ignore_tags}}), "\n"; -#print STDERR "IX: ", join(',', @{$qunk->{tags}}), "\n" if defined $qunk->{tags}; -#print STDERR "IQ: ", join(',', keys %{$qunk->{branch_numbers}}), "\n" if defined $qunk->{branch_numbers}; -#use Data::Dumper; print STDERR Dumper $qunk; - for my $ignore_tag (keys %{$self->{ignore_tags}}) { return if defined $qunk->{tags} and grep $_ eq $ignore_tag, @{$qunk->{tags}}; @@ -1096,12 +1105,13 @@ ($branch_number . ".") ) { if ( $followsub ) { return 1; - } elsif (length($revision) == length($branch_number)+2 ) { +# } elsif ( length($revision) == length($branch_number)+2 ) { + } elsif ( substr($revision, length($branch_number)+1) =~ /^\d+$/ ) { return 1; } } elsif ( length($branch_number) > length($revision) and - $No_Ancestors ) { + ! $No_Ancestors ) { # Non-trivial case: check if rev is ancestral to branch # r_left still has the trailing "." @@ -1214,13 +1224,13 @@ # XML output includes everything else, we might as well make # it always include Day Of Week too, for consistency. my $authorhash = $changelog{$time}; - if ($Show_Tag_Dates) { + if ( $Show_Tag_Dates || $XML_Output ) { my %tags; while (my ($author,$mesghash) = each %$authorhash) { while (my ($msg,$qunk) = each %$mesghash) { - foreach my $qunkref2 (@$qunk) { + for my $qunkref2 (@$qunk) { if (defined ($qunkref2->tags)) { - foreach my $tag (@{$qunkref2->tags}) { + for my $tag (@{$qunkref2->tags}) { $tags{$tag} = 1; } } @@ -1925,22 +1935,38 @@ sub read_changelog { my ($self, $command) = @_; -# my $grand_poobah = CVS::Utils::ChangeLog::EntrySet->new; - + local (*READER, *WRITER); + my $pid; if (! $Input_From_Stdin) { - my $Log_Source_Command = join(' ', @$command); - &main::debug ("(run \"${Log_Source_Command}\")\n"); - open (LOG_SOURCE, "$Log_Source_Command |") - or die "unable to run \"${Log_Source_Command}\""; + pipe(READER, WRITER) + or die "Couldn't form pipe: $!\n"; + $pid = fork; + die "Couldn't fork: $!\n" + if ! defined $pid; + if ( ! $pid ) { # child + open STDOUT, '>&=' . fileno WRITER + or die "Couldn't dup stderr to ", fileno WRITER, "\n"; + # strangely, some perls give spurious warnings about STDIN being opened + # for output only these close calls precede the STDOUT reopen above. + # I think they must be reusing fd 1. + close READER; + close STDIN; + + exec @$command; + } + + close WRITER; + + &main::debug ("(run \"@$command\")\n"); } else { - open (LOG_SOURCE, "-") or die "unable to open stdin for reading"; + open READER, '-' or die "unable to open stdin for reading"; } - binmode LOG_SOURCE; + binmode READER; XX_Log_Source: - while () { + while () { chomp; s!\r$!!; @@ -1968,17 +1994,19 @@ # log message texts: $self->{rev_msg} .= $_ . "\n"; # Normally, just accumulate the message... } else { + my $noadd = 0; if ( ! $self->{rev_msg} or $self->{rev_msg} =~ /^\s*(\.\s*)?$/ or index($self->{rev_msg}, EMPTY_LOG_MESSAGE) > -1 ) { # ... until a msg separator is encountered: # Ensure the message contains something: - $self->clear_msg + $self->clear_msg, $noadd = 1 if $Prune_Empty_Msgs; $self->{rev_msg} = "[no log message]\n"; } - $self->add_file_entry; + $self->add_file_entry + unless $noadd; if ( $_ eq FILE_SEPARATOR ) { $self->clear_file; @@ -1988,9 +2016,15 @@ } } - close LOG_SOURCE - or die sprintf("Problem reading log input (exit/signal/core: %d/%d/%d)\n", - $? >> 8, $? & 127, $? & 128); + close READER + or die "Couldn't close pipe reader: $!\n"; + if ( defined $pid ) { + my $rv; + waitpid $pid, 0; + 0 == $? + or $!=1, die sprintf("Problem reading log input (pid/exit/signal/core: %d/%d/%d/%d)\n", + $pid, $? >> 8, $? & 127, $? & 128); + } return; } @@ -2127,9 +2161,8 @@ ($base, undef, undef) = fileparse($path); my $xpath = $Case_Insensitive ? lc($path) : $path; - if ( grep index($path, $_) > -1, @Ignore_Files ) { - return; - } + return + if grep $path =~ /$_/, @Ignore_Files; } $self->{filename} = $path; @@ -2399,7 +2432,7 @@ my $accumulation_date = maybe_grab_accumulation_date; if ($accumulation_date) { # Insert -d immediately after 'cvs log' - my $Log_Date_Command = "-d\'>${accumulation_date}\'"; + my $Log_Date_Command = "-d>${accumulation_date}"; my ($log_index) = grep $command->[$_] eq 'log', 0..$#$command; splice @$command, $log_index+1, 0, $Log_Date_Command; @@ -2456,6 +2489,7 @@ } # ------------------------------------- + sub parse_options { # Check this internally before setting the global variable. my $output_file; @@ -2605,7 +2639,7 @@ ) or die "options parsing failed\n"; - push @log_source_command, map "'$_'", @ARGV; + push @log_source_command, map "$_", @ARGV; ## Check for contradictions... @@ -2858,7 +2892,8 @@ =item B<-I> I, B<--ignore> I Ignore files whose names match I. This option may be used multiple -times. +times. The regexp is a perl regular expression. It is matched as is; you may +want to prefix with a ^ or suffix with a $ to anchor the match. =item B<-C>, B<--case-insensitive> @@ -3038,6 +3073,14 @@ Note that the rules for quoting under windows shells are different. +=item * + +To run in an automated environment such as CGI or PHP, suidperl may be needed +in order to execute as the correct user to enable /cvsroot read lock files to +be written for the 'cvs log' command. This is likely just a case of changing +the /usr/bin/perl command to /usr/bin/suidperl, and explicitly declaring the +PATH variable. + =back =head1 EXAMPLES @@ -3099,6 +3142,8 @@ =item Terry Kane +=item Pete Kempf + =item Akos Kiss =item Claus Klein @@ -3121,7 +3166,11 @@ =item Thomas Parmelan -=item Johanne Stezenbach +=item Jordan Russell + +=item Jacek Sliwerski + +=item Johannes Stezenbach =item Joseph Walton Index: cvs2cl.spec =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/FC-1/cvs2cl.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cvs2cl.spec 8 Nov 2004 04:11:34 -0000 1.3 +++ cvs2cl.spec 23 Jan 2005 16:25:56 -0000 1.4 @@ -1,5 +1,5 @@ Name: cvs2cl -Version: 2.57 +Version: 2.58 Release: 0.fdr.1.1 Epoch: 0 Summary: Utility which generates ChangeLogs from CVS working copies @@ -67,6 +67,9 @@ %changelog +* Sun Jan 16 2005 Marius L. J??hndal - 0:2.58-0.fdr.1 +- Updated to 2.58. + * Sat Jul 10 2004 Marius L. J??hndal - 0:2.57-0.fdr.1 - Updated to 2.57. - Moved XML and XSLT files from _datadir/sgml to _datadir/xml. From fedora-extras-commits at redhat.com Sun Jan 23 16:27:22 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:27:22 -0500 Subject: rpms/cvs2cl import.log,1.8,1.9 Message-ID: <200501231627.j0NGRMEV010635@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/cvs2cl In directory cvs.fedora.redhat.com:/tmp/cvs-serv10626 Modified Files: import.log Log Message: auto-import cvs2cl-2.58-0.fdr.1.2 on branch FC-2 from cvs2cl-2.58-0.fdr.1.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 23 Jan 2005 16:25:56 -0000 1.8 +++ import.log 23 Jan 2005 16:27:20 -0000 1.9 @@ -5,3 +5,4 @@ cvs2cl-2_58-0_fdr_1_rh80:RHL-8:cvs2cl-2.58-0.fdr.1.rh80.src.rpm:1106497375 cvs2cl-2_58-0_fdr_1_rh90:RHL-9:cvs2cl-2.58-0.fdr.1.rh90.src.rpm:1106497476 cvs2cl-2_58-0_fdr_1_1:FC-1:cvs2cl-2.58-0.fdr.1.1.src.rpm:1106497541 +cvs2cl-2_58-0_fdr_1_2:FC-2:cvs2cl-2.58-0.fdr.1.2.src.rpm:1106497622 From fedora-extras-commits at redhat.com Sun Jan 23 16:27:22 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:27:22 -0500 Subject: rpms/cvs2cl/FC-2 cvs2cl.pl,1.1,1.2 cvs2cl.spec,1.4,1.5 Message-ID: <200501231627.j0NGRMsb010639@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/cvs2cl/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv10626/FC-2 Modified Files: cvs2cl.pl cvs2cl.spec Log Message: auto-import cvs2cl-2.58-0.fdr.1.2 on branch FC-2 from cvs2cl-2.58-0.fdr.1.2.src.rpm Index: cvs2cl.pl =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/FC-2/cvs2cl.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cvs2cl.pl 8 Nov 2004 04:11:22 -0000 1.1 +++ cvs2cl.pl 23 Jan 2005 16:27:20 -0000 1.2 @@ -19,6 +19,7 @@ use File::Basename qw( fileparse ); use Getopt::Long qw( GetOptions ); use Text::Wrap qw( ); +use Time::Local qw( timegm ); use User::pwent qw( getpwnam ); # The Plan: @@ -956,7 +957,20 @@ # ------------------------------------- sub output_tagdate { - # NOT YET DONE + my $self = shift; + my ($fh, $time, $tag) = @_; + + my ($y, $m, $d, $H, $M, $S) = (gmtime($time))[5,4,3,2,1,0]; + + # Ideally, this would honor $UTC_Times and use +HH:MM syntax + my $isoDate = sprintf("%04d-%02d-%02dT%02d:%02d:%02dZ", + $y + 1900, $m + 1, $d, $H, $M, $S); + + print $fh "\n"; + print $fh "$isoDate\n"; + print $fh "$tag\n"; + print $fh "\n\n"; + return; } # ------------------------------------- @@ -1052,11 +1066,6 @@ my $follow_branches = $self->{follow_branches}; my $follow_only = $self->{follow_only}; -#print STDERR "IG: ", join(',', keys %{$self->{ignore_tags}}), "\n"; -#print STDERR "IX: ", join(',', @{$qunk->{tags}}), "\n" if defined $qunk->{tags}; -#print STDERR "IQ: ", join(',', keys %{$qunk->{branch_numbers}}), "\n" if defined $qunk->{branch_numbers}; -#use Data::Dumper; print STDERR Dumper $qunk; - for my $ignore_tag (keys %{$self->{ignore_tags}}) { return if defined $qunk->{tags} and grep $_ eq $ignore_tag, @{$qunk->{tags}}; @@ -1096,12 +1105,13 @@ ($branch_number . ".") ) { if ( $followsub ) { return 1; - } elsif (length($revision) == length($branch_number)+2 ) { +# } elsif ( length($revision) == length($branch_number)+2 ) { + } elsif ( substr($revision, length($branch_number)+1) =~ /^\d+$/ ) { return 1; } } elsif ( length($branch_number) > length($revision) and - $No_Ancestors ) { + ! $No_Ancestors ) { # Non-trivial case: check if rev is ancestral to branch # r_left still has the trailing "." @@ -1214,13 +1224,13 @@ # XML output includes everything else, we might as well make # it always include Day Of Week too, for consistency. my $authorhash = $changelog{$time}; - if ($Show_Tag_Dates) { + if ( $Show_Tag_Dates || $XML_Output ) { my %tags; while (my ($author,$mesghash) = each %$authorhash) { while (my ($msg,$qunk) = each %$mesghash) { - foreach my $qunkref2 (@$qunk) { + for my $qunkref2 (@$qunk) { if (defined ($qunkref2->tags)) { - foreach my $tag (@{$qunkref2->tags}) { + for my $tag (@{$qunkref2->tags}) { $tags{$tag} = 1; } } @@ -1925,22 +1935,38 @@ sub read_changelog { my ($self, $command) = @_; -# my $grand_poobah = CVS::Utils::ChangeLog::EntrySet->new; - + local (*READER, *WRITER); + my $pid; if (! $Input_From_Stdin) { - my $Log_Source_Command = join(' ', @$command); - &main::debug ("(run \"${Log_Source_Command}\")\n"); - open (LOG_SOURCE, "$Log_Source_Command |") - or die "unable to run \"${Log_Source_Command}\""; + pipe(READER, WRITER) + or die "Couldn't form pipe: $!\n"; + $pid = fork; + die "Couldn't fork: $!\n" + if ! defined $pid; + if ( ! $pid ) { # child + open STDOUT, '>&=' . fileno WRITER + or die "Couldn't dup stderr to ", fileno WRITER, "\n"; + # strangely, some perls give spurious warnings about STDIN being opened + # for output only these close calls precede the STDOUT reopen above. + # I think they must be reusing fd 1. + close READER; + close STDIN; + + exec @$command; + } + + close WRITER; + + &main::debug ("(run \"@$command\")\n"); } else { - open (LOG_SOURCE, "-") or die "unable to open stdin for reading"; + open READER, '-' or die "unable to open stdin for reading"; } - binmode LOG_SOURCE; + binmode READER; XX_Log_Source: - while () { + while () { chomp; s!\r$!!; @@ -1968,17 +1994,19 @@ # log message texts: $self->{rev_msg} .= $_ . "\n"; # Normally, just accumulate the message... } else { + my $noadd = 0; if ( ! $self->{rev_msg} or $self->{rev_msg} =~ /^\s*(\.\s*)?$/ or index($self->{rev_msg}, EMPTY_LOG_MESSAGE) > -1 ) { # ... until a msg separator is encountered: # Ensure the message contains something: - $self->clear_msg + $self->clear_msg, $noadd = 1 if $Prune_Empty_Msgs; $self->{rev_msg} = "[no log message]\n"; } - $self->add_file_entry; + $self->add_file_entry + unless $noadd; if ( $_ eq FILE_SEPARATOR ) { $self->clear_file; @@ -1988,9 +2016,15 @@ } } - close LOG_SOURCE - or die sprintf("Problem reading log input (exit/signal/core: %d/%d/%d)\n", - $? >> 8, $? & 127, $? & 128); + close READER + or die "Couldn't close pipe reader: $!\n"; + if ( defined $pid ) { + my $rv; + waitpid $pid, 0; + 0 == $? + or $!=1, die sprintf("Problem reading log input (pid/exit/signal/core: %d/%d/%d/%d)\n", + $pid, $? >> 8, $? & 127, $? & 128); + } return; } @@ -2127,9 +2161,8 @@ ($base, undef, undef) = fileparse($path); my $xpath = $Case_Insensitive ? lc($path) : $path; - if ( grep index($path, $_) > -1, @Ignore_Files ) { - return; - } + return + if grep $path =~ /$_/, @Ignore_Files; } $self->{filename} = $path; @@ -2399,7 +2432,7 @@ my $accumulation_date = maybe_grab_accumulation_date; if ($accumulation_date) { # Insert -d immediately after 'cvs log' - my $Log_Date_Command = "-d\'>${accumulation_date}\'"; + my $Log_Date_Command = "-d>${accumulation_date}"; my ($log_index) = grep $command->[$_] eq 'log', 0..$#$command; splice @$command, $log_index+1, 0, $Log_Date_Command; @@ -2456,6 +2489,7 @@ } # ------------------------------------- + sub parse_options { # Check this internally before setting the global variable. my $output_file; @@ -2605,7 +2639,7 @@ ) or die "options parsing failed\n"; - push @log_source_command, map "'$_'", @ARGV; + push @log_source_command, map "$_", @ARGV; ## Check for contradictions... @@ -2858,7 +2892,8 @@ =item B<-I> I, B<--ignore> I Ignore files whose names match I. This option may be used multiple -times. +times. The regexp is a perl regular expression. It is matched as is; you may +want to prefix with a ^ or suffix with a $ to anchor the match. =item B<-C>, B<--case-insensitive> @@ -3038,6 +3073,14 @@ Note that the rules for quoting under windows shells are different. +=item * + +To run in an automated environment such as CGI or PHP, suidperl may be needed +in order to execute as the correct user to enable /cvsroot read lock files to +be written for the 'cvs log' command. This is likely just a case of changing +the /usr/bin/perl command to /usr/bin/suidperl, and explicitly declaring the +PATH variable. + =back =head1 EXAMPLES @@ -3099,6 +3142,8 @@ =item Terry Kane +=item Pete Kempf + =item Akos Kiss =item Claus Klein @@ -3121,7 +3166,11 @@ =item Thomas Parmelan -=item Johanne Stezenbach +=item Jordan Russell + +=item Jacek Sliwerski + +=item Johannes Stezenbach =item Joseph Walton Index: cvs2cl.spec =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/FC-2/cvs2cl.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cvs2cl.spec 8 Nov 2004 04:12:29 -0000 1.4 +++ cvs2cl.spec 23 Jan 2005 16:27:20 -0000 1.5 @@ -1,5 +1,5 @@ Name: cvs2cl -Version: 2.57 +Version: 2.58 Release: 0.fdr.1.2 Epoch: 0 Summary: Utility which generates ChangeLogs from CVS working copies @@ -67,6 +67,9 @@ %changelog +* Sun Jan 16 2005 Marius L. J??hndal - 0:2.58-0.fdr.1 +- Updated to 2.58. + * Sat Jul 10 2004 Marius L. J??hndal - 0:2.57-0.fdr.1 - Updated to 2.57. - Moved XML and XSLT files from _datadir/sgml to _datadir/xml. From fedora-extras-commits at redhat.com Sun Jan 23 16:27:45 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:27:45 -0500 Subject: rpms/graphviz/devel .cvsignore, 1.3, 1.4 graphviz.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200501231627.j0NGRjCO010723@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/graphviz/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv10717 Modified Files: .cvsignore graphviz.spec sources Log Message: Update to 2.2, thanks to John Ellison (#143122). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/graphviz/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:31:13 -0000 1.3 +++ .cvsignore 23 Jan 2005 16:27:43 -0000 1.4 @@ -1 +1 @@ -graphviz-1.12.tar.gz +graphviz-2.2.tar.gz Index: graphviz.spec =================================================================== RCS file: /cvs/extras/rpms/graphviz/devel/graphviz.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- graphviz.spec 10 Dec 2004 22:03:03 -0000 1.5 +++ graphviz.spec 23 Jan 2005 16:27:43 -0000 1.6 @@ -1,32 +1,56 @@ -# Note: graphviz requires gd with gif support, hence use internal one for now. +# Note: graphviz requires gd with gif support (and other fixes), hence use +# internal one for now. Summary: Graph Visualization Tools Name: graphviz -Version: 1.12 -Release: 2 +Version: 2.2 +Release: 3 Epoch: 0 Group: Applications/Multimedia -License: AT&T open source (see COPYING) +License: CPL URL: http://www.graphviz.org/ -Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-1.12.tar.gz +Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.2.tar.gz BuildRoot: %{_tmppath}/%{name}-root BuildRequires: zlib-devel libpng-devel libjpeg-devel XFree86-devel expat-devel -BuildRequires: bison m4 flex tk tcl >= 0:8.3 +BuildRequires: /bin/ksh bison m4 flex tk tcl >= 0:8.3 BuildRequires: /usr/include/tcl.h /usr/include/tk.h +%package tcl +Group: Applications/Multimedia +Summary: Tcl extension tools for %{name} +Requires: %{name} = %{epoch}:%{version}-%{release} tcl >= 0:8.3 tk + %package devel Summary: Development package for %{name} Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release} pkgconfig + +%package doc +Group: Documentation +Summary: PDF and HTML documents for %{name} + +%package graphs +Group: Applications/Multimedia +Summary: Demo graphs for %{name} + %description A collection of tools and tcl packages for the manipulation and layout of graphs (as in nodes and edges, not as in barcharts). +%description tcl +Various tcl packages (extensions) for the %{name} tools. + %description devel A collection of tools and tcl packages for the manipulation and layout of graphs (as in nodes and edges, not as in barcharts). -This package contains development files for %{name} +This package contains development files for %{name}. + +%description doc +Provides some additional PDF and HTML documentation for %{name}. + +%description graphs +Some demo graphs for %{name}. %prep @@ -36,17 +60,32 @@ %build # XXX ix86 only used to have -ffast-math, let's use everywhere %{expand: %%define optflags %{optflags} -ffast-math} -%configure --with-x -make docdir=%{_docdir}/%{name} %{?_smp_mflags} +# %%configure is broken in RH7.3 rpmbuild +# need unreleased changes to gd, so use --with-mylibgd for now. +CFLAGS="$RPM_OPT_FLAGS" \ +./configure \ + --prefix=%{_prefix} \ + --bindir=%{_bindir} \ + --libdir=%{_libdir} \ + --includedir=%{_includedir} \ + --datadir=%{_datadir} \ + --mandir=%{_mandir} \ + --with-x \ + --with-mylibgd \ + --disable-dependency-tracking +make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT __doc make \ DESTDIR=$RPM_BUILD_ROOT \ - docdir=$RPM_BUILD_ROOT%{_docdir}/%{name} \ + pkgconfigdir=%{_libdir}/pkgconfig \ transform='s,x,x,' \ install +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 %clean @@ -54,26 +93,77 @@ %files -%defattr(-,root,root) -%doc AUTHORS COPYING MINTERMS.txt NEWS README -%doc doc/*.html doc/*.pdf doc/*.ref +%defattr(-,root,root,-) +%doc AUTHORS COPYING ChangeLog NEWS README %{_bindir}/* %dir %{_libdir}/%{name} -%{_libdir}/%{name}/pkgIndex.tcl %{_libdir}/%{name}/*.so.* %{_mandir}/man1/*.1* +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/lefty +%exclude %{_libdir}/%{name}/lib*tcl*.so.* +%exclude %{_libdir}/%{name}/libtk*.so.* +%exclude %{_bindir}/dotneato-config +%exclude %{_mandir}/man1/dotneato-config.1* + +%files tcl +%defattr(-,root,root,-) +%{_libdir}/%{name}/lib*tcl*.so.*.* +%{_libdir}/%{name}/libtk*.so.*.* +%{_libdir}/%{name}/pkgIndex.tcl +%{_datadir}/%{name}/demo %{_mandir}/mann/*.n* -%{_datadir}/%{name} +%exclude %{_libdir}/%{name}/lib*tcl*.so.? +%exclude %{_libdir}/%{name}/libtk*.so.? %files devel %defattr(-,root,root,-) +%{_bindir}/dotneato-config %{_includedir}/%{name} %{_libdir}/%{name}/*.la %{_libdir}/%{name}/*.so +%{_libdir}/pkgconfig/*.pc +%{_mandir}/man1/dotneato-config.1* %{_mandir}/man3/*.3* +%exclude %{_libdir}/%{name}/lib*tcl*.* +%exclude %{_libdir}/%{name}/libtk*.* + +%files graphs +%defattr(-,root,root,-) +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/graphs + +%files doc +%defattr(-,root,root,-) +%doc __doc/* %changelog +* Sun Jan 23 2005 John Ellson - 0:2.2-3 +- change BuildRequires to /bin/ksh, since ksh doesn't provide a /usr/bin/ksh +- change devel exclude to also exclude libtcl*.la + +* Sat Jan 22 2005 Ville Skytt?? - 0:2.2-2 +- Move -doc back to %%{__docdir}, remove unused docdir=... from build. +- Own %%{_datadir}/%%{name} in -graphs. +- Require tcl and tk in -tcl. +- Require pkgconfig in -devel, fix *.pc install location. +- Build without dependency tracking. +- Honor $RPM_OPT_FLAGS again. +- Move dotneato-config to -devel. +- Fix lefty/* permissions. + +* Sat Jan 22 2005 John Ellson - 0:2.2-1 +- Updated to 2.2 +- split out: + graphviz-docs - optional and large + graphviz-graphs - optional demo graphs + graphviz-tcl - optional, of interest only to tcl users, requires tcl +- avoid use of %%configure which breaks on RH73 +- add some pkgconfigs - probably in wrong place they're a bit experimental + so OK for now +- add BuildRequires /usr/bin/ksh (either pdksh or the real one) + * Thu Jun 3 2004 Ville Skytt?? - 0:1.12-0.fdr.2 - BuildRequire m4 to work around https://bugzilla.redhat.com/108655 on FC1. Index: sources =================================================================== RCS file: /cvs/extras/rpms/graphviz/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:31:13 -0000 1.3 +++ sources 23 Jan 2005 16:27:43 -0000 1.4 @@ -1 +1 @@ -84910caae072c714d107ca9f3e54ace0 graphviz-1.12.tar.gz +9275d30695a5c22f360acbef7b85acd3 graphviz-2.2.tar.gz From fedora-extras-commits at redhat.com Sun Jan 23 16:29:04 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:29:04 -0500 Subject: rpms/cvs2cl import.log,1.9,1.10 Message-ID: <200501231629.j0NGT4KG010788@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/cvs2cl In directory cvs.fedora.redhat.com:/tmp/cvs-serv10778 Modified Files: import.log Log Message: auto-import cvs2cl-2.58-1 on branch devel from cvs2cl-2.58-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/import.log,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- import.log 23 Jan 2005 16:27:20 -0000 1.9 +++ import.log 23 Jan 2005 16:29:02 -0000 1.10 @@ -6,3 +6,4 @@ cvs2cl-2_58-0_fdr_1_rh90:RHL-9:cvs2cl-2.58-0.fdr.1.rh90.src.rpm:1106497476 cvs2cl-2_58-0_fdr_1_1:FC-1:cvs2cl-2.58-0.fdr.1.1.src.rpm:1106497541 cvs2cl-2_58-0_fdr_1_2:FC-2:cvs2cl-2.58-0.fdr.1.2.src.rpm:1106497622 +cvs2cl-2_58-1:HEAD:cvs2cl-2.58-1.src.rpm:1106497728 From fedora-extras-commits at redhat.com Sun Jan 23 16:29:04 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:29:04 -0500 Subject: rpms/cvs2cl/devel cvs2cl.pl,1.1,1.2 cvs2cl.spec,1.5,1.6 Message-ID: <200501231629.j0NGT4vr010791@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/cvs2cl/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv10778/devel Modified Files: cvs2cl.pl cvs2cl.spec Log Message: auto-import cvs2cl-2.58-1 on branch devel from cvs2cl-2.58-1.src.rpm Index: cvs2cl.pl =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/devel/cvs2cl.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cvs2cl.pl 8 Nov 2004 04:11:22 -0000 1.1 +++ cvs2cl.pl 23 Jan 2005 16:29:02 -0000 1.2 @@ -19,6 +19,7 @@ use File::Basename qw( fileparse ); use Getopt::Long qw( GetOptions ); use Text::Wrap qw( ); +use Time::Local qw( timegm ); use User::pwent qw( getpwnam ); # The Plan: @@ -956,7 +957,20 @@ # ------------------------------------- sub output_tagdate { - # NOT YET DONE + my $self = shift; + my ($fh, $time, $tag) = @_; + + my ($y, $m, $d, $H, $M, $S) = (gmtime($time))[5,4,3,2,1,0]; + + # Ideally, this would honor $UTC_Times and use +HH:MM syntax + my $isoDate = sprintf("%04d-%02d-%02dT%02d:%02d:%02dZ", + $y + 1900, $m + 1, $d, $H, $M, $S); + + print $fh "\n"; + print $fh "$isoDate\n"; + print $fh "$tag\n"; + print $fh "\n\n"; + return; } # ------------------------------------- @@ -1052,11 +1066,6 @@ my $follow_branches = $self->{follow_branches}; my $follow_only = $self->{follow_only}; -#print STDERR "IG: ", join(',', keys %{$self->{ignore_tags}}), "\n"; -#print STDERR "IX: ", join(',', @{$qunk->{tags}}), "\n" if defined $qunk->{tags}; -#print STDERR "IQ: ", join(',', keys %{$qunk->{branch_numbers}}), "\n" if defined $qunk->{branch_numbers}; -#use Data::Dumper; print STDERR Dumper $qunk; - for my $ignore_tag (keys %{$self->{ignore_tags}}) { return if defined $qunk->{tags} and grep $_ eq $ignore_tag, @{$qunk->{tags}}; @@ -1096,12 +1105,13 @@ ($branch_number . ".") ) { if ( $followsub ) { return 1; - } elsif (length($revision) == length($branch_number)+2 ) { +# } elsif ( length($revision) == length($branch_number)+2 ) { + } elsif ( substr($revision, length($branch_number)+1) =~ /^\d+$/ ) { return 1; } } elsif ( length($branch_number) > length($revision) and - $No_Ancestors ) { + ! $No_Ancestors ) { # Non-trivial case: check if rev is ancestral to branch # r_left still has the trailing "." @@ -1214,13 +1224,13 @@ # XML output includes everything else, we might as well make # it always include Day Of Week too, for consistency. my $authorhash = $changelog{$time}; - if ($Show_Tag_Dates) { + if ( $Show_Tag_Dates || $XML_Output ) { my %tags; while (my ($author,$mesghash) = each %$authorhash) { while (my ($msg,$qunk) = each %$mesghash) { - foreach my $qunkref2 (@$qunk) { + for my $qunkref2 (@$qunk) { if (defined ($qunkref2->tags)) { - foreach my $tag (@{$qunkref2->tags}) { + for my $tag (@{$qunkref2->tags}) { $tags{$tag} = 1; } } @@ -1925,22 +1935,38 @@ sub read_changelog { my ($self, $command) = @_; -# my $grand_poobah = CVS::Utils::ChangeLog::EntrySet->new; - + local (*READER, *WRITER); + my $pid; if (! $Input_From_Stdin) { - my $Log_Source_Command = join(' ', @$command); - &main::debug ("(run \"${Log_Source_Command}\")\n"); - open (LOG_SOURCE, "$Log_Source_Command |") - or die "unable to run \"${Log_Source_Command}\""; + pipe(READER, WRITER) + or die "Couldn't form pipe: $!\n"; + $pid = fork; + die "Couldn't fork: $!\n" + if ! defined $pid; + if ( ! $pid ) { # child + open STDOUT, '>&=' . fileno WRITER + or die "Couldn't dup stderr to ", fileno WRITER, "\n"; + # strangely, some perls give spurious warnings about STDIN being opened + # for output only these close calls precede the STDOUT reopen above. + # I think they must be reusing fd 1. + close READER; + close STDIN; + + exec @$command; + } + + close WRITER; + + &main::debug ("(run \"@$command\")\n"); } else { - open (LOG_SOURCE, "-") or die "unable to open stdin for reading"; + open READER, '-' or die "unable to open stdin for reading"; } - binmode LOG_SOURCE; + binmode READER; XX_Log_Source: - while () { + while () { chomp; s!\r$!!; @@ -1968,17 +1994,19 @@ # log message texts: $self->{rev_msg} .= $_ . "\n"; # Normally, just accumulate the message... } else { + my $noadd = 0; if ( ! $self->{rev_msg} or $self->{rev_msg} =~ /^\s*(\.\s*)?$/ or index($self->{rev_msg}, EMPTY_LOG_MESSAGE) > -1 ) { # ... until a msg separator is encountered: # Ensure the message contains something: - $self->clear_msg + $self->clear_msg, $noadd = 1 if $Prune_Empty_Msgs; $self->{rev_msg} = "[no log message]\n"; } - $self->add_file_entry; + $self->add_file_entry + unless $noadd; if ( $_ eq FILE_SEPARATOR ) { $self->clear_file; @@ -1988,9 +2016,15 @@ } } - close LOG_SOURCE - or die sprintf("Problem reading log input (exit/signal/core: %d/%d/%d)\n", - $? >> 8, $? & 127, $? & 128); + close READER + or die "Couldn't close pipe reader: $!\n"; + if ( defined $pid ) { + my $rv; + waitpid $pid, 0; + 0 == $? + or $!=1, die sprintf("Problem reading log input (pid/exit/signal/core: %d/%d/%d/%d)\n", + $pid, $? >> 8, $? & 127, $? & 128); + } return; } @@ -2127,9 +2161,8 @@ ($base, undef, undef) = fileparse($path); my $xpath = $Case_Insensitive ? lc($path) : $path; - if ( grep index($path, $_) > -1, @Ignore_Files ) { - return; - } + return + if grep $path =~ /$_/, @Ignore_Files; } $self->{filename} = $path; @@ -2399,7 +2432,7 @@ my $accumulation_date = maybe_grab_accumulation_date; if ($accumulation_date) { # Insert -d immediately after 'cvs log' - my $Log_Date_Command = "-d\'>${accumulation_date}\'"; + my $Log_Date_Command = "-d>${accumulation_date}"; my ($log_index) = grep $command->[$_] eq 'log', 0..$#$command; splice @$command, $log_index+1, 0, $Log_Date_Command; @@ -2456,6 +2489,7 @@ } # ------------------------------------- + sub parse_options { # Check this internally before setting the global variable. my $output_file; @@ -2605,7 +2639,7 @@ ) or die "options parsing failed\n"; - push @log_source_command, map "'$_'", @ARGV; + push @log_source_command, map "$_", @ARGV; ## Check for contradictions... @@ -2858,7 +2892,8 @@ =item B<-I> I, B<--ignore> I Ignore files whose names match I. This option may be used multiple -times. +times. The regexp is a perl regular expression. It is matched as is; you may +want to prefix with a ^ or suffix with a $ to anchor the match. =item B<-C>, B<--case-insensitive> @@ -3038,6 +3073,14 @@ Note that the rules for quoting under windows shells are different. +=item * + +To run in an automated environment such as CGI or PHP, suidperl may be needed +in order to execute as the correct user to enable /cvsroot read lock files to +be written for the 'cvs log' command. This is likely just a case of changing +the /usr/bin/perl command to /usr/bin/suidperl, and explicitly declaring the +PATH variable. + =back =head1 EXAMPLES @@ -3099,6 +3142,8 @@ =item Terry Kane +=item Pete Kempf + =item Akos Kiss =item Claus Klein @@ -3121,7 +3166,11 @@ =item Thomas Parmelan -=item Johanne Stezenbach +=item Jordan Russell + +=item Jacek Sliwerski + +=item Johannes Stezenbach =item Joseph Walton Index: cvs2cl.spec =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/devel/cvs2cl.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cvs2cl.spec 10 Dec 2004 22:03:02 -0000 1.5 +++ cvs2cl.spec 23 Jan 2005 16:29:02 -0000 1.6 @@ -1,5 +1,5 @@ Name: cvs2cl -Version: 2.57 +Version: 2.58 Release: 1 Epoch: 0 Summary: Utility which generates ChangeLogs from CVS working copies @@ -67,6 +67,9 @@ %changelog +* Sun Jan 16 2005 Marius L. J??hndal - 0:2.58-1 +- Updated to 2.58. + * Sat Jul 10 2004 Marius L. J??hndal - 0:2.57-0.fdr.1 - Updated to 2.57. - Moved XML and XSLT files from _datadir/sgml to _datadir/xml. From fedora-extras-commits at redhat.com Sun Jan 23 16:30:20 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:30:20 -0500 Subject: rpms/nget import.log,1.3,1.4 Message-ID: <200501231630.j0NGUK6g010902@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/nget In directory cvs.fedora.redhat.com:/tmp/cvs-serv10893 Modified Files: import.log Log Message: auto-import nget-0.27.1-1.1 on branch FC-1 from nget-0.27.1-1.1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/nget/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 8 Nov 2004 04:54:17 -0000 1.3 +++ import.log 23 Jan 2005 16:30:18 -0000 1.4 @@ -1,2 +1,3 @@ nget-0_27-0_fdr_1_1:HEAD:nget-0.27-0.fdr.1.1.src.rpm:1099889651 nget-0_27-0_fdr_1_2:HEAD:nget-0.27-0.fdr.1.2.src.rpm:1099889657 +nget-0_27_1-1_1:FC-1:nget-0.27.1-1.1.src.rpm:1106497812 From fedora-extras-commits at redhat.com Sun Jan 23 16:30:20 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:30:20 -0500 Subject: rpms/nget/FC-1 .cvsignore, 1.2, 1.3 nget.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200501231630.j0NGUKFg010906@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/nget/FC-1 In directory cvs.fedora.redhat.com:/tmp/cvs-serv10893/FC-1 Modified Files: .cvsignore nget.spec sources Log Message: auto-import nget-0.27.1-1.1 on branch FC-1 from nget-0.27.1-1.1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nget/FC-1/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:54:11 -0000 1.2 +++ .cvsignore 23 Jan 2005 16:30:18 -0000 1.3 @@ -1 +1 @@ -nget-0.27.tar.gz +nget-0.27.1.tar.gz Index: nget.spec =================================================================== RCS file: /cvs/extras/rpms/nget/FC-1/nget.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nget.spec 8 Nov 2004 04:54:11 -0000 1.1 +++ nget.spec 23 Jan 2005 16:30:18 -0000 1.2 @@ -1,13 +1,13 @@ Name: nget -Version: 0.27 -Release: 0.fdr.1.1 +Version: 0.27.1 +Release: 1.1 Epoch: 0 Summary: A utility for retrieving files using the NNTP protocol Group: Applications/Internet License: GPL URL: http://nget.sourceforge.net/ -Source0: http://dl.sf.net/nget/nget-0.27.tar.gz +Source0: http://dl.sf.net/nget/nget-0.27.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel @@ -48,6 +48,9 @@ %changelog +* Sun Jan 16 2005 Marius L. J??hndal - 0:0.27.1-1 +- Updated to 0.27.1. + * Fri Jun 18 2004 Marius L. J??hndal - 0:0.27-0.fdr.1 - Updated to 0.27. Index: sources =================================================================== RCS file: /cvs/extras/rpms/nget/FC-1/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:54:11 -0000 1.2 +++ sources 23 Jan 2005 16:30:18 -0000 1.3 @@ -1 +1 @@ -55fca5c127961cf7ef4c77b2eab8e41e nget-0.27.tar.gz +0710a25aebede4799bd9ca3756573f6a nget-0.27.1.tar.gz From fedora-extras-commits at redhat.com Sun Jan 23 16:31:14 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:31:14 -0500 Subject: rpms/nget import.log,1.4,1.5 Message-ID: <200501231631.j0NGVEsW011012@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/nget In directory cvs.fedora.redhat.com:/tmp/cvs-serv11003 Modified Files: import.log Log Message: auto-import nget-0.27.1-1.2 on branch FC-2 from nget-0.27.1-1.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/nget/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 23 Jan 2005 16:30:18 -0000 1.4 +++ import.log 23 Jan 2005 16:31:12 -0000 1.5 @@ -1,3 +1,4 @@ nget-0_27-0_fdr_1_1:HEAD:nget-0.27-0.fdr.1.1.src.rpm:1099889651 nget-0_27-0_fdr_1_2:HEAD:nget-0.27-0.fdr.1.2.src.rpm:1099889657 nget-0_27_1-1_1:FC-1:nget-0.27.1-1.1.src.rpm:1106497812 +nget-0_27_1-1_2:FC-2:nget-0.27.1-1.2.src.rpm:1106497865 From fedora-extras-commits at redhat.com Sun Jan 23 16:31:14 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:31:14 -0500 Subject: rpms/nget/FC-2 .cvsignore, 1.2, 1.3 nget.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200501231631.j0NGVE6M011016@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/nget/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv11003/FC-2 Modified Files: .cvsignore nget.spec sources Log Message: auto-import nget-0.27.1-1.2 on branch FC-2 from nget-0.27.1-1.2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nget/FC-2/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:54:11 -0000 1.2 +++ .cvsignore 23 Jan 2005 16:31:12 -0000 1.3 @@ -1 +1 @@ -nget-0.27.tar.gz +nget-0.27.1.tar.gz Index: nget.spec =================================================================== RCS file: /cvs/extras/rpms/nget/FC-2/nget.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nget.spec 8 Nov 2004 04:54:17 -0000 1.2 +++ nget.spec 23 Jan 2005 16:31:12 -0000 1.3 @@ -1,13 +1,13 @@ Name: nget -Version: 0.27 -Release: 0.fdr.1.2 +Version: 0.27.1 +Release: 1.2 Epoch: 0 Summary: A utility for retrieving files using the NNTP protocol Group: Applications/Internet License: GPL URL: http://nget.sourceforge.net/ -Source0: http://dl.sf.net/nget/nget-0.27.tar.gz +Source0: http://dl.sf.net/nget/nget-0.27.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel @@ -48,6 +48,9 @@ %changelog +* Sun Jan 16 2005 Marius L. J??hndal - 0:0.27.1-1 +- Updated to 0.27.1. + * Fri Jun 18 2004 Marius L. J??hndal - 0:0.27-0.fdr.1 - Updated to 0.27. Index: sources =================================================================== RCS file: /cvs/extras/rpms/nget/FC-2/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:54:11 -0000 1.2 +++ sources 23 Jan 2005 16:31:12 -0000 1.3 @@ -1 +1 @@ -55fca5c127961cf7ef4c77b2eab8e41e nget-0.27.tar.gz +0710a25aebede4799bd9ca3756573f6a nget-0.27.1.tar.gz From fedora-extras-commits at redhat.com Sun Jan 23 16:31:58 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:31:58 -0500 Subject: rpms/nget import.log,1.5,1.6 Message-ID: <200501231631.j0NGVwe3011129@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/nget In directory cvs.fedora.redhat.com:/tmp/cvs-serv11120 Modified Files: import.log Log Message: auto-import nget-0.27.1-2 on branch devel from nget-0.27.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/nget/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 23 Jan 2005 16:31:12 -0000 1.5 +++ import.log 23 Jan 2005 16:31:56 -0000 1.6 @@ -2,3 +2,4 @@ nget-0_27-0_fdr_1_2:HEAD:nget-0.27-0.fdr.1.2.src.rpm:1099889657 nget-0_27_1-1_1:FC-1:nget-0.27.1-1.1.src.rpm:1106497812 nget-0_27_1-1_2:FC-2:nget-0.27.1-1.2.src.rpm:1106497865 +nget-0_27_1-2:HEAD:nget-0.27.1-2.src.rpm:1106497909 From fedora-extras-commits at redhat.com Sun Jan 23 16:31:58 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:31:58 -0500 Subject: rpms/nget/devel .cvsignore, 1.2, 1.3 nget.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200501231631.j0NGVw2p011133@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/nget/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv11120/devel Modified Files: .cvsignore nget.spec sources Log Message: auto-import nget-0.27.1-2 on branch devel from nget-0.27.1-2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nget/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:54:11 -0000 1.2 +++ .cvsignore 23 Jan 2005 16:31:56 -0000 1.3 @@ -1 +1 @@ -nget-0.27.tar.gz +nget-0.27.1.tar.gz Index: nget.spec =================================================================== RCS file: /cvs/extras/rpms/nget/devel/nget.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nget.spec 10 Dec 2004 22:03:07 -0000 1.3 +++ nget.spec 23 Jan 2005 16:31:56 -0000 1.4 @@ -1,13 +1,13 @@ Name: nget -Version: 0.27 -Release: 1 +Version: 0.27.1 +Release: 2 Epoch: 0 Summary: A utility for retrieving files using the NNTP protocol Group: Applications/Internet License: GPL URL: http://nget.sourceforge.net/ -Source0: http://dl.sf.net/nget/nget-0.27.tar.gz +Source0: http://dl.sf.net/nget/nget-0.27.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel @@ -48,6 +48,9 @@ %changelog +* Sun Jan 16 2005 Marius L. J??hndal - 0:0.27.1-2 +- Updated to 0.27.1. + * Fri Jun 18 2004 Marius L. J??hndal - 0:0.27-0.fdr.1 - Updated to 0.27. Index: sources =================================================================== RCS file: /cvs/extras/rpms/nget/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:54:11 -0000 1.2 +++ sources 23 Jan 2005 16:31:56 -0000 1.3 @@ -1 +1 @@ -55fca5c127961cf7ef4c77b2eab8e41e nget-0.27.tar.gz +0710a25aebede4799bd9ca3756573f6a nget-0.27.1.tar.gz From fedora-extras-commits at redhat.com Sun Jan 23 16:54:43 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 23 Jan 2005 11:54:43 -0500 Subject: rpms/fwbuilder/devel fwbuilder.spec,1.2,1.3 Message-ID: <200501231654.j0NGsh9E011427@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/fwbuilder/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv11415 Modified Files: fwbuilder.spec Log Message: Typo fix Index: fwbuilder.spec =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/devel/fwbuilder.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fwbuilder.spec 23 Jan 2005 05:42:12 -0000 1.2 +++ fwbuilder.spec 23 Jan 2005 16:54:41 -0000 1.3 @@ -1,7 +1,7 @@ Name: fwbuilder Summary: Firewall Builder Version: 2.0.5 -Release: 2 +Release: 3 License: GPL Group: Applications/System URL: http://www.fwbuilder.org/ @@ -108,7 +108,7 @@ %package ipf -Summary: Policy Pompiler for ipfilter +Summary: Policy Compiler for ipfilter Group: Applications/System Requires: %{name} = %{version}-%{release} @@ -152,6 +152,9 @@ %{_mandir}/man1/fwb_ipt.1* %changelog +* Sun Jan 23 2005 Warren Togami 2.0.5-3 +- Typo fix (#145887 Stefan Hoelldampf) + * Sat Jan 22 2005 Warren Togami 2.0.5-2 - minor spec cleanup From fedora-extras-commits at redhat.com Sun Jan 23 18:22:47 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 13:22:47 -0500 Subject: rpms/apt/devel apt.spec,1.5,1.6 default.conf,1.2,1.3 Message-ID: <200501231822.j0NIMl2d013062@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/apt/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv13056 Modified Files: apt.spec default.conf Log Message: Add kernel-devel to Allow-Duplicated in apt.conf.d/default.conf. Index: apt.spec =================================================================== RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- apt.spec 17 Jan 2005 22:01:26 -0000 1.5 +++ apt.spec 23 Jan 2005 18:22:45 -0000 1.6 @@ -17,7 +17,7 @@ Summary: Debian's Advanced Packaging Tool with RPM support. Name: apt Version: 0.5.15cnc6 -Release: 12.%{svnver} +Release: 13.%{svnver} Epoch: 0 Group: System Environment/Base URL: https://moin.conectiva.com.br/AptRpm @@ -360,6 +360,9 @@ %changelog +* Sun Jan 23 2005 Ville Skytt?? - 0:0.5.15cnc6-13.r362 +- Add kernel-devel to Allow-Duplicated in apt.conf.d/default.conf. + * Mon Jan 17 2005 Ville Skytt?? - 0:0.5.15cnc6-12.r362 - Clean up -python packaging, make everything honor %%{__python}. - Build with dependency tracking disabled. Index: default.conf =================================================================== RCS file: /cvs/extras/rpms/apt/devel/default.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- default.conf 17 Jan 2005 22:01:26 -0000 1.2 +++ default.conf 23 Jan 2005 18:22:45 -0000 1.3 @@ -26,9 +26,9 @@ // 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|source|sourcecode))?(-(unsupported-modules))?$"; "^gpg-pubkey$"; }; + Allow-Duplicated { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|source|sourcecode|devel))?(-(unsupported-modules))?$"; "^gpg-pubkey$"; }; // XXX: not used currently - //Allow-Duplicated-Upgrade { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|source))?(-(unsupported-modules))?$"; }; + //Allow-Duplicated-Upgrade { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|source|sourcecode|devel))?(-(unsupported-modules))?$"; }; // "Upgrade" allow-duplicated packages as well Upgrade-Virtual "true"; // Enable source rebuilds From fedora-extras-commits at redhat.com Sun Jan 23 19:08:15 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sun, 23 Jan 2005 14:08:15 -0500 Subject: rpms/sqlite/devel sqlite-2.8.15-makefile.patch, NONE, 1.1 sqlite-2.8.15.rpath.patch, NONE, 1.1 sqlite.spec, 1.5, 1.6 sources, 1.2, 1.3 sqlite-2.8.3.makefile.tclsqlite.patch, 1.1, NONE Message-ID: <200501231908.j0NJ8Feb013870@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/sqlite/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv13864 Modified Files: sqlite.spec sources Added Files: sqlite-2.8.15-makefile.patch sqlite-2.8.15.rpath.patch Removed Files: sqlite-2.8.3.makefile.tclsqlite.patch Log Message: Merge stalled update and changes, mostly from fedora.us queue, in order to update from 2.8.6 to 2.8.15. 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-2.8.15 $(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-2.8.15 \ -version-info "8:6:8" sqlite at TARGET_EXEEXT@: $(TOP)/src/shell.c libsqlite.la sqlite.h Index: sqlite.spec =================================================================== RCS file: /cvs/extras/rpms/sqlite/devel/sqlite.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sqlite.spec 10 Dec 2004 22:03:11 -0000 1.5 +++ sqlite.spec 23 Jan 2005 19:08:13 -0000 1.6 @@ -1,19 +1,21 @@ Name: sqlite -Version: 2.8.6 -Release: 6 +Version: 2.8.15 +Release: 1 Epoch: 0 -Summary: An embeddable SQL engine in a C library. +Summary: An 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-2.8.6.tar.gz -Patch1: sqlite-2.8.6.norpath.patch -Patch2: sqlite-2.8.3.makefile.tclsqlite.patch -Patch3: sqlite-2.8.3.test.rh9.patch +Source0: http://www.sqlite.org/sqlite-2.8.15.tar.gz +Patch1: sqlite-2.8.15.rpath.patch +Patch2: sqlite-2.8.15-makefile.patch +Patch3: sqlite-2.8.3.test.rh9.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel readline-devel %{_includedir}/tcl.h +ExclusiveArch: %{ix86} + %description SQLite is a small, fast, embeddable SQL database engine that supports most of SQL92, including transactions with atomic commit and rollback, @@ -49,23 +51,28 @@ %prep %setup -q -n %{name} %patch1 -p1 -%patch2 -p0 +%patch2 -p1 %patch3 -p1 +# 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 -make all tclsqlite doc test +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 -cp -d -p .libs/libtclsqlite.so* $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 +install -D -m 0644 sqlite.1 $RPM_BUILD_ROOT%{_mandir}/man1/sqlite.1 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' @@ -93,10 +100,27 @@ %defattr(-,root,root,-) %doc doc/tclsqlite.html %exclude %_bindir/tclsqlite -%exclude %_libdir/libtclsqlite.* +%exclude %_libdir/%{name}-%{version}/libtclsqlite.a +%exclude %{_bindir}/tclsqlite %_libdir/sqlite-%version %changelog +* 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 @@ -105,13 +129,17 @@ 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 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sqlite/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:22:32 -0000 1.2 +++ sources 23 Jan 2005 19:08:13 -0000 1.3 @@ -1 +1 @@ -3047e24370d7e49d7bfd9728addf76cf sqlite-2.8.6.tar.gz +0afa73e107bd106031d046c8ca6a94ab sqlite-2.8.15.tar.gz --- sqlite-2.8.3.makefile.tclsqlite.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jan 23 19:11:49 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sun, 23 Jan 2005 14:11:49 -0500 Subject: rpms/sqlite/devel sqlite-2.8.6.norpath.patch,1.1,NONE Message-ID: <200501231911.j0NJBnpA013920@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/sqlite/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv13914 Removed Files: sqlite-2.8.6.norpath.patch Log Message: remove obsolete patch file --- sqlite-2.8.6.norpath.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jan 23 19:37:00 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 14:37:00 -0500 Subject: rpms/wxGTK/devel wxGTK.spec,1.7,1.8 Message-ID: <200501231937.j0NJb0Hw014027@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/wxGTK/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv14021 Modified Files: wxGTK.spec Log Message: Fix wx-config for x86_64 (#145508), honor $RPM_OPT_FLAGS, %{__cc} and %{__cxx}. Index: wxGTK.spec =================================================================== RCS file: /cvs/extras/rpms/wxGTK/devel/wxGTK.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- wxGTK.spec 6 Dec 2004 11:02:41 -0000 1.7 +++ wxGTK.spec 23 Jan 2005 19:36:58 -0000 1.8 @@ -1,6 +1,8 @@ +%define x11libdir %{_prefix}/X11R6/%{_lib} + Name: wxGTK Version: 2.4.2 -Release: 7 +Release: 8 Summary: GTK+ port of the wxWidgets GUI library License: BSD Group: System Environment/Libraries @@ -132,19 +134,27 @@ %setup -q -n %{name}-%{version} %patch0 -p1 -b .privates %patch1 -b .aclocal18 +sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in %build mkdir _gtk1 _gtk2 -export APPEXTRACFLAGS="$RPM_OPT_FLAGS" -export APPEXTRACXXFLAGS="$RPM_OPT_FLAGS" +export CC="%{__cc}" +export CXX="%{__cxx}" +export CFLAGS="$RPM_OPT_FLAGS" +export CXXFLAGS="$RPM_OPT_FLAGS" +# --disable-optimise prevents our $RPM_OPT_FLAGS being overridden +# (see OPTIMISE in configure). cd _gtk1 ../configure \ --prefix=%{_prefix} \ + --libdir=%{_libdir} \ + --x-libraries=%{x11libdir} \ --with-opengl \ --enable-shared \ - --enable-soname + --enable-soname \ + --disable-optimise make %{?_smp_mflags} make %{?_smp_mflags} -C contrib/src/stc make %{?_smp_mflags} -C contrib/src/xrc @@ -152,9 +162,12 @@ cd ../_gtk2 ../configure \ --prefix=%{_prefix} \ + --libdir=%{_libdir} \ + --x-libraries=%{x11libdir} \ --with-opengl \ --enable-shared \ --enable-soname \ + --disable-optimise \ --enable-gtk2 make %{?_smp_mflags} make %{?_smp_mflags} -C contrib/src/stc @@ -166,6 +179,9 @@ %install rm -rf $RPM_BUILD_ROOT +# Since we're not using %%configure, we would really like to use +# "make install DESTDIR=..." instead of %%makeinstall here to keep things in +# sync. Unfortunately that does not work. cd _gtk1 %makeinstall %makeinstall -C contrib/src/stc @@ -276,6 +292,10 @@ %changelog +* Sun Jan 23 2005 Ville Skytt?? - 2.4.2-8 +- Fix wx-config for x86_64 (#145508). +- Honor $RPM_OPT_FLAGS better, as well as %%{__cc} and %%{__cxx}. + * Mon Dec 6 2004 Ville Skytt?? - 2.4.2-7 - Patch to avoid aclocal >= 1.8 warnings from wxwin.m4. - Move unversioned *.so links for -gl, -stc and -xrc to -devel, make -devel From fedora-extras-commits at redhat.com Sun Jan 23 19:40:24 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Sun, 23 Jan 2005 14:40:24 -0500 Subject: devel/galeon galeon.spec, 1.1, 1.2 sources, 1.2, 1.3 galeon-1.3.10-moz-home-detect.patch, 1.1, NONE Message-ID: <200501231940.j0NJeOvF014082@cvs.fedora.redhat.com> Author: anvil Update of /cvs/extras/devel/galeon In directory cvs.fedora.redhat.com:/tmp/cvs-serv14076 Modified Files: galeon.spec sources Removed Files: galeon-1.3.10-moz-home-detect.patch Log Message: galeon: updated to 1.3.19 Index: galeon.spec =================================================================== RCS file: /cvs/extras/devel/galeon/galeon.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- galeon.spec 8 Nov 2004 04:21:30 -0000 1.1 +++ galeon.spec 23 Jan 2005 19:40:22 -0000 1.2 @@ -1,36 +1,34 @@ -%define extraversion a - Summary: GNOME2 Web browser based on Mozilla Name: galeon -Version: 1.3.11 -Release: 0.fdr.3.%{extraversion}.fixed.1 +Version: 1.3.19 +Release: 1 Epoch: 0 License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ -Source0: %{name}-%{version}%{?extraversion}-fixed.tar.bz2 -Patch0: galeon-1.3.10-moz-home-detect.patch +Source0: %{name}-%{version}%{?extraversion}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) -Requires(post,postun): scrollkeeper -BuildRequires: gettext gtk2-devel mozilla-nspr-devel desktop-file-utils -BuildRequires: mozilla-devel >= 35:1.4 -BuildRequires: libxml2-devel >= 0:2.4.0 -BuildRequires: libgnomeui-devel >= 0:2.0.5 +Requires: scrollkeeper +Requires: mozilla = %(rpm -q mozilla-devel --qf='%%{epoch}:%%{version}' 2>/dev/null) +BuildRequires: gettext mozilla-nspr-devel desktop-file-utils +BuildRequires: gtk2-devel >= 0:2.4.0 +BuildRequires: mozilla-devel >= 37:1.7.2 +BuildRequires: libxml2-devel >= 0:2.6.6 +BuildRequires: libgnomeui-devel >= 0:2.5.2 %{!?_without_nautilus:BuildRequires: eel2-devel nautilus} # ----------------------------------------------------------------------------- %description -Galeon is a web browser built around Gecko (Mozilla 's rendering engine) -and Necko (Mozilla's networking engine). It's a GNOME web browser, -designed to take advantage of as many GNOME technologies as makes sense. -Galeon was written to do just one thing - browse the web. +Galeon is a web browser built around Gecko (Mozilla's rendering +engine) and Necko (Mozilla's networking engine). It's a GNOME web +browser, designed to take advantage of as many GNOME technologies as +makes sense. Galeon was written to do just one thing - browse the web. # ----------------------------------------------------------------------------- %prep %setup -q -n %{name}-%{version}%{?extraversion} -%patch -p1 -b .moz-home-detect # ----------------------------------------------------------------------------- @@ -45,6 +43,7 @@ %install rm -rf $RPM_BUILD_ROOT + make DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT%{_datadir}/applications/galeon.desktop # Overriding galeon *bluecurve* icon @@ -71,6 +70,13 @@ %{_bindir}/galeon-config-tool --pkg-install-schemas scrollkeeper-update||: +%preun +if [ "$0" = 1 ] ; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/galeon.schemas >/dev/null +fi||: + %postun scrollkeeper-update||: @@ -80,16 +86,13 @@ %config %{_sysconfdir}/gconf/schemas/galeon.schemas %config %{_sysconfdir}/sound/events/galeon.soundlist %{_bindir}/galeon -%{_bindir}/galeon-bin %{_bindir}/galeon-config-tool -%{_libdir}/galeon %{_mandir}/man1/galeon.1* %{_datadir}/galeon %{_datadir}/gnome/help/galeon %{_datadir}/pixmaps/galeon.png %{_datadir}/sounds/galeon %{_datadir}/gnome-2.0/ui/galeon-bookmarks-editor-ui.xml -%{_datadir}/gnome-2.0/ui/galeon-ui.xml %{_datadir}/gnome-2.0/ui/nautilus-galeon-view-ui.xml %{_datadir}/omf/galeon %{_libdir}/bonobo/servers/GNOME_Galeon_Automation.server @@ -99,6 +102,47 @@ # ----------------------------------------------------------------------------- %changelog +* Sun Jan 23 2005 Dams 0:1.3.19-1 +- Rebuilt for Extras + +* Sun Jan 16 2005 Dams 0:1.3.19-0.fdr.1 +- Updated to 1.3.19 +- Removed old mkinstalldirs fix + +* Wed Oct 27 2004 Dams 0:1.3.18-0.fdr.1 +- Updated to 1.3.18 + +* Thu Sep 30 2004 Dams 0:1.3.17-0.fdr.2 +- Requiring versioned mozilla as it's borked otherwise. + +* Mon Aug 9 2004 Dams 0:1.3.17-0.fdr.1 +- Updated to 1.3.17 +- Dropped patch0 +- Updated version requirement for build dependencies + +* Sat Aug 7 2004 Dams 0:1.3.16-0.fdr.2 +- Rebuild + +* Sat Jul 3 2004 Dams 0:1.3.16-0.fdr.1 +- Updated to 1.3.16 +- Fixed preun scriptlet + +* Wed Jun 2 2004 Dams 0:1.3.15-0.fdr.1 +- Updated to 1.3.15 + +* Sun Mar 21 2004 Dams 0:1.3.14-0.fdr.1 +- Updated to 1.3.14 + +* Tue Feb 17 2004 Dams 0:1.3.13-0.fdr.1 +- Updated to 1.3.13 +- Fixed build (missing mkinstalldirs..) + +* Fri Jan 9 2004 Dams 0:1.3.11-0.fdr.5.a.fixed +- Added Requires:mozilla (non-versioned) + +* Thu Jan 8 2004 Dams 0:1.3.11-0.fdr.4.a.fixed +- Removing schemas in preun + * Sat Dec 20 2003 Dams 0:1.3.11-0.fdr.3.a-fixed - Updated to 1.3.11a-fixed Index: sources =================================================================== RCS file: /cvs/extras/devel/galeon/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:21:30 -0000 1.2 +++ sources 23 Jan 2005 19:40:22 -0000 1.3 @@ -1 +1 @@ -81170880d32052a9ff34da4ae60edc80 galeon-1.3.11a-fixed.tar.bz2 +7d272c6b1863252026386fd299122841 galeon-1.3.19.tar.bz2 --- galeon-1.3.10-moz-home-detect.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jan 23 20:00:55 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Sun, 23 Jan 2005 15:00:55 -0500 Subject: devel/galeon galeon.spec,1.2,1.3 Message-ID: <200501232000.j0NK0tTR014138@cvs.fedora.redhat.com> Author: anvil Update of /cvs/extras/devel/galeon In directory cvs.fedora.redhat.com:/tmp/cvs-serv14132 Modified Files: galeon.spec Log Message: galeon.spec: added URL in Source0 tag Index: galeon.spec =================================================================== RCS file: /cvs/extras/devel/galeon/galeon.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- galeon.spec 23 Jan 2005 19:40:22 -0000 1.2 +++ galeon.spec 23 Jan 2005 20:00:53 -0000 1.3 @@ -1,12 +1,12 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 1.3.19 -Release: 1 +Release: 2 Epoch: 0 License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ -Source0: %{name}-%{version}%{?extraversion}.tar.bz2 +Source0: http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) Requires: scrollkeeper Requires: mozilla = %(rpm -q mozilla-devel --qf='%%{epoch}:%%{version}' 2>/dev/null) @@ -102,6 +102,9 @@ # ----------------------------------------------------------------------------- %changelog +* Sun Jan 23 2005 Dams - 0:1.3.19-2 +- Urlized Source0 + * Sun Jan 23 2005 Dams 0:1.3.19-1 - Rebuilt for Extras From fedora-extras-commits at redhat.com Tue Jan 25 14:27:57 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 25 Jan 2005 09:27:57 -0500 Subject: rpms/hercules/devel .cvsignore, 1.2, 1.3 hercules.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200501251427.j0PERvcU020736@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/hercules/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv20727 Modified Files: .cvsignore hercules.spec sources Log Message: Update to 3.02 final. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hercules/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Nov 2004 02:46:54 -0000 1.2 +++ .cvsignore 25 Jan 2005 14:27:55 -0000 1.3 @@ -1 +1 @@ -hercules-3.02-cvs.tar.gz +hercules-3.02.tar.gz Index: hercules.spec =================================================================== RCS file: /cvs/extras/rpms/hercules/devel/hercules.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- hercules.spec 13 Jan 2005 18:08:53 -0000 1.4 +++ hercules.spec 25 Jan 2005 14:27:55 -0000 1.5 @@ -1,4 +1,4 @@ -%define date 20041025 +#define date 20041025 Summary: Hercules S/370, ESA/390, and z/Architecture emulator Name: hercules @@ -168,11 +168,15 @@ %{_bindir}/* %{_datadir}/hercules/ %{_libdir}/hercules/ +%exclude %{_libdir}/hercules/*.la %{_libdir}/*.so %exclude %{_libdir}/*.la %{_mandir}/man?/* %changelog +* Tue Jan 25 2005 Matthias Saou 3.02-1 +- Update to 3.02 final. + * Fri Dec 24 2004 Thomas Vander Stichele - scrubbed release tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/hercules/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Nov 2004 02:46:54 -0000 1.2 +++ sources 25 Jan 2005 14:27:55 -0000 1.3 @@ -1 +1 @@ -deecbf3a71ac21ddb457efc4dddeecae hercules-3.02-cvs.tar.gz +d765ad315a1eba281bd816e63d854dc5 hercules-3.02.tar.gz From fedora-extras-commits at redhat.com Tue Jan 25 16:48:27 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 25 Jan 2005 11:48:27 -0500 Subject: rpms/i810switch - New directory Message-ID: <200501251648.j0PGmRJx022427@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/i810switch In directory cvs.fedora.redhat.com:/tmp/cvs-serv22420/i810switch Log Message: Directory /cvs/extras/rpms/i810switch added to the repository From fedora-extras-commits at redhat.com Tue Jan 25 16:48:27 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 25 Jan 2005 11:48:27 -0500 Subject: rpms/i810switch/devel - New directory Message-ID: <200501251648.j0PGmRbR022430@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/i810switch/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22420/i810switch/devel Log Message: Directory /cvs/extras/rpms/i810switch/devel added to the repository From fedora-extras-commits at redhat.com Tue Jan 25 16:48:45 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 25 Jan 2005 11:48:45 -0500 Subject: rpms/i810switch Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501251648.j0PGmjnP022493@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/i810switch In directory cvs.fedora.redhat.com:/tmp/cvs-serv22484 Added Files: Makefile import.log Log Message: Setup of module i810switch --- NEW FILE Makefile --- # Top level Makefile for module i810switch all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 25 16:48:45 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 25 Jan 2005 11:48:45 -0500 Subject: rpms/i810switch/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501251648.j0PGmjt1022496@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/i810switch/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22484/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module i810switch --- NEW 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 Jan 25 16:49:22 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 25 Jan 2005 11:49:22 -0500 Subject: rpms/i810switch import.log,1.1,1.2 Message-ID: <200501251649.j0PGnM5n022595@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/i810switch In directory cvs.fedora.redhat.com:/tmp/cvs-serv22586 Modified Files: import.log Log Message: auto-import i810switch-0.6.2-3 on branch devel from i810switch-0.6.2-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/i810switch/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 25 Jan 2005 16:48:43 -0000 1.1 +++ import.log 25 Jan 2005 16:49:20 -0000 1.2 @@ -0,0 +1 @@ +i810switch-0_6_2-3:HEAD:i810switch-0.6.2-3.src.rpm:1106671753 From fedora-extras-commits at redhat.com Tue Jan 25 16:49:22 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 25 Jan 2005 11:49:22 -0500 Subject: rpms/i810switch/devel i810switch-0.6.2.makefile.patch, NONE, 1.1 i810switch.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501251649.j0PGnMlQ022599@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/i810switch/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22586/devel Modified Files: .cvsignore sources Added Files: i810switch-0.6.2.makefile.patch i810switch.spec Log Message: auto-import i810switch-0.6.2-3 on branch devel from i810switch-0.6.2-3.src.rpm i810switch-0.6.2.makefile.patch: --- NEW FILE i810switch-0.6.2.makefile.patch --- diff -Naur i810switch-0.6.2.orig/Makefile i810switch-0.6.2/Makefile --- i810switch-0.6.2.orig/Makefile 2005-01-11 18:09:22.011215952 -0800 +++ i810switch-0.6.2/Makefile 2005-01-11 18:11:15.474110985 -0800 @@ -1,5 +1,8 @@ OBJECTS = i810switch.o +bindir = $(DESTDIR)/usr/bin +mandir = $(DESTDIR)/usr/share/man + %.o: %.c $(CC) $(CFLAGS) -c -o $@ $< @@ -9,16 +12,16 @@ $(CC) $(CFLAGS) -o $@ $(OBJECTS) install: i810switch - install -d $(DESTDIR)/usr/bin - install -d $(DESTDIR)/usr/share/man/man1 - install i810switch i810rotate $(DESTDIR)/usr/bin - install i810switch.1.gz i810rotate.1.gz $(DESTDIR)/usr/share/man/man1 + install -d $(bindir) + install -d $(mandir)/man1 + install i810switch i810rotate $(bindir) + install i810switch.1.gz i810rotate.1.gz $(mandir)/man1 uninstall: - rm -f $(DESTDIR)/usr/bin/i810switch - rm -f $(DESTDIR)/usr/bin/i810rotate - rm -f $(DESTDIR)/usr/share/man/man1/i810switch.1.gz - rm -f $(DESTDIR)/usr/share/man/man1/i810rotate.1.gz + rm -f $(bindir)/i810switch + rm -f $(bindir)/i810rotate + rm -f $(mandir)/man1/i810switch.1.gz + rm -f $(mandir)/man1/i810rotate.1.gz clean: @rm -f $(OBJECTS) i810switch --- NEW FILE i810switch.spec --- Name: i810switch Version: 0.6.2 Release: 3 Epoch: 0 Summary: A utility for switching the LCD and external VGA displays on and off Group: User Interface/X Hardware Support License: GPL URL: http://vorfgglon.cwru.edu/~ames/i810switch/ Source0: http://vorlon.cwru.edu/~ames/i810switch/i810switch-0.6.2.tar.gz Patch0: i810switch-0.6.2.makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: pciutils %description i810switch is a utility for switching the LCD and external VGA displays on and off under Linux. It was originally written by Antonino Daplas, and is now maintained by Ken Mano. %prep %setup -q %patch -p1 -b .buildroot %build CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT %{!?makeinstall: %define makeinstall make install DESTDIR=$RPM_BUILD_ROOT bindir=$RPM_BUILD_ROOT%{_bindir} mandir=$RPM_BUILD_ROOT%{_mandir} } %makeinstall %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING README TODO ChangeLog INSTALL %{_bindir}/* %{_mandir}/man1/* %changelog * Tue Jan 18 2005 David Kaplan - 0:0.6.2-3 - Added back INSTALL file to rpm because it explains how to SUID root the executable so that all users can use i810switch. * Thu Jan 13 2005 David Kaplan - 0:0.6.2-0.fdr.2 - Minor spec file fixes and addition of optimization flags to CFLAGS * Tue Jan 11 2005 David Kaplan - 0:0.6.2-0.fdr.1 - Initial build of i810switch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/i810switch/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 25 Jan 2005 16:48:43 -0000 1.1 +++ .cvsignore 25 Jan 2005 16:49:20 -0000 1.2 @@ -0,0 +1 @@ +i810switch-0.6.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/i810switch/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 25 Jan 2005 16:48:43 -0000 1.1 +++ sources 25 Jan 2005 16:49:20 -0000 1.2 @@ -0,0 +1 @@ +b31cc8fde7a36d553406339d2626d3e3 i810switch-0.6.2.tar.gz From fedora-extras-commits at redhat.com Tue Jan 25 16:50:53 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 25 Jan 2005 11:50:53 -0500 Subject: rpms/perl-Convert-BinHex - New directory Message-ID: <200501251650.j0PGor3v022720@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Convert-BinHex In directory cvs.fedora.redhat.com:/tmp/cvs-serv22713/perl-Convert-BinHex Log Message: Directory /cvs/extras/rpms/perl-Convert-BinHex added to the repository From fedora-extras-commits at redhat.com Tue Jan 25 16:50:53 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 25 Jan 2005 11:50:53 -0500 Subject: rpms/perl-Convert-BinHex/devel - New directory Message-ID: <200501251650.j0PGor11022723@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Convert-BinHex/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22713/perl-Convert-BinHex/devel Log Message: Directory /cvs/extras/rpms/perl-Convert-BinHex/devel added to the repository From fedora-extras-commits at redhat.com Tue Jan 25 16:51:12 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 25 Jan 2005 11:51:12 -0500 Subject: rpms/perl-Convert-BinHex Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501251651.j0PGpC6c022784@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Convert-BinHex In directory cvs.fedora.redhat.com:/tmp/cvs-serv22775 Added Files: Makefile import.log Log Message: Setup of module perl-Convert-BinHex --- NEW FILE Makefile --- # Top level Makefile for module perl-Convert-BinHex all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 25 16:51:12 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 25 Jan 2005 11:51:12 -0500 Subject: rpms/perl-Convert-BinHex/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501251651.j0PGpCNJ022787@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Convert-BinHex/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22775/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Convert-BinHex --- NEW 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 Jan 25 16:51:49 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 25 Jan 2005 11:51:49 -0500 Subject: rpms/perl-Convert-BinHex import.log,1.1,1.2 Message-ID: <200501251651.j0PGpnmv022882@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Convert-BinHex In directory cvs.fedora.redhat.com:/tmp/cvs-serv22873 Modified Files: import.log Log Message: auto-import perl-Convert-BinHex-1.119-1 on branch devel from perl-Convert-BinHex-1.119-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Convert-BinHex/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 25 Jan 2005 16:51:10 -0000 1.1 +++ import.log 25 Jan 2005 16:51:47 -0000 1.2 @@ -0,0 +1 @@ +perl-Convert-BinHex-1_119-1:HEAD:perl-Convert-BinHex-1.119-1.src.rpm:1106671899 From fedora-extras-commits at redhat.com Tue Jan 25 16:51:49 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 25 Jan 2005 11:51:49 -0500 Subject: rpms/perl-Convert-BinHex/devel perl-Convert-BinHex.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501251651.j0PGpnnM022886@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Convert-BinHex/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22873/devel Modified Files: .cvsignore sources Added Files: perl-Convert-BinHex.spec Log Message: auto-import perl-Convert-BinHex-1.119-1 on branch devel from perl-Convert-BinHex-1.119-1.src.rpm --- NEW FILE perl-Convert-BinHex.spec --- %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-Convert-BinHex Version: 1.119 Release: 1 Epoch: 0 Summary: Macintosh BinHex extractor library for Perl Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Convert-BinHex/ Source0: http://www.cpan.org/authors/id/E/ER/ERYQ/Convert-BinHex-1.119.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)) %description Convert::BinHex extracts data from Macintosh BinHex files. %prep %setup -q -n Convert-BinHex-%{version} chmod -x bin/*.pl docs/Convert/BinHex/*.gif cp -a bin examples %{__perl} -pi -e 's/^use lib .*$//' bin/*.pl %{__perl} -pi -e 's/^(\@ISA.*)/require Exporter; $1/' t/Checker.pm %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check || : make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING README docs examples %{perl_vendorlib}/Convert %{_mandir}/man3/Convert::BinHex.3* %changelog * Wed Sep 15 2004 Ville Skytt?? - 0:1.119-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Convert-BinHex/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 25 Jan 2005 16:51:10 -0000 1.1 +++ .cvsignore 25 Jan 2005 16:51:47 -0000 1.2 @@ -0,0 +1 @@ +Convert-BinHex-1.119.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Convert-BinHex/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 25 Jan 2005 16:51:10 -0000 1.1 +++ sources 25 Jan 2005 16:51:47 -0000 1.2 @@ -0,0 +1 @@ +ba70ad1772abac6270078f28197a7961 Convert-BinHex-1.119.tar.gz From fedora-extras-commits at redhat.com Tue Jan 25 18:38:25 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 25 Jan 2005 13:38:25 -0500 Subject: rpms/scons/devel scons.spec,1.3,1.4 Message-ID: <200501251838.j0PIcPlq025242@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/scons/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25236 Modified Files: scons.spec Log Message: Fix from Thorsten for #146014. Index: scons.spec =================================================================== RCS file: /cvs/extras/rpms/scons/devel/scons.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scons.spec 11 Nov 2004 19:21:37 -0000 1.3 +++ scons.spec 25 Jan 2005 18:38:23 -0000 1.4 @@ -1,6 +1,6 @@ Name: scons Version: 0.96 -Release: 3 +Release: 4 Summary: An Open Source software construction tool Group: Development/Tools @@ -8,8 +8,9 @@ URL: http://www.scons.org/ Source: http://download.sourceforge.net/scons/scons-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch +BuildArch: noarch BuildRequires: python-devel +Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %description SCons is an Open Source software construction tool--that is, a build @@ -31,11 +32,11 @@ %build -python setup.py build +CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT -python setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-lib=%{_libdir}/scons --install-scripts=%{_bindir} +%{__python} setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-lib=%{_prefix}/lib/scons --install-scripts=%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 cp -f scons.1 sconsign.1 $RPM_BUILD_ROOT%{_mandir}/man1 @@ -46,10 +47,14 @@ %defattr(-,root,root,-) %doc CHANGES.txt LICENSE.txt README.txt RELEASE.txt %{_bindir}/* -%{_libdir}/scons +%{_prefix}/lib/scons %{_mandir}/man*/* %changelog +* Tue Jan 25 2005 Thorsten Leemhuis 0.96-4 +- Place libs in {_prefix}/lib/ and not in {libdir}; fixes x86_64 problems +- Adjust minor bits to be in sync with python-spec-template + * Wed Nov 10 2004 Matthias Saou 0.96-3 - Bump release to provide Extras upgrade path. @@ -62,3 +67,4 @@ * Fri Nov 7 2003 Gerard Milmeister - 0:0.93-0.fdr.1 - First Fedora release + From thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net Tue Jan 25 19:21:42 2005 From: thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net (Matthias Saou) Date: Tue, 25 Jan 2005 20:21:42 +0100 Subject: rpms/scons/devel scons.spec,1.3,1.4 In-Reply-To: <200501251838.j0PIcPlq025242@cvs.fedora.redhat.com> References: <200501251838.j0PIcPlq025242@cvs.fedora.redhat.com> Message-ID: <20050125202142.17ddc3fa@python2> Michael Schwendt (mschwendt) wrote : > -python setup.py build > +CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build This is a noarch package, CFLAGS="$RPM_OPT_FLAGS" is definitely not needed ;-) > -%{_libdir}/scons > +%{_prefix}/lib/scons Shouldn't this use the sysconfig.get_python_lib(foo) trick (that Ville showed me) to get the arch independant python lib path instead? Matthias -- Clean custom Red Hat Linux rpm packages : http://freshrpms.net/ Fedora Core release 3 (Heidelberg) - Linux kernel 2.6.10-1.741_FC3.radeon Load : 0.81 0.60 0.46 From fedora at wir-sind-cool.org Tue Jan 25 20:02:44 2005 From: fedora at wir-sind-cool.org (Michael Schwendt) Date: Tue, 25 Jan 2005 21:02:44 +0100 Subject: rpms/scons/devel scons.spec,1.3,1.4 In-Reply-To: <20050125202142.17ddc3fa@python2> References: <200501251838.j0PIcPlq025242@cvs.fedora.redhat.com> <20050125202142.17ddc3fa@python2> Message-ID: <20050125210244.4b961744.fedora@wir-sind-cool.org> On Tue, 25 Jan 2005 20:21:42 +0100, Matthias Saou wrote: > > -python setup.py build > > +CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build > > This is a noarch package, CFLAGS="$RPM_OPT_FLAGS" is definitely not needed > ;-) Not needed, not used => not a blocker criterion => copying from universal spec templates does no harm here. > > -%{_libdir}/scons > > +%{_prefix}/lib/scons > > Shouldn't this use the sysconfig.get_python_lib(foo) trick (that Ville > showed me) to get the arch independant python lib path instead? No. You cannot get /usr/lib/scons via that method, but only the arch-dependent or arch-independent site-packages path. From fedora at leemhuis.info Tue Jan 25 19:36:36 2005 From: fedora at leemhuis.info (Thorsten Leemhuis) Date: Tue, 25 Jan 2005 20:36:36 +0100 Subject: rpms/scons/devel scons.spec,1.3,1.4 In-Reply-To: <20050125202142.17ddc3fa@python2> References: <200501251838.j0PIcPlq025242@cvs.fedora.redhat.com> <20050125202142.17ddc3fa@python2> Message-ID: <1106681796.5911.2.camel@localhost.localdomain> Am Dienstag, den 25.01.2005, 20:21 +0100 schrieb Matthias Saou: > Michael Schwendt (mschwendt) wrote : > > > -python setup.py build > > +CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build > > This is a noarch package, CFLAGS="$RPM_OPT_FLAGS" is definitely not needed > ;-) I knew someone would say something ;-) > > -%{_libdir}/scons > > +%{_prefix}/lib/scons > > Shouldn't this use the sysconfig.get_python_lib(foo) trick (that Ville > showed me) to get the arch independant python lib path instead? Good question; Ville what is that for a trick? CU thl -- Thorsten Leemhuis From ville.skytta at iki.fi Tue Jan 25 22:09:48 2005 From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=) Date: Wed, 26 Jan 2005 00:09:48 +0200 Subject: Python site-packages tricks (was: Re: rpms/scons/devel scons.spec,1.3,1.4) In-Reply-To: <1106681796.5911.2.camel@localhost.localdomain> References: <200501251838.j0PIcPlq025242@cvs.fedora.redhat.com> <20050125202142.17ddc3fa@python2> <1106681796.5911.2.camel@localhost.localdomain> Message-ID: <1106690988.6477.76.camel@bobcat.mine.nu> On Tue, 2005-01-25 at 20:36 +0100, Thorsten Leemhuis wrote: > Am Dienstag, den 25.01.2005, 20:21 +0100 schrieb Matthias Saou: > > Shouldn't this use the sysconfig.get_python_lib(foo) trick (that Ville > > showed me) to get the arch independant python lib path instead? > > Good question; Ville what is that for a trick? I don't know if it's much of a trick, but see spectemplate-python.spec in fedora-rpmdevtools. It applies to most Python extension packages out there that use Python's distutils, and install stuff into site-packages dirs. In the scons case, things are not installed to the site-packages dirs, it seems, so the "trick" doesn't apply AFAICT. Anyway the idea is to find out the dirs where Python's distutils will install stuff into by asking Python and using those in %files instead of inventing/hardcoding the dirs oneself. One common build failure with Python extension packages is that the packager assumes %{_libdir}/python%{something}/site-packages/[...] as the target dir. This will fail for all noarch Python packages when built on x86_64. There, noarch stuff ends up in /usr/lib/pythonX.X/[...], and arch-dependent to /usr/lib64/pythonX.X/[...]. Python makes a distinction between arch- specific and arch-independent packages, and the Python spec template has %{python_sitearch} and %{python_sitelib} accordingly. The names correspond to the macros rpm has had for Perl for a long time. There are open RFE's in Bugzilla to get these %{python_site*} macros applied to upstream rpm's default macros file. This strategy should be future proof in the way that if the site- packages or parts of it moves elsewhere (for example, the arch- independent parts to /usr/share/[...]) one day, a simple package rebuild for the extensions should suffice. It'll also take care of Python version changes for free. Further, spectemplate-python.spec uses the %{__python} macro for everything, so this stuff should apply to custom Python installations; one just does a "rpmbuild --rebuild --define '__python /path/to/custom/pythonX' ..." and things should work regarding this bit. (I intend to document this to the WIP packagers-handbook in cvs.fedora.us soon(tm).) From fedora-extras-commits at redhat.com Wed Jan 26 00:10:39 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 25 Jan 2005 19:10:39 -0500 Subject: rpms/libsigc++20/devel libsigc++.spec,1.2,1.3 sources,1.2,1.3 Message-ID: <200501260010.j0Q0Ad7h030507@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libsigc++20/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv30501 Modified Files: libsigc++.spec sources Log Message: Update okayed by Denis. Index: libsigc++.spec =================================================================== RCS file: /cvs/extras/rpms/libsigc++20/devel/libsigc++.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libsigc++.spec 10 Dec 2004 22:03:05 -0000 1.2 +++ libsigc++.spec 26 Jan 2005 00:10:37 -0000 1.3 @@ -1,5 +1,5 @@ Name: libsigc++20 -Version: 2.0.3 +Version: 2.0.6 Release: 1 Epoch: 0 Summary: The Typesafe Signal Framework for C++ @@ -7,7 +7,7 @@ Group: System Environment/Libraries License: LGPL URL: http://libsigc.sourceforge.net/ -Source0: http://dl.sourceforge.net/libsigc/libsigc++-%version.tar.gz +Source0: http://dl.sourceforge.net/libsigc/libsigc++-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -81,6 +81,9 @@ %{_libdir}/*.a %changelog +* Sat Jan 15 2005 Rick L Vinyard Jr - 0:2.0.6-1 +- Update to 2.0.6 + * Mon Jun 27 2004 Denis Leroy - 0:2.0.3-0.fdr.1 - Update to 2.0.3 - Merged deps from FC2 sigc++ 1.2.5 spec Index: sources =================================================================== RCS file: /cvs/extras/rpms/libsigc++20/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:47:19 -0000 1.2 +++ sources 26 Jan 2005 00:10:37 -0000 1.3 @@ -1 +1 @@ -57c6887dd46ce0bd312a4823589db5d8 libsigc++-2.0.3.tar.gz +1097a8403db9506c5373c7de6b9357bb libsigc++-2.0.6.tar.bz2 From fedora-extras-commits at redhat.com Wed Jan 26 00:10:46 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 25 Jan 2005 19:10:46 -0500 Subject: rpms/gtkmm24/devel gtkmm.spec,1.2,1.3 sources,1.3,1.4 Message-ID: <200501260010.j0Q0Ak6i030537@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gtkmm24/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv30531 Modified Files: gtkmm.spec sources Log Message: Update okayed by Denis. Index: gtkmm.spec =================================================================== RCS file: /cvs/extras/rpms/gtkmm24/devel/gtkmm.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gtkmm.spec 7 Dec 2004 22:42:02 -0000 1.2 +++ gtkmm.spec 26 Jan 2005 00:10:44 -0000 1.3 @@ -1,5 +1,5 @@ Name: gtkmm24 -Version: 2.4.7 +Version: 2.4.8 Release: 1 Epoch: 0 Summary: A C++ interface for GTK2 (a GUI library for X). @@ -99,6 +99,9 @@ %changelog +* Sat Jan 15 2005 Rick L Vinyard Jr - 0:2.4.8-1 +- Update for gtkmm 2.4.8 + * Wed Nov 17 2004 Denis Leroy - 0:2.4.7-1 - Update for gtkmm 2.4.7 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkmm24/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Dec 2004 22:42:02 -0000 1.3 +++ sources 26 Jan 2005 00:10:44 -0000 1.4 @@ -1 +1 @@ -7aedecbf6878a7fa88b0ed636a7b9342 gtkmm-2.4.7.tar.bz2 +c2aee4c259a75fa0dc766d402bef253b gtkmm-2.4.8.tar.bz2 From fedora-extras-commits at redhat.com Wed Jan 26 20:08:45 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 26 Jan 2005 15:08:45 -0500 Subject: rpms/cvsgraph/devel .cvsignore, 1.3, 1.4 cvsgraph-config.patch, 1.1, 1.2 cvsgraph.spec, 1.5, 1.6 sources, 1.3, 1.4 cvsgraph-spelling.patch, 1.1, NONE cvsgraph-wrapper.patch, 1.1, NONE Message-ID: <200501262008.j0QK8j3Q018393@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/cvsgraph/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv18386 Modified Files: .cvsignore cvsgraph-config.patch cvsgraph.spec sources Removed Files: cvsgraph-spelling.patch cvsgraph-wrapper.patch Log Message: Update to 1.5.1, drop -web. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cvsgraph/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:11:43 -0000 1.3 +++ .cvsignore 26 Jan 2005 20:08:42 -0000 1.4 @@ -1 +1 @@ -cvsgraph-1.5.0.tar.gz +cvsgraph-1.5.1.tar.gz cvsgraph-config.patch: Index: cvsgraph-config.patch =================================================================== RCS file: /cvs/extras/rpms/cvsgraph/devel/cvsgraph-config.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cvsgraph-config.patch 8 Nov 2004 04:11:43 -0000 1.1 +++ cvsgraph-config.patch 26 Jan 2005 20:08:42 -0000 1.2 @@ -42,14 +42,3 @@ -title_ttfont = "/dos/windows/fonts/times.ttf"; +title_ttfont = "/usr/share/fonts/bitstream-vera/VeraSe.ttf"; title_ttsize = 10.0; -@@ -339,7 +339,7 @@ - map_branch_alt = "alt=\"%0 %(%t%) (%B)\""; --map_rev_href = "href=\"%9cvsweb_graph.cgi/%m%p%F?rev=%R&content-type=text/x-cvsweb-markup%8\""; -+map_rev_href = "href=\"%9cvsweb_graph.cgi/%m%p%F?rev=%R&content-type=text/x-cvsweb-markup%8\""; - map_rev_alt = "alt=\"%1 %(%t%) (%R)\""; --map_diff_href = "href=\"%9cvsweb_graph.cgi/%m%p%F.diff?r1=%P&r2=%R%8\""; -+map_diff_href = "href=\"%9cvsweb_graph.cgi/%m%p%F.diff?r1=%P&r2=%R%8\""; - map_diff_alt = "alt=\"%2 %P <-> %R\""; --map_merge_href = "href=\"%9cvsweb_graph.cgi/%m%p%F.diff?r1=%P&r2=%R%8\""; -+map_merge_href = "href=\"%9cvsweb_graph.cgi/%m%p%F.diff?r1=%P&r2=%R%8\""; - map_merge_alt = "alt=\"%2 %P <-> %R\""; Index: cvsgraph.spec =================================================================== RCS file: /cvs/extras/rpms/cvsgraph/devel/cvsgraph.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cvsgraph.spec 10 Dec 2004 22:03:02 -0000 1.5 +++ cvsgraph.spec 26 Jan 2005 20:08:42 -0000 1.6 @@ -1,5 +1,5 @@ Name: cvsgraph -Version: 1.5.0 +Version: 1.5.1 Release: 1 Epoch: 0 Summary: A CVS/RCS repository grapher @@ -7,44 +7,31 @@ Group: Development/Tools License: GPL URL: http://www.akhphd.au.dk/~bertho/cvsgraph/ -Source0: http://www.akhphd.au.dk/~bertho/cvsgraph/release/cvsgraph-1.5.0.tar.gz +Source0: http://www.akhphd.au.dk/~bertho/cvsgraph/release/cvsgraph-1.5.1.tar.gz Source1: %{name}-httpd.conf Patch0: %{name}-config.patch -Patch1: %{name}-wrapper.patch -Patch2: %{name}-spelling.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gd-devel, byacc, flex, freetype-devel, libpng-devel, zlib-devel BuildRequires: libjpeg-devel, %{__perl} +Obsoletes: cvsgraph-web < 0:1.5.1 %description CvsGraph is a utility to make a graphical representation of all revisions and branches of a file in a CVS/RCS repository. It has been inspired by the 'graph' option in WinCVS. -%package web -Summary: WWW interface to %{name} -Group: Development/Tools -Requires: %{name} = %{epoch}:%{version}-%{release}, httpd, php - -%description web -WWW interface to %{name}. - %prep %setup -q %patch0 -%patch1 -%patch2 -p1 -# Fix up paths in php files -rename .php3 .php *.php3 +rename .php3 .php contrib/*.php3 %{__perl} -pi -e \ 's|/home/bertho/public_html/cvsgraph/cvsgraph|%{_bindir}/cvsgraph|g ; - s|/home/bertho/public_html/cvsgraph/conf/cvsgraph\.conf|%{_sysconfdir}/cvsgraph.conf|g ; - s|\b1\.1\.2\b|%{version}|g' \ - *.php -# Fix man page path + s|/home/bertho/public_html/cvsgraph/conf/cvsgraph\.conf|%{_sysconfdir}/cvsgraph.conf|g' \ + contrib/*.php %{__perl} -pi -e 's|/usr/local/etc|%{_sysconfdir}|g' cvsgraph.1 +cp -p %{SOURCE1} contrib/cvsgraph-httpd.conf %build @@ -54,46 +41,29 @@ %install rm -rf $RPM_BUILD_ROOT - install -Dpm 755 cvsgraph $RPM_BUILD_ROOT%{_bindir}/cvsgraph install -Dpm 644 cvsgraph.conf $RPM_BUILD_ROOT%{_sysconfdir}/cvsgraph.conf install -Dpm 644 cvsgraph.1 $RPM_BUILD_ROOT%{_mandir}/man1/cvsgraph.1 install -Dpm 644 cvsgraph.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5/cvsgraph.conf.5 -install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/web -install -pm 644 *.php $RPM_BUILD_ROOT%{_datadir}/%{name}/web - -install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d -%{__perl} -pe 's|/usr/share/cvsgraph/web\b|%{_datadir}/%{name}/web|' \ - %{SOURCE1} > $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/zzz-%{name}.conf -chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/zzz-%{name}.conf - %clean rm -rf $RPM_BUILD_ROOT -%post web -[ $1 -eq 1 ] && %{_initrddir}/httpd reload >/dev/null || : - -%postun web -%{_initrddir}/httpd reload >/dev/null || : - - %files %defattr(-,root,root,-) -%doc ChangeLog LICENSE README +%doc ChangeLog LICENSE README contrib/ %config(noreplace) %{_sysconfdir}/cvsgraph.conf %{_bindir}/cvsgraph %{_mandir}/man[15]/cvsgraph*.[15]* -%files web -%defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/httpd/conf.d/zzz-%{name}.conf -%{_datadir}/%{name} - %changelog +* Wed Jan 26 2005 Ville Skytt?? - 0:1.5.1-1 +- Update to 1.5.1; wrapper, spelling and part of config patch applied upstream. +- Drop -web subpackage, include *.php as docs. + * Fri Sep 3 2004 Ville Skytt?? - 0:1.5.0-0.fdr.1 - Update to 1.5.0. - Improve default configuration, manual page spelling fixes. Index: sources =================================================================== RCS file: /cvs/extras/rpms/cvsgraph/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:11:43 -0000 1.3 +++ sources 26 Jan 2005 20:08:42 -0000 1.4 @@ -1 +1 @@ -4b3e7d0ac09222407c1357bb348869a2 cvsgraph-1.5.0.tar.gz +2f01dc06685581ac03bac38e08bf3b29 cvsgraph-1.5.1.tar.gz --- cvsgraph-spelling.patch DELETED --- --- cvsgraph-wrapper.patch DELETED --- From dag at wieers.com Wed Jan 26 18:44:00 2005 From: dag at wieers.com (Dag Wieers) Date: Wed, 26 Jan 2005 19:44:00 +0100 (CET) Subject: Python site-packages tricks (was: Re: rpms/scons/devel scons.spec,1.3,1.4) In-Reply-To: <1106690988.6477.76.camel@bobcat.mine.nu> References: <200501251838.j0PIcPlq025242@cvs.fedora.redhat.com> <20050125202142.17ddc3fa@python2> <1106681796.5911.2.camel@localhost.localdomain> <1106690988.6477.76.camel@bobcat.mine.nu> Message-ID: On Wed, 26 Jan 2005, Ville Skytt? wrote: > On Tue, 2005-01-25 at 20:36 +0100, Thorsten Leemhuis wrote: > > Am Dienstag, den 25.01.2005, 20:21 +0100 schrieb Matthias Saou: > > > > Shouldn't this use the sysconfig.get_python_lib(foo) trick (that Ville > > > showed me) to get the arch independant python lib path instead? > > > > Good question; Ville what is that for a trick? > > I don't know if it's much of a trick, but see spectemplate-python.spec > in fedora-rpmdevtools. It applies to most Python extension packages out > there that use Python's distutils, and install stuff into site-packages > dirs. In the scons case, things are not installed to the site-packages > dirs, it seems, so the "trick" doesn't apply AFAICT. > > Anyway the idea is to find out the dirs where Python's distutils will > install stuff into by asking Python and using those in %files instead of > inventing/hardcoding the dirs oneself. We're using the following macros for that: %define python_sitearch %(python -c 'from distutils import sysconfig; print sysconfig.get_python_lib()') %define python_sitelib %(python -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)') Is this what you are using too ? -- dag wieers, dag at wieers.com, http://dag.wieers.com/ -- [all I want is a warm bed and a kind word and unlimited power] From ville.skytta at iki.fi Thu Jan 27 07:08:54 2005 From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=) Date: Thu, 27 Jan 2005 09:08:54 +0200 Subject: Python site-packages tricks (was: Re: rpms/scons/devel scons.spec,1.3,1.4) In-Reply-To: References: <200501251838.j0PIcPlq025242@cvs.fedora.redhat.com> <20050125202142.17ddc3fa@python2> <1106681796.5911.2.camel@localhost.localdomain> <1106690988.6477.76.camel@bobcat.mine.nu> Message-ID: <1106809734.6477.186.camel@bobcat.mine.nu> On Wed, 2005-01-26 at 19:44 +0100, Dag Wieers wrote: > On Wed, 26 Jan 2005, Ville Skytt? wrote: > > Anyway the idea is to find out the dirs where Python's distutils will > > install stuff into by asking Python and using those in %files instead of > > inventing/hardcoding the dirs oneself. > > We're using the following macros for that: > > %define python_sitearch %(python -c 'from distutils import sysconfig; print sysconfig.get_python_lib()') > %define python_sitelib %(python -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)') > > Is this what you are using too ? Almost. Your version above has the argument to get_python_lib reversed; with no arguments it returns the arch-independent path ("sitelib"), and with 1 the arch-dependent path ("sitearch"). Additionally, your version uses "python" instead of "%{__python}" which takes away a bit of the flexibility. Here's what's in fedora-rpmdevtools' spectemplate-python.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)")} From fedora-extras-commits at redhat.com Thu Jan 27 17:51:01 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 12:51:01 -0500 Subject: rpms/perl-Module-Build/devel .cvsignore, 1.5, 1.6 perl-Module-Build.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200501271751.j0RHp16J004823@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Module-Build/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv4816 Modified Files: .cvsignore perl-Module-Build.spec sources Log Message: Update to 0.2608. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 30 Dec 2004 18:29:11 -0000 1.5 +++ .cvsignore 27 Jan 2005 17:50:59 -0000 1.6 @@ -1 +1 @@ -Module-Build-0.2606.tar.gz +Module-Build-0.2608.tar.gz Index: perl-Module-Build.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/perl-Module-Build.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Module-Build.spec 30 Dec 2004 18:29:11 -0000 1.6 +++ perl-Module-Build.spec 27 Jan 2005 17:50:59 -0000 1.7 @@ -1,7 +1,7 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-Module-Build -Version: 0.2606 +Version: 0.2608 Release: 1 Epoch: 0 Summary: Perl module for building and installing Perl modules @@ -9,7 +9,7 @@ Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Module-Build/ -Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-0.2606.tar.gz +Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-0.2608.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -24,11 +24,6 @@ %prep %setup -q -n Module-Build-%{version} -# See 2004-12-01 changelog entry for rationale for this hack: -%{__perl} -MTest::Harness::Straps -e \ - '$Test::Harness::Straps::VERSION < 0.20 && - system("%{__perl} -pi -e \"s/have_yaml = .*/have_yaml = 0;/\" \\ - t/runthrough.t")' %build @@ -60,6 +55,9 @@ %changelog +* Thu Jan 27 2005 Ville Skytt?? - 0:0.2608-1 +- Update to 0.2608, Test::Harness kludge no longer needed. + * Sun Dec 19 2004 Ville Skytt?? - 0:0.2606-1 - Update to 0.2606. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 30 Dec 2004 18:29:11 -0000 1.5 +++ sources 27 Jan 2005 17:50:59 -0000 1.6 @@ -1 +1 @@ -7c03476a9c0b5b27416b8a978afa8996 Module-Build-0.2606.tar.gz +edb30a062bfca5570d412d1576787648 Module-Build-0.2608.tar.gz From fedora-extras-commits at redhat.com Thu Jan 27 18:03:49 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:03:49 -0500 Subject: rpms/glunarclock import.log,1.2,1.3 Message-ID: <200501271803.j0RI3n5c005519@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/glunarclock In directory cvs.fedora.redhat.com:/tmp/cvs-serv5510 Modified Files: import.log Log Message: auto-import glunarclock-0.32.2-0.fdr.1.2 on branch FC-2 from glunarclock-0.32.2-0.fdr.1.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/glunarclock/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 8 Nov 2004 04:26:12 -0000 1.2 +++ import.log 27 Jan 2005 18:03:47 -0000 1.3 @@ -1 +1,2 @@ glunarclock-0_32_1-0_fdr_1_2:HEAD:glunarclock-0.32.1-0.fdr.1.2.src.rpm:1099887972 +glunarclock-0_32_2-0_fdr_1_2:FC-2:glunarclock-0.32.2-0.fdr.1.2.src.rpm:1106849018 From fedora-extras-commits at redhat.com Thu Jan 27 18:03:49 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:03:49 -0500 Subject: rpms/glunarclock/FC-2 .cvsignore, 1.2, 1.3 glunarclock.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200501271803.j0RI3nnk005523@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/glunarclock/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv5510/FC-2 Modified Files: .cvsignore glunarclock.spec sources Log Message: auto-import glunarclock-0.32.2-0.fdr.1.2 on branch FC-2 from glunarclock-0.32.2-0.fdr.1.2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glunarclock/FC-2/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:26:12 -0000 1.2 +++ .cvsignore 27 Jan 2005 18:03:47 -0000 1.3 @@ -1 +1 @@ -glunarclock-0.32.1.tar.gz +glunarclock-0.32.2.tar.gz Index: glunarclock.spec =================================================================== RCS file: /cvs/extras/rpms/glunarclock/FC-2/glunarclock.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glunarclock.spec 8 Nov 2004 04:26:12 -0000 1.1 +++ glunarclock.spec 27 Jan 2005 18:03:47 -0000 1.2 @@ -1,5 +1,5 @@ Name: glunarclock -Version: 0.32.1 +Version: 0.32.2 Release: 0.fdr.1.2 Epoch: 0 Summary: GNOME applet that displays the current lunar phase @@ -7,7 +7,7 @@ Group: User Interface/Desktops License: GPL URL: http://glunarclock.sourceforge.net/ -Source0: http://download.sourceforge.net/glunarclock/glunarclock-0.32.1.tar.gz +Source0: http://download.sourceforge.net/glunarclock/glunarclock-0.32.2.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel @@ -16,6 +16,7 @@ BuildRequires: gnome-panel BuildRequires: scrollkeeper BuildRequires: gnome-panel-devel +BuildRequires: libxklavier-devel Requires(post): GConf2 Requires(preun): GConf2 Requires(post): scrollkeeper @@ -86,6 +87,9 @@ %changelog +* Sun Jan 16 2005 Marius L. J??hndal - 0:0.32.2-0.fdr.1 +- Updated to 0.32.2. + * Fri Jun 18 2004 Marius L. J??hndal - 0:0.32.1-0.fdr.1 - Updated to 0.32.1. Index: sources =================================================================== RCS file: /cvs/extras/rpms/glunarclock/FC-2/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:26:12 -0000 1.2 +++ sources 27 Jan 2005 18:03:47 -0000 1.3 @@ -1 +1 @@ -599dbc6074982456ec68d20ca8ff9069 glunarclock-0.32.1.tar.gz +3ac61aa62af4e0d53c90c18f09ee988f glunarclock-0.32.2.tar.gz From fedora-extras-commits at redhat.com Thu Jan 27 18:06:17 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:06:17 -0500 Subject: rpms/glunarclock import.log,1.3,1.4 Message-ID: <200501271806.j0RI6HRH005639@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/glunarclock In directory cvs.fedora.redhat.com:/tmp/cvs-serv5630 Modified Files: import.log Log Message: auto-import glunarclock-0.32.2-1 on branch devel from glunarclock-0.32.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/glunarclock/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 27 Jan 2005 18:03:47 -0000 1.3 +++ import.log 27 Jan 2005 18:06:15 -0000 1.4 @@ -1,2 +1,3 @@ glunarclock-0_32_1-0_fdr_1_2:HEAD:glunarclock-0.32.1-0.fdr.1.2.src.rpm:1099887972 glunarclock-0_32_2-0_fdr_1_2:FC-2:glunarclock-0.32.2-0.fdr.1.2.src.rpm:1106849018 +glunarclock-0_32_2-1:HEAD:glunarclock-0.32.2-1.src.rpm:1106849165 From fedora-extras-commits at redhat.com Thu Jan 27 18:06:17 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:06:17 -0500 Subject: rpms/glunarclock/devel .cvsignore, 1.2, 1.3 glunarclock.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200501271806.j0RI6H4x005643@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/glunarclock/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv5630/devel Modified Files: .cvsignore glunarclock.spec sources Log Message: auto-import glunarclock-0.32.2-1 on branch devel from glunarclock-0.32.2-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glunarclock/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:26:12 -0000 1.2 +++ .cvsignore 27 Jan 2005 18:06:15 -0000 1.3 @@ -1 +1 @@ -glunarclock-0.32.1.tar.gz +glunarclock-0.32.2.tar.gz Index: glunarclock.spec =================================================================== RCS file: /cvs/extras/rpms/glunarclock/devel/glunarclock.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- glunarclock.spec 10 Dec 2004 22:03:03 -0000 1.2 +++ glunarclock.spec 27 Jan 2005 18:06:15 -0000 1.3 @@ -1,5 +1,5 @@ Name: glunarclock -Version: 0.32.1 +Version: 0.32.2 Release: 1 Epoch: 0 Summary: GNOME applet that displays the current lunar phase @@ -7,7 +7,7 @@ Group: User Interface/Desktops License: GPL URL: http://glunarclock.sourceforge.net/ -Source0: http://download.sourceforge.net/glunarclock/glunarclock-0.32.1.tar.gz +Source0: http://download.sourceforge.net/glunarclock/glunarclock-0.32.2.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel @@ -16,6 +16,7 @@ BuildRequires: gnome-panel BuildRequires: scrollkeeper BuildRequires: gnome-panel-devel +BuildRequires: libxklavier-devel Requires(post): GConf2 Requires(preun): GConf2 Requires(post): scrollkeeper @@ -86,6 +87,9 @@ %changelog +* Sun Jan 16 2005 Marius L. J??hndal - 0:0.32.2-1 +- Updated to 0.32.2. + * Fri Jun 18 2004 Marius L. J??hndal - 0:0.32.1-0.fdr.1 - Updated to 0.32.1. Index: sources =================================================================== RCS file: /cvs/extras/rpms/glunarclock/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:26:12 -0000 1.2 +++ sources 27 Jan 2005 18:06:15 -0000 1.3 @@ -1 +1 @@ -599dbc6074982456ec68d20ca8ff9069 glunarclock-0.32.1.tar.gz +3ac61aa62af4e0d53c90c18f09ee988f glunarclock-0.32.2.tar.gz From fedora-extras-commits at redhat.com Thu Jan 27 18:15:50 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:15:50 -0500 Subject: rpms/fontforge import.log,1.7,1.8 Message-ID: <200501271815.j0RIFoVi005769@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/fontforge In directory cvs.fedora.redhat.com:/tmp/cvs-serv5760 Modified Files: import.log Log Message: auto-import fontforge-0.0-0.fdr.1.20041231.rh90 on branch RHL-9 from fontforge-0.0-0.fdr.1.20041231.rh90.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fontforge/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 8 Nov 2004 04:21:27 -0000 1.7 +++ import.log 27 Jan 2005 18:15:48 -0000 1.8 @@ -4,3 +4,4 @@ fontforge-0_0-0_fdr_1_20040824_rh90:RHL-9:fontforge-0.0-0.fdr.1.20040824.rh90.src.rpm:1099887662 fontforge-0_0-0_fdr_1_20040824_1:FC-1:fontforge-0.0-0.fdr.1.20040824.1.src.rpm:1099887684 fontforge-0_0-0_fdr_1_20040824_2:HEAD:fontforge-0.0-0.fdr.1.20040824.2.src.rpm:1099887687 +fontforge-0_0-0_fdr_1_20041231_rh90:RHL-9:fontforge-0.0-0.fdr.1.20041231.rh90.src.rpm:1106849741 From fedora-extras-commits at redhat.com Thu Jan 27 18:15:50 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:15:50 -0500 Subject: rpms/fontforge/RHL-9 .cvsignore, 1.3, 1.4 fontforge.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200501271815.j0RIFoZG005773@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/fontforge/RHL-9 In directory cvs.fedora.redhat.com:/tmp/cvs-serv5760/RHL-9 Modified Files: .cvsignore fontforge.spec sources Log Message: auto-import fontforge-0.0-0.fdr.1.20041231.rh90 on branch RHL-9 from fontforge-0.0-0.fdr.1.20041231.rh90.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fontforge/RHL-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:21:02 -0000 1.3 +++ .cvsignore 27 Jan 2005 18:15:48 -0000 1.4 @@ -1,2 +1,2 @@ -fontforge_full-20040824.tgz -fontforge_htdocs-20040824.tgz +fontforge_full-20041231.tgz +fontforge_htdocs-20041231.tgz Index: fontforge.spec =================================================================== RCS file: /cvs/extras/rpms/fontforge/RHL-9/fontforge.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fontforge.spec 8 Nov 2004 04:21:02 -0000 1.2 +++ fontforge.spec 27 Jan 2005 18:15:48 -0000 1.3 @@ -1,15 +1,15 @@ Name: fontforge Version: 0.0 -Release: 0.fdr.1.20040824.rh90 +Release: 0.fdr.1.20041231.rh90 Epoch: 0 Summary: An outline and bitmap font editor Group: Applications/Publishing License: BSD URL: http://fontforge.sourceforge.net/ -Source0: http://fontforge.sourceforge.net/fontforge_full-20040824.tgz +Source0: http://dl.sf.net/fontforge/fontforge_full-20041231.tgz Source1: fontforge.desktop -Source2: http://fontforge.sourceforge.net/fontforge_htdocs-20040824.tgz +Source2: http://dl.sf.net/fontforge/fontforge_htdocs-20041231.tgz Source3: pfaicon.gif Patch1: fontforge-20040618-docview.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -34,7 +34,7 @@ (Type2) and CID-keyed fonts. %prep -%setup -q -n fontforge-20040824 +%setup -q -n fontforge-20041231 %patch1 -p2 -b .docview mkdir htdocs @@ -84,6 +84,7 @@ %doc AUTHORS INSTALL LICENSE README htdocs %{_bindir}/* %{_libdir}/*.so.* +%{_libdir}/pkgconfig/fontforge.pc %{_datadir}/applications/*.desktop %{_datadir}/%{name} %{_datadir}/pixmaps/*.png @@ -91,6 +92,12 @@ %changelog +* Mon Jan 17 2005 Marius L. J??hndal - 0:0.0-0.fdr.1.20041231 +- Updated to 20041231. + +* Thu Oct 28 2004 Marius L. J??hndal - 0:0.0-0.fdr.1.20041014 +- Updated to 20041014. + * Sun Sep 19 2004 Marius L. J??hndal - 0:0.0-0.fdr.1.20040824 - Updated to 20040824. Index: sources =================================================================== RCS file: /cvs/extras/rpms/fontforge/RHL-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:21:02 -0000 1.3 +++ sources 27 Jan 2005 18:15:48 -0000 1.4 @@ -1,2 +1,2 @@ -7e589796d0cd715df6db4aab2cd48f7b fontforge_full-20040824.tgz -fade846419ab9c6a78d2194bd4f731a4 fontforge_htdocs-20040824.tgz +5b8668881d9c7474f916ee0dd2f33ba8 fontforge_full-20041231.tgz +bbcf36cae97a6cb7ea86368b22a3f805 fontforge_htdocs-20041231.tgz From fedora-extras-commits at redhat.com Thu Jan 27 18:17:31 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:17:31 -0500 Subject: rpms/fontforge/FC-1 .cvsignore, 1.3, 1.4 fontforge.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200501271817.j0RIHVpo005885@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/fontforge/FC-1 In directory cvs.fedora.redhat.com:/tmp/cvs-serv5871/FC-1 Modified Files: .cvsignore fontforge.spec sources Log Message: auto-import fontforge-0.0-0.fdr.1.20041231.1 on branch FC-1 from fontforge-0.0-0.fdr.1.20041231.1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fontforge/FC-1/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:21:24 -0000 1.3 +++ .cvsignore 27 Jan 2005 18:17:29 -0000 1.4 @@ -1,2 +1,2 @@ -fontforge_full-20040824.tgz -fontforge_htdocs-20040824.tgz +fontforge_full-20041231.tgz +fontforge_htdocs-20041231.tgz Index: fontforge.spec =================================================================== RCS file: /cvs/extras/rpms/fontforge/FC-1/fontforge.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fontforge.spec 8 Nov 2004 04:21:24 -0000 1.3 +++ fontforge.spec 27 Jan 2005 18:17:29 -0000 1.4 @@ -1,15 +1,15 @@ Name: fontforge Version: 0.0 -Release: 0.fdr.1.20040824.1 +Release: 0.fdr.1.20041231.1 Epoch: 0 Summary: An outline and bitmap font editor Group: Applications/Publishing License: BSD URL: http://fontforge.sourceforge.net/ -Source0: http://fontforge.sourceforge.net/fontforge_full-20040824.tgz +Source0: http://dl.sf.net/fontforge/fontforge_full-20041231.tgz Source1: fontforge.desktop -Source2: http://fontforge.sourceforge.net/fontforge_htdocs-20040824.tgz +Source2: http://dl.sf.net/fontforge/fontforge_htdocs-20041231.tgz Source3: pfaicon.gif Patch1: fontforge-20040618-docview.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -34,7 +34,7 @@ (Type2) and CID-keyed fonts. %prep -%setup -q -n fontforge-20040824 +%setup -q -n fontforge-20041231 %patch1 -p2 -b .docview mkdir htdocs @@ -84,6 +84,7 @@ %doc AUTHORS INSTALL LICENSE README htdocs %{_bindir}/* %{_libdir}/*.so.* +%{_libdir}/pkgconfig/fontforge.pc %{_datadir}/applications/*.desktop %{_datadir}/%{name} %{_datadir}/pixmaps/*.png @@ -91,6 +92,12 @@ %changelog +* Mon Jan 17 2005 Marius L. J??hndal - 0:0.0-0.fdr.1.20041231 +- Updated to 20041231. + +* Thu Oct 28 2004 Marius L. J??hndal - 0:0.0-0.fdr.1.20041014 +- Updated to 20041014. + * Sun Sep 19 2004 Marius L. J??hndal - 0:0.0-0.fdr.1.20040824 - Updated to 20040824. Index: sources =================================================================== RCS file: /cvs/extras/rpms/fontforge/FC-1/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:21:24 -0000 1.3 +++ sources 27 Jan 2005 18:17:29 -0000 1.4 @@ -1,2 +1,2 @@ -7e589796d0cd715df6db4aab2cd48f7b fontforge_full-20040824.tgz -fade846419ab9c6a78d2194bd4f731a4 fontforge_htdocs-20040824.tgz +5b8668881d9c7474f916ee0dd2f33ba8 fontforge_full-20041231.tgz +bbcf36cae97a6cb7ea86368b22a3f805 fontforge_htdocs-20041231.tgz From fedora-extras-commits at redhat.com Thu Jan 27 18:17:31 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:17:31 -0500 Subject: rpms/fontforge import.log,1.8,1.9 Message-ID: <200501271817.j0RIHVuR005881@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/fontforge In directory cvs.fedora.redhat.com:/tmp/cvs-serv5871 Modified Files: import.log Log Message: auto-import fontforge-0.0-0.fdr.1.20041231.1 on branch FC-1 from fontforge-0.0-0.fdr.1.20041231.1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fontforge/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 27 Jan 2005 18:15:48 -0000 1.8 +++ import.log 27 Jan 2005 18:17:29 -0000 1.9 @@ -5,3 +5,4 @@ fontforge-0_0-0_fdr_1_20040824_1:FC-1:fontforge-0.0-0.fdr.1.20040824.1.src.rpm:1099887684 fontforge-0_0-0_fdr_1_20040824_2:HEAD:fontforge-0.0-0.fdr.1.20040824.2.src.rpm:1099887687 fontforge-0_0-0_fdr_1_20041231_rh90:RHL-9:fontforge-0.0-0.fdr.1.20041231.rh90.src.rpm:1106849741 +fontforge-0_0-0_fdr_1_20041231_1:FC-1:fontforge-0.0-0.fdr.1.20041231.1.src.rpm:1106849841 From fedora-extras-commits at redhat.com Thu Jan 27 18:18:45 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:18:45 -0500 Subject: rpms/fontforge/FC-2 .cvsignore, 1.3, 1.4 fontforge.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200501271818.j0RIIjvl005999@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/fontforge/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv5989/FC-2 Modified Files: .cvsignore fontforge.spec sources Log Message: auto-import fontforge-0.0-0.fdr.1.20041231.2 on branch FC-2 from fontforge-0.0-0.fdr.1.20041231.2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fontforge/FC-2/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:21:27 -0000 1.3 +++ .cvsignore 27 Jan 2005 18:18:43 -0000 1.4 @@ -1,2 +1,2 @@ -fontforge_full-20040824.tgz -fontforge_htdocs-20040824.tgz +fontforge_full-20041231.tgz +fontforge_htdocs-20041231.tgz Index: fontforge.spec =================================================================== RCS file: /cvs/extras/rpms/fontforge/FC-2/fontforge.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fontforge.spec 8 Nov 2004 04:21:27 -0000 1.4 +++ fontforge.spec 27 Jan 2005 18:18:43 -0000 1.5 @@ -1,15 +1,15 @@ Name: fontforge Version: 0.0 -Release: 0.fdr.1.20040824.2 +Release: 0.fdr.1.20041231.2 Epoch: 0 Summary: An outline and bitmap font editor Group: Applications/Publishing License: BSD URL: http://fontforge.sourceforge.net/ -Source0: http://fontforge.sourceforge.net/fontforge_full-20040824.tgz +Source0: http://dl.sf.net/fontforge/fontforge_full-20041231.tgz Source1: fontforge.desktop -Source2: http://fontforge.sourceforge.net/fontforge_htdocs-20040824.tgz +Source2: http://dl.sf.net/fontforge/fontforge_htdocs-20041231.tgz Source3: pfaicon.gif Patch1: fontforge-20040618-docview.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -34,7 +34,7 @@ (Type2) and CID-keyed fonts. %prep -%setup -q -n fontforge-20040824 +%setup -q -n fontforge-20041231 %patch1 -p2 -b .docview mkdir htdocs @@ -84,6 +84,7 @@ %doc AUTHORS INSTALL LICENSE README htdocs %{_bindir}/* %{_libdir}/*.so.* +%{_libdir}/pkgconfig/fontforge.pc %{_datadir}/applications/*.desktop %{_datadir}/%{name} %{_datadir}/pixmaps/*.png @@ -91,6 +92,12 @@ %changelog +* Mon Jan 17 2005 Marius L. J??hndal - 0:0.0-0.fdr.1.20041231 +- Updated to 20041231. + +* Thu Oct 28 2004 Marius L. J??hndal - 0:0.0-0.fdr.1.20041014 +- Updated to 20041014. + * Sun Sep 19 2004 Marius L. J??hndal - 0:0.0-0.fdr.1.20040824 - Updated to 20040824. Index: sources =================================================================== RCS file: /cvs/extras/rpms/fontforge/FC-2/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:21:27 -0000 1.3 +++ sources 27 Jan 2005 18:18:43 -0000 1.4 @@ -1,2 +1,2 @@ -7e589796d0cd715df6db4aab2cd48f7b fontforge_full-20040824.tgz -fade846419ab9c6a78d2194bd4f731a4 fontforge_htdocs-20040824.tgz +5b8668881d9c7474f916ee0dd2f33ba8 fontforge_full-20041231.tgz +bbcf36cae97a6cb7ea86368b22a3f805 fontforge_htdocs-20041231.tgz From fedora-extras-commits at redhat.com Thu Jan 27 18:18:45 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:18:45 -0500 Subject: rpms/fontforge import.log,1.9,1.10 Message-ID: <200501271818.j0RIIjtg006003@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/fontforge In directory cvs.fedora.redhat.com:/tmp/cvs-serv5989 Modified Files: import.log Log Message: auto-import fontforge-0.0-0.fdr.1.20041231.2 on branch FC-2 from fontforge-0.0-0.fdr.1.20041231.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fontforge/import.log,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- import.log 27 Jan 2005 18:17:29 -0000 1.9 +++ import.log 27 Jan 2005 18:18:42 -0000 1.10 @@ -6,3 +6,4 @@ fontforge-0_0-0_fdr_1_20040824_2:HEAD:fontforge-0.0-0.fdr.1.20040824.2.src.rpm:1099887687 fontforge-0_0-0_fdr_1_20041231_rh90:RHL-9:fontforge-0.0-0.fdr.1.20041231.rh90.src.rpm:1106849741 fontforge-0_0-0_fdr_1_20041231_1:FC-1:fontforge-0.0-0.fdr.1.20041231.1.src.rpm:1106849841 +fontforge-0_0-0_fdr_1_20041231_2:FC-2:fontforge-0.0-0.fdr.1.20041231.2.src.rpm:1106849914 From fedora-extras-commits at redhat.com Thu Jan 27 18:19:48 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:19:48 -0500 Subject: rpms/fontforge import.log,1.10,1.11 Message-ID: <200501271819.j0RIJmK9006116@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/fontforge In directory cvs.fedora.redhat.com:/tmp/cvs-serv6107 Modified Files: import.log Log Message: auto-import fontforge-0.0-1.20041231 on branch devel from fontforge-0.0-1.20041231.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fontforge/import.log,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- import.log 27 Jan 2005 18:18:42 -0000 1.10 +++ import.log 27 Jan 2005 18:19:46 -0000 1.11 @@ -7,3 +7,4 @@ fontforge-0_0-0_fdr_1_20041231_rh90:RHL-9:fontforge-0.0-0.fdr.1.20041231.rh90.src.rpm:1106849741 fontforge-0_0-0_fdr_1_20041231_1:FC-1:fontforge-0.0-0.fdr.1.20041231.1.src.rpm:1106849841 fontforge-0_0-0_fdr_1_20041231_2:FC-2:fontforge-0.0-0.fdr.1.20041231.2.src.rpm:1106849914 +fontforge-0_0-1_20041231:HEAD:fontforge-0.0-1.20041231.src.rpm:1106849979 From fedora-extras-commits at redhat.com Thu Jan 27 18:19:48 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:19:48 -0500 Subject: rpms/fontforge/devel .cvsignore, 1.3, 1.4 fontforge.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200501271819.j0RIJmQe006121@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/fontforge/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv6107/devel Modified Files: .cvsignore fontforge.spec sources Log Message: auto-import fontforge-0.0-1.20041231 on branch devel from fontforge-0.0-1.20041231.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fontforge/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:21:27 -0000 1.3 +++ .cvsignore 27 Jan 2005 18:19:46 -0000 1.4 @@ -1,2 +1,2 @@ -fontforge_full-20040824.tgz -fontforge_htdocs-20040824.tgz +fontforge_full-20041231.tgz +fontforge_htdocs-20041231.tgz Index: fontforge.spec =================================================================== RCS file: /cvs/extras/rpms/fontforge/devel/fontforge.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fontforge.spec 10 Dec 2004 22:03:02 -0000 1.5 +++ fontforge.spec 27 Jan 2005 18:19:46 -0000 1.6 @@ -1,15 +1,15 @@ Name: fontforge Version: 0.0 -Release: 1.20040824 +Release: 1.20041231 Epoch: 0 Summary: An outline and bitmap font editor Group: Applications/Publishing License: BSD URL: http://fontforge.sourceforge.net/ -Source0: http://fontforge.sourceforge.net/fontforge_full-20040824.tgz +Source0: http://dl.sf.net/fontforge/fontforge_full-20041231.tgz Source1: fontforge.desktop -Source2: http://fontforge.sourceforge.net/fontforge_htdocs-20040824.tgz +Source2: http://dl.sf.net/fontforge/fontforge_htdocs-20041231.tgz Source3: pfaicon.gif Patch1: fontforge-20040618-docview.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -34,7 +34,7 @@ (Type2) and CID-keyed fonts. %prep -%setup -q -n fontforge-20040824 +%setup -q -n fontforge-20041231 %patch1 -p2 -b .docview mkdir htdocs @@ -84,6 +84,7 @@ %doc AUTHORS INSTALL LICENSE README htdocs %{_bindir}/* %{_libdir}/*.so.* +%{_libdir}/pkgconfig/fontforge.pc %{_datadir}/applications/*.desktop %{_datadir}/%{name} %{_datadir}/pixmaps/*.png @@ -91,6 +92,12 @@ %changelog +* Mon Jan 17 2005 Marius L. J??hndal - 0:0.0-1.20041231 +- Updated to 20041231. + +* Thu Oct 28 2004 Marius L. J??hndal - 0:0.0-0.fdr.1.20041014 +- Updated to 20041014. + * Sun Sep 19 2004 Marius L. J??hndal - 0:0.0-0.fdr.1.20040824 - Updated to 20040824. Index: sources =================================================================== RCS file: /cvs/extras/rpms/fontforge/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:21:27 -0000 1.3 +++ sources 27 Jan 2005 18:19:46 -0000 1.4 @@ -1,2 +1,2 @@ -7e589796d0cd715df6db4aab2cd48f7b fontforge_full-20040824.tgz -fade846419ab9c6a78d2194bd4f731a4 fontforge_htdocs-20040824.tgz +5b8668881d9c7474f916ee0dd2f33ba8 fontforge_full-20041231.tgz +bbcf36cae97a6cb7ea86368b22a3f805 fontforge_htdocs-20041231.tgz From fedora-extras-commits at redhat.com Thu Jan 27 18:27:08 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:27:08 -0500 Subject: rpms/stellarium import.log,1.3,1.4 Message-ID: <200501271827.j0RIR8Oo006264@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/stellarium In directory cvs.fedora.redhat.com:/tmp/cvs-serv6255 Modified Files: import.log Log Message: auto-import stellarium-0.6.2-0.fdr.2.1 on branch FC-1 from stellarium-0.6.2-0.fdr.2.1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/stellarium/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 8 Nov 2004 05:22:20 -0000 1.3 +++ import.log 27 Jan 2005 18:27:06 -0000 1.4 @@ -1,2 +1,3 @@ stellarium-0_6_0-0_fdr_2_1:HEAD:stellarium-0.6.0-0.fdr.2.1.src.rpm:1099891334 stellarium-0_6_0-0_fdr_2_2:HEAD:stellarium-0.6.0-0.fdr.2.2.src.rpm:1099891340 +stellarium-0_6_2-0_fdr_2_1:FC-1:stellarium-0.6.2-0.fdr.2.1.src.rpm:1106850417 From fedora-extras-commits at redhat.com Thu Jan 27 18:27:09 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:27:09 -0500 Subject: rpms/stellarium/FC-1 stellarium-0.6.2-optflags.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.3, 1.4 stellarium.spec, 1.3, 1.4 stellarium-0.6.0-optflags.patch, 1.1, NONE Message-ID: <200501271827.j0RIR9ds006268@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/stellarium/FC-1 In directory cvs.fedora.redhat.com:/tmp/cvs-serv6255/FC-1 Modified Files: .cvsignore sources stellarium.spec Added Files: stellarium-0.6.2-optflags.patch Removed Files: stellarium-0.6.0-optflags.patch Log Message: auto-import stellarium-0.6.2-0.fdr.2.1 on branch FC-1 from stellarium-0.6.2-0.fdr.2.1.src.rpm stellarium-0.6.2-optflags.patch: --- NEW FILE stellarium-0.6.2-optflags.patch --- --- /home/mlj/rpm/BUILD/stellarium-0.6.2/configure.orig 2005-01-16 18:57:29.298619223 +0100 +++ /home/mlj/rpm/BUILD/stellarium-0.6.2/configure 2005-01-16 18:57:36.281755258 +0100 @@ -3341,8 +3341,6 @@ -CFLAGS=" -Wall -O3" -CXXFLAGS=" -Wall -O3" ac_ext=c ac_cpp='$CPP $CPPFLAGS' Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-1/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:22:14 -0000 1.2 +++ .cvsignore 27 Jan 2005 18:27:06 -0000 1.3 @@ -1 +1 @@ -stellarium-0.6.0.tar.gz +stellarium-0.6.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-1/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Nov 2004 04:30:10 -0000 1.3 +++ sources 27 Jan 2005 18:27:06 -0000 1.4 @@ -1 +1 @@ -1065f8ba5a47c7b91997e8bf78d7549e stellarium-0.6.1.tar.gz +f00e99b88f53273419683cf18905e39c stellarium-0.6.2.tar.gz Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-1/stellarium.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- stellarium.spec 28 Nov 2004 04:34:46 -0000 1.3 +++ stellarium.spec 27 Jan 2005 18:27:07 -0000 1.4 @@ -1,15 +1,15 @@ Name: stellarium -Version: 0.6.1 -Release: 0.fdr.1.1 +Version: 0.6.2 +Release: 0.fdr.2.1 Epoch: 0 Summary: A photo-realistic nightsky renderer Group: Amusements/Graphics License: GPL URL: http://stellarium.free.fr/ -Source0: http://dl.sf.net/stellarium/stellarium-0.6.1.tar.gz +Source0: http://dl.sf.net/stellarium/stellarium-0.6.2.tar.gz Source1: stellarium.desktop -Patch0: stellarium-0.6.0-optflags.patch +Patch0: stellarium-0.6.2-optflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel @@ -25,7 +25,7 @@ %prep %setup -q -%patch0 -p0 +%patch0 -p6 %build @@ -66,6 +66,12 @@ %changelog +* Sun Jan 23 2005 Marius L. J??hndal - 0:0.6.2-0.fdr.2 +- Fixed broken patch. + +* Sun Jan 16 2005 Marius L. J??hndal - 0:0.6.2-0.fdr.1 +- Updated to 0.6.2. + * Sun Oct 17 2004 Marius L. J??hndal - 0:0.6.1-0.fdr.1 - Updated to 0.6.1. --- stellarium-0.6.0-optflags.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jan 27 18:28:23 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:28:23 -0500 Subject: rpms/stellarium import.log,1.4,1.5 Message-ID: <200501271828.j0RISNoa006388@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/stellarium In directory cvs.fedora.redhat.com:/tmp/cvs-serv6379 Modified Files: import.log Log Message: auto-import stellarium-0.6.2-0.fdr.2.2 on branch FC-2 from stellarium-0.6.2-0.fdr.2.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/stellarium/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 27 Jan 2005 18:27:06 -0000 1.4 +++ import.log 27 Jan 2005 18:28:21 -0000 1.5 @@ -1,3 +1,4 @@ stellarium-0_6_0-0_fdr_2_1:HEAD:stellarium-0.6.0-0.fdr.2.1.src.rpm:1099891334 stellarium-0_6_0-0_fdr_2_2:HEAD:stellarium-0.6.0-0.fdr.2.2.src.rpm:1099891340 stellarium-0_6_2-0_fdr_2_1:FC-1:stellarium-0.6.2-0.fdr.2.1.src.rpm:1106850417 +stellarium-0_6_2-0_fdr_2_2:FC-2:stellarium-0.6.2-0.fdr.2.2.src.rpm:1106850493 From fedora-extras-commits at redhat.com Thu Jan 27 18:28:23 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:28:23 -0500 Subject: rpms/stellarium/FC-2 stellarium-0.6.2-optflags.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.3, 1.4 stellarium.spec, 1.4, 1.5 stellarium-0.6.0-optflags.patch, 1.1, NONE Message-ID: <200501271828.j0RISN3M006392@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/stellarium/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv6379/FC-2 Modified Files: .cvsignore sources stellarium.spec Added Files: stellarium-0.6.2-optflags.patch Removed Files: stellarium-0.6.0-optflags.patch Log Message: auto-import stellarium-0.6.2-0.fdr.2.2 on branch FC-2 from stellarium-0.6.2-0.fdr.2.2.src.rpm stellarium-0.6.2-optflags.patch: --- NEW FILE stellarium-0.6.2-optflags.patch --- --- /home/mlj/rpm/BUILD/stellarium-0.6.2/configure.orig 2005-01-16 18:57:29.298619223 +0100 +++ /home/mlj/rpm/BUILD/stellarium-0.6.2/configure 2005-01-16 18:57:36.281755258 +0100 @@ -3341,8 +3341,6 @@ -CFLAGS=" -Wall -O3" -CXXFLAGS=" -Wall -O3" ac_ext=c ac_cpp='$CPP $CPPFLAGS' Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-2/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:22:14 -0000 1.2 +++ .cvsignore 27 Jan 2005 18:28:21 -0000 1.3 @@ -1 +1 @@ -stellarium-0.6.0.tar.gz +stellarium-0.6.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-2/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Nov 2004 04:30:10 -0000 1.3 +++ sources 27 Jan 2005 18:28:21 -0000 1.4 @@ -1 +1 @@ -1065f8ba5a47c7b91997e8bf78d7549e stellarium-0.6.1.tar.gz +f00e99b88f53273419683cf18905e39c stellarium-0.6.2.tar.gz Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-2/stellarium.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- stellarium.spec 28 Nov 2004 04:34:46 -0000 1.4 +++ stellarium.spec 27 Jan 2005 18:28:21 -0000 1.5 @@ -1,15 +1,15 @@ Name: stellarium -Version: 0.6.1 -Release: 0.fdr.1.2 +Version: 0.6.2 +Release: 0.fdr.2.2 Epoch: 0 Summary: A photo-realistic nightsky renderer Group: Amusements/Graphics License: GPL URL: http://stellarium.free.fr/ -Source0: http://dl.sf.net/stellarium/stellarium-0.6.1.tar.gz +Source0: http://dl.sf.net/stellarium/stellarium-0.6.2.tar.gz Source1: stellarium.desktop -Patch0: stellarium-0.6.0-optflags.patch +Patch0: stellarium-0.6.2-optflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel @@ -25,7 +25,7 @@ %prep %setup -q -%patch0 -p0 +%patch0 -p6 %build @@ -66,6 +66,12 @@ %changelog +* Sun Jan 23 2005 Marius L. J??hndal - 0:0.6.2-0.fdr.2 +- Fixed broken patch. + +* Sun Jan 16 2005 Marius L. J??hndal - 0:0.6.2-0.fdr.1 +- Updated to 0.6.2. + * Sun Oct 17 2004 Marius L. J??hndal - 0:0.6.1-0.fdr.1 - Updated to 0.6.1. --- stellarium-0.6.0-optflags.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jan 27 18:29:17 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:29:17 -0500 Subject: rpms/stellarium import.log,1.5,1.6 Message-ID: <200501271829.j0RITHVK006519@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/stellarium In directory cvs.fedora.redhat.com:/tmp/cvs-serv6510 Modified Files: import.log Log Message: auto-import stellarium-0.6.2-2 on branch devel from stellarium-0.6.2-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/stellarium/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 27 Jan 2005 18:28:21 -0000 1.5 +++ import.log 27 Jan 2005 18:29:15 -0000 1.6 @@ -2,3 +2,4 @@ stellarium-0_6_0-0_fdr_2_2:HEAD:stellarium-0.6.0-0.fdr.2.2.src.rpm:1099891340 stellarium-0_6_2-0_fdr_2_1:FC-1:stellarium-0.6.2-0.fdr.2.1.src.rpm:1106850417 stellarium-0_6_2-0_fdr_2_2:FC-2:stellarium-0.6.2-0.fdr.2.2.src.rpm:1106850493 +stellarium-0_6_2-2:HEAD:stellarium-0.6.2-2.src.rpm:1106850548 From fedora-extras-commits at redhat.com Thu Jan 27 18:29:17 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:29:17 -0500 Subject: rpms/stellarium/devel stellarium-0.6.2-optflags.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 stellarium.spec, 1.3, 1.4 stellarium-0.6.0-optflags.patch, 1.1, NONE Message-ID: <200501271829.j0RITHW6006523@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/stellarium/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv6510/devel Modified Files: .cvsignore sources stellarium.spec Added Files: stellarium-0.6.2-optflags.patch Removed Files: stellarium-0.6.0-optflags.patch Log Message: auto-import stellarium-0.6.2-2 on branch devel from stellarium-0.6.2-2.src.rpm stellarium-0.6.2-optflags.patch: --- NEW FILE stellarium-0.6.2-optflags.patch --- --- /home/mlj/rpm/BUILD/stellarium-0.6.2/configure.orig 2005-01-16 18:57:29.298619223 +0100 +++ /home/mlj/rpm/BUILD/stellarium-0.6.2/configure 2005-01-16 18:57:36.281755258 +0100 @@ -3341,8 +3341,6 @@ -CFLAGS=" -Wall -O3" -CXXFLAGS=" -Wall -O3" ac_ext=c ac_cpp='$CPP $CPPFLAGS' Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/stellarium/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 26 Nov 2004 08:21:16 -0000 1.3 +++ .cvsignore 27 Jan 2005 18:29:15 -0000 1.4 @@ -1 +1 @@ -stellarium-0.6.1.tar.gz +stellarium-0.6.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/stellarium/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 26 Nov 2004 08:21:16 -0000 1.3 +++ sources 27 Jan 2005 18:29:15 -0000 1.4 @@ -1 +1 @@ -1065f8ba5a47c7b91997e8bf78d7549e stellarium-0.6.1.tar.gz +f00e99b88f53273419683cf18905e39c stellarium-0.6.2.tar.gz Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- stellarium.spec 26 Nov 2004 08:21:16 -0000 1.3 +++ stellarium.spec 27 Jan 2005 18:29:15 -0000 1.4 @@ -1,15 +1,15 @@ Name: stellarium -Version: 0.6.1 -Release: 1 +Version: 0.6.2 +Release: 2 Epoch: 0 Summary: A photo-realistic nightsky renderer Group: Amusements/Graphics License: GPL URL: http://stellarium.free.fr/ -Source0: http://dl.sf.net/stellarium/stellarium-0.6.1.tar.gz +Source0: http://dl.sf.net/stellarium/stellarium-0.6.2.tar.gz Source1: stellarium.desktop -Patch0: stellarium-0.6.0-optflags.patch +Patch0: stellarium-0.6.2-optflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel @@ -25,7 +25,7 @@ %prep %setup -q -%patch0 -p0 +%patch0 -p6 %build @@ -66,7 +66,13 @@ %changelog -* Sun Oct 17 2004 Marius L. J??hndal - 0:0.6.1-1 +* Sun Jan 23 2005 Marius L. J??hndal - 0:0.6.2-2 +- Fixed broken patch. + +* Sun Jan 16 2005 Marius L. J??hndal - 0:0.6.2-0.fdr.1 +- Updated to 0.6.2. + +* Sun Oct 17 2004 Marius L. J??hndal - 0:0.6.1-0.fdr.1 - Updated to 0.6.1. * Sat Aug 21 2004 Marius L. J??hndal - 0:0.6.0-0.fdr.2 --- stellarium-0.6.0-optflags.patch DELETED --- From dag at wieers.com Thu Jan 27 19:10:28 2005 From: dag at wieers.com (Dag Wieers) Date: Thu, 27 Jan 2005 20:10:28 +0100 (CET) Subject: Python site-packages tricks (was: Re: rpms/scons/devel scons.spec,1.3,1.4) In-Reply-To: <1106809734.6477.186.camel@bobcat.mine.nu> References: <200501251838.j0PIcPlq025242@cvs.fedora.redhat.com> <20050125202142.17ddc3fa@python2> <1106681796.5911.2.camel@localhost.localdomain> <1106690988.6477.76.camel@bobcat.mine.nu> <1106809734.6477.186.camel@bobcat.mine.nu> Message-ID: On Thu, 27 Jan 2005, Ville Skytt? wrote: > On Wed, 2005-01-26 at 19:44 +0100, Dag Wieers wrote: > > On Wed, 26 Jan 2005, Ville Skytt? wrote: > > > > Anyway the idea is to find out the dirs where Python's distutils will > > > install stuff into by asking Python and using those in %files instead of > > > inventing/hardcoding the dirs oneself. > > > > We're using the following macros for that: > > > > %define python_sitearch %(python -c 'from distutils import sysconfig; print sysconfig.get_python_lib()') > > %define python_sitelib %(python -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)') > > > > Is this what you are using too ? > > Almost. Your version above has the argument to get_python_lib reversed; > with no arguments it returns the arch-independent path ("sitelib"), and > with 1 the arch-dependent path ("sitearch"). Additionally, your version > uses "python" instead of "%{__python}" which takes away a bit of the > flexibility. > > Here's what's in fedora-rpmdevtools' spectemplate-python.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)")} Yes, I was using %{python_dir} for both, but using different names like perl makes much more sense. -- dag wieers, dag at wieers.com, http://dag.wieers.com/ -- [all I want is a warm bed and a kind word and unlimited power] From fedora-extras-commits at redhat.com Fri Jan 28 00:48:11 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 27 Jan 2005 19:48:11 -0500 Subject: rpms/gnome-vfsmm26/devel gnome-vfsmm.spec,1.2,1.3 sources,1.2,1.3 Message-ID: <200501280048.j0S0mBcp011118@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gnome-vfsmm26/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv11112 Modified Files: gnome-vfsmm.spec sources Log Message: Merge patches from Thorsten. Index: gnome-vfsmm.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-vfsmm26/devel/gnome-vfsmm.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gnome-vfsmm.spec 10 Dec 2004 22:03:03 -0000 1.2 +++ gnome-vfsmm.spec 28 Jan 2005 00:48:09 -0000 1.3 @@ -1,6 +1,6 @@ Name: gnome-vfsmm26 Version: 2.6.1 -Release: 1 +Release: 2 Epoch: 0 Summary: C++ wrapper for gnome-vfs @@ -8,6 +8,7 @@ License: LGPL URL: http://gtkmm.sourceforge.net/ Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-vfsmm/2.6/gnome-vfsmm-%{version}.tar.bz2 +Patch0: gnome-vfsmm-2.6.1-autoreconf.patch.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -33,7 +34,10 @@ %prep %setup -q -n gnome-vfsmm-%{version} - +%ifarch x86_64 +# Patch was build after: aclocal -I scripts && automake -c -f && autoconf && libtoolize --copy --force +%patch0 -p1 +%endif %build %configure --enable-static @@ -72,6 +76,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Thu Jan 27 2005 Thorsten Leemhuis - 0:2.6.1-2 +- Add autoreconf patch; fixes build on x86_64 + * Mon Jun 27 2004 Denis Leroy - 0:2.6.1-0.fdr.1 - Upgrade to 2.6.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-vfsmm26/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:28:19 -0000 1.2 +++ sources 28 Jan 2005 00:48:09 -0000 1.3 @@ -1 +1,2 @@ a0f8006f7336b211f160224fddaf86e1 gnome-vfsmm-2.6.1.tar.bz2 +401d20708378a66e5c52e29c16c770e2 gnome-vfsmm-2.6.1-autoreconf.patch.bz2 From fedora-extras-commits at redhat.com Fri Jan 28 15:28:42 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 28 Jan 2005 10:28:42 -0500 Subject: rpms/liferea/devel liferea.desktop,1.1,NONE Message-ID: <200501281528.j0SFSgx0022548@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/liferea/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22542 Removed Files: liferea.desktop Log Message: commit removal --- liferea.desktop DELETED --- From fedora-extras-commits at redhat.com Fri Jan 28 15:55:54 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 28 Jan 2005 10:55:54 -0500 Subject: rpms/gazpacho/devel - New directory Message-ID: <200501281555.j0SFtsT7022767@cvs.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/gazpacho/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22753/gazpacho/devel Log Message: Directory /cvs/extras/rpms/gazpacho/devel added to the repository From fedora-extras-commits at redhat.com Fri Jan 28 15:55:54 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 28 Jan 2005 10:55:54 -0500 Subject: rpms/gazpacho - New directory Message-ID: <200501281555.j0SFtsh4022768@cvs.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/gazpacho In directory cvs.fedora.redhat.com:/tmp/cvs-serv22753/gazpacho Log Message: Directory /cvs/extras/rpms/gazpacho added to the repository From fedora-extras-commits at redhat.com Fri Jan 28 15:56:12 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 28 Jan 2005 10:56:12 -0500 Subject: rpms/gazpacho Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501281556.j0SFuCRx022846@cvs.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/gazpacho In directory cvs.fedora.redhat.com:/tmp/cvs-serv22829 Added Files: Makefile import.log Log Message: Setup of module gazpacho --- NEW FILE Makefile --- # Top level Makefile for module gazpacho all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 28 15:56:12 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 28 Jan 2005 10:56:12 -0500 Subject: rpms/gazpacho/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501281556.j0SFuCiC022849@cvs.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/gazpacho/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22829/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gazpacho --- NEW 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 Jan 28 15:56:34 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 28 Jan 2005 10:56:34 -0500 Subject: rpms/gazpacho import.log,1.1,1.2 Message-ID: <200501281556.j0SFuY2x022978@cvs.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/gazpacho In directory cvs.fedora.redhat.com:/tmp/cvs-serv22963 Modified Files: import.log Log Message: auto-import gazpacho-0.4.0-1 on branch devel from gazpacho-0.4.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gazpacho/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 Jan 2005 15:56:10 -0000 1.1 +++ import.log 28 Jan 2005 15:56:32 -0000 1.2 @@ -0,0 +1 @@ +gazpacho-0_4_0-1:HEAD:gazpacho-0.4.0-1.src.rpm:1106927789 From fedora-extras-commits at redhat.com Fri Jan 28 15:56:34 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 28 Jan 2005 10:56:34 -0500 Subject: rpms/gazpacho/devel gazpacho.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501281556.j0SFuYMv022982@cvs.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/gazpacho/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22963/devel Modified Files: .cvsignore sources Added Files: gazpacho.spec Log Message: auto-import gazpacho-0.4.0-1 on branch devel from gazpacho-0.4.0-1.src.rpm --- NEW FILE gazpacho.spec --- Summary: Glade Interface Creater Name: gazpacho Version: 0.4.0 Release: 1 License: GPL Group: Development/Tools URL: http://gruppy.sicem.biz/descargas Provides: Gazpacho = %{version}-%{release} Source0: Gazpacho-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch Requires: pygtk2 >= 2.4.0, pygtk2-libglade %description This program allows you to create the Graphical User Interface (GUI) of your GTK+ program in a visual way. Yes, it is a Glade-3 clone. It is compatible with libglade. %prep %setup -q -n Gazpacho-%{version} %build python ./setup.py build %install rm -rf $RPM_BUILD_ROOT python ./setup.py install -O1 --root=$RPM_BUILD_ROOT \ --record=INSTALLED_FILES sed 's|^\(.*\.pyo\)$|%ghost \1|' < INSTALLED_FILES > %{name}-%{version}.files find $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages/* -type d \ | sed "s|^$RPM_BUILD_ROOT|%dir |" >> %{name}-%{version}.files %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}-%{version}.files %defattr(-,root,root,-) %doc README COPYING NEWS %changelog * Fri Jan 28 2005 Jeremy Katz - 0.4.0-1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gazpacho/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Jan 2005 15:56:10 -0000 1.1 +++ .cvsignore 28 Jan 2005 15:56:32 -0000 1.2 @@ -0,0 +1 @@ +Gazpacho-0.4.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gazpacho/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Jan 2005 15:56:10 -0000 1.1 +++ sources 28 Jan 2005 15:56:32 -0000 1.2 @@ -0,0 +1 @@ +b0f037944b7d100ed5991679b4728cac Gazpacho-0.4.0.tar.bz2 From fedora-extras-commits at redhat.com Fri Jan 28 16:21:58 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:21:58 -0500 Subject: rpms/php-eaccelerator - New directory Message-ID: <200501281621.j0SGLwlZ023754@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator In directory cvs.fedora.redhat.com:/tmp/cvs-serv23747/php-eaccelerator Log Message: Directory /cvs/extras/rpms/php-eaccelerator added to the repository From fedora-extras-commits at redhat.com Fri Jan 28 16:21:58 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:21:58 -0500 Subject: rpms/php-eaccelerator/devel - New directory Message-ID: <200501281621.j0SGLwM2023757@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv23747/php-eaccelerator/devel Log Message: Directory /cvs/extras/rpms/php-eaccelerator/devel added to the repository From fedora-extras-commits at redhat.com Fri Jan 28 16:22:18 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:22:18 -0500 Subject: rpms/php-eaccelerator Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501281622.j0SGMIiX023816@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator In directory cvs.fedora.redhat.com:/tmp/cvs-serv23807 Added Files: Makefile import.log Log Message: Setup of module php-eaccelerator --- NEW FILE Makefile --- # Top level Makefile for module php-eaccelerator all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 28 16:22:18 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:22:18 -0500 Subject: rpms/php-eaccelerator/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501281622.j0SGMIv2023819@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv23807/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module php-eaccelerator --- NEW 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 Jan 28 16:22:54 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:22:54 -0500 Subject: rpms/php-eaccelerator import.log,1.1,1.2 Message-ID: <200501281622.j0SGMsDN023913@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator In directory cvs.fedora.redhat.com:/tmp/cvs-serv23903 Modified Files: import.log Log Message: auto-import php-eaccelerator-4.3.10_0.9.2a-1 on branch devel from php-eaccelerator-4.3.10_0.9.2a-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 Jan 2005 16:22:16 -0000 1.1 +++ import.log 28 Jan 2005 16:22:52 -0000 1.2 @@ -0,0 +1 @@ +php-eaccelerator-4_3_10_0_9_2a-1:HEAD:php-eaccelerator-4.3.10_0.9.2a-1.src.rpm:1106929365 From fedora-extras-commits at redhat.com Fri Jan 28 16:22:54 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:22:54 -0500 Subject: rpms/php-eaccelerator/devel php-eaccelerator.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501281622.j0SGMss0023916@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv23903/devel Modified Files: .cvsignore sources Added Files: php-eaccelerator.spec Log Message: auto-import php-eaccelerator-4.3.10_0.9.2a-1 on branch devel from php-eaccelerator-4.3.10_0.9.2a-1.src.rpm --- NEW FILE php-eaccelerator.spec --- %define php_extdir %(php-config --extension-dir 2>/dev/null || echo /usr/lib/php4) %{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo 4.3.10)} %define module_version 0.9.2a Summary: PHP accelerator, optimizer, encoder and dynamic content cacher Name: php-eaccelerator Version: %{php_version}_%{module_version} Release: 1 License: GPL Group: Development/Languages URL: http://eaccelerator.sourceforge.net/ Source: http://dl.sf.net/eaccelerator/eaccelerator-%{module_version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: php = %{php_version} Provides: php-zend_extension Conflicts: php-mmcache BuildRequires: php, php-devel # Required by phpize BuildRequires: autoconf, automake, libtool, gcc-c++ %description eAccelerator is a further development of the MMCache PHP Accelerator & Encoder. It increases performance of PHP scripts by caching them in compiled state, so that the overhead of compiling is almost completely eliminated. %prep %setup -n eaccelerator %build phpize %configure %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} %{__make} install INSTALL_ROOT=%{buildroot} # The cache directory where pre-compiled files will reside %{__mkdir_p} %{buildroot}%{_localstatedir}/cache/php-eaccelerator # Drop in the bit of configuration %{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d %{__cat} > %{buildroot}%{_sysconfdir}/php.d/eaccelerator.ini << 'EOF' ; Enable eAccelerator extension module zend_extension = %{php_extdir}/eaccelerator.so ; Options for the eAccelerator module eaccelerator.cache_dir = %{_localstatedir}/cache/php-eaccelerator eaccelerator.shm_size = 0 eaccelerator.enable = 1 eaccelerator.optimizer = 1 eaccelerator.check_mtime = 1 eaccelerator.filter = "" eaccelerator.shm_max = 0 eaccelerator.shm_ttl = 3600 eaccelerator.shm_prune_period = 0 eaccelerator.shm_only = 0 eaccelerator.compress = 1 eaccelerator.compress_level = 9 eaccelerator.debug = 0 EOF %clean %{__rm} -rf %{buildroot} %files %defattr(-, root, root, 0755) %doc AUTHORS ChangeLog COPYING NEWS README* %doc eaccelerator.ini *.php %config(noreplace) %{_sysconfdir}/php.d/eaccelerator.ini %{php_extdir}/eaccelerator.so %attr(0750, apache, apache) %{_localstatedir}/cache/php-eaccelerator %changelog * Tue Jan 11 2005 Matthias Saou 4.x.x_0.9.2a-0 - Initial RPM release based on the php-mmcache spec file. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Jan 2005 16:22:16 -0000 1.1 +++ .cvsignore 28 Jan 2005 16:22:52 -0000 1.2 @@ -0,0 +1 @@ +eaccelerator-0.9.2a.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Jan 2005 16:22:16 -0000 1.1 +++ sources 28 Jan 2005 16:22:52 -0000 1.2 @@ -0,0 +1 @@ +e9059ebd49f14835534a1d96a97ababd eaccelerator-0.9.2a.tar.gz From fedora-extras-commits at redhat.com Fri Jan 28 16:29:17 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:29:17 -0500 Subject: rpms/SDL_gfx - New directory Message-ID: <200501281629.j0SGTHpB024041@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/SDL_gfx In directory cvs.fedora.redhat.com:/tmp/cvs-serv24034/SDL_gfx Log Message: Directory /cvs/extras/rpms/SDL_gfx added to the repository From fedora-extras-commits at redhat.com Fri Jan 28 16:29:17 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:29:17 -0500 Subject: rpms/SDL_gfx/devel - New directory Message-ID: <200501281629.j0SGTHcS024044@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/SDL_gfx/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24034/SDL_gfx/devel Log Message: Directory /cvs/extras/rpms/SDL_gfx/devel added to the repository From fedora-extras-commits at redhat.com Fri Jan 28 16:29:34 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:29:34 -0500 Subject: rpms/SDL_gfx Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501281629.j0SGTYxG024103@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/SDL_gfx In directory cvs.fedora.redhat.com:/tmp/cvs-serv24094 Added Files: Makefile import.log Log Message: Setup of module SDL_gfx --- NEW FILE Makefile --- # Top level Makefile for module SDL_gfx all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 28 16:29:34 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:29:34 -0500 Subject: rpms/SDL_gfx/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501281629.j0SGTYwv024106@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/SDL_gfx/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24094/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module SDL_gfx --- NEW 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 Jan 28 16:30:10 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:30:10 -0500 Subject: rpms/SDL_gfx import.log,1.1,1.2 Message-ID: <200501281630.j0SGUAYW024199@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/SDL_gfx In directory cvs.fedora.redhat.com:/tmp/cvs-serv24190 Modified Files: import.log Log Message: auto-import SDL_gfx-2.0.13-1 on branch devel from SDL_gfx-2.0.13-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/SDL_gfx/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 Jan 2005 16:29:32 -0000 1.1 +++ import.log 28 Jan 2005 16:30:08 -0000 1.2 @@ -0,0 +1 @@ +SDL_gfx-2_0_13-1:HEAD:SDL_gfx-2.0.13-1.src.rpm:1106929802 From fedora-extras-commits at redhat.com Fri Jan 28 16:30:10 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:30:10 -0500 Subject: rpms/SDL_gfx/devel SDL_gfx.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501281630.j0SGUASn024203@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/SDL_gfx/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24190/devel Modified Files: .cvsignore sources Added Files: SDL_gfx.spec Log Message: auto-import SDL_gfx-2.0.13-1 on branch devel from SDL_gfx-2.0.13-1.src.rpm --- NEW FILE SDL_gfx.spec --- Summary: Graphic primitives, rotozoomer, framerate control and image filters Name: SDL_gfx Version: 2.0.13 Release: 1 License: LGPL Group: System Environment/Libraries URL: http://www.ferzkopp.net/~aschiffler/Software/SDL_gfx-2.0/ Source: http://www.ferzkopp.net/~aschiffler/Software/SDL_gfx-2.0/SDL_gfx-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: SDL-devel, gcc-c++, automake, autoconf, perl %description The SDL_gfx library offers several components: Graphic Primitives, Rotozoomer, Framerate control, and MMX image filters. The Primitives component provides basic drawing routines: pixels, hlines, vlines, lines, aa-lines, rectangles, circles, ellipses, trigons, polygons, Bezier curves, and an 8x8 pixmap font for drawing onto any SDL Surface. Full alpha blending, hardware surface locking, and all surface depths are supported. The Rotozoomer can use interpolation for high quality output. %package devel Summary: Header files and static libraries for SDL_gfx Group: Development/Libraries Requires: %{name} = %{version}, SDL-devel %description devel This package contains the header files and static libraries for SDL_gfx. If you want to develop programs using SDL_gfx, you will need to install this package. %prep %setup %build %configure \ %ifnarch %{ix86} --disable-mmx %endif # Buildtools have problems even when -j1 is added %{__make} #%{?_smp_mflags} %install %{__rm} -rf %{buildroot} %makeinstall %clean %{__rm} -rf %{buildroot} %post /sbin/ldconfig %postun /sbin/ldconfig %files %defattr(-, root, root, 0755) %doc NEWS LICENSE README AUTHORS COPYING %{_libdir}/lib*.so.* %files devel %defattr(-, root, root, 0755) %{_libdir}/*.a %{_includedir}/SDL/*.h %exclude %{_libdir}/*.la %{_libdir}/*.so %changelog * Fri Jan 28 2005 Matthias Saou 2.0.13-1 - Initial Extras import, minor spec tweaks. * Tue Dec 21 2004 Dries Verachtert 2.0.13-1 - Updated to release 2.0.13 and removed the patch (has been applied upstream) * Thu Nov 11 2004 Matthias Saou 2.0.12-3 - Explicitly disable mmx for non-ix86 to fix build on x86_64. * Fri Oct 22 2004 Dries Verachtert 2.0.12-3 - fixed some buildrequirements so the correct version of libSDL_gfx.so can be found in the list of provides. * Fri Oct 22 2004 Dries Verachtert 2.0.12-2 - rebuild * Wed Sep 01 2004 Dries Verachtert 2.0.12-1 - Update to version 2.0.12. * Mon Apr 26 2004 Dries Verachtert 2.0.10-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/SDL_gfx/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Jan 2005 16:29:32 -0000 1.1 +++ .cvsignore 28 Jan 2005 16:30:08 -0000 1.2 @@ -0,0 +1 @@ +SDL_gfx-2.0.13.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/SDL_gfx/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Jan 2005 16:29:32 -0000 1.1 +++ sources 28 Jan 2005 16:30:08 -0000 1.2 @@ -0,0 +1 @@ +b1ce778232db0b1979695f0a5a945a13 SDL_gfx-2.0.13.tar.gz From fedora-extras-commits at redhat.com Fri Jan 28 16:39:20 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:39:20 -0500 Subject: rpms/Gtk-Perl - New directory Message-ID: <200501281639.j0SGdKVF024319@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/Gtk-Perl In directory cvs.fedora.redhat.com:/tmp/cvs-serv24312/Gtk-Perl Log Message: Directory /cvs/extras/rpms/Gtk-Perl added to the repository From fedora-extras-commits at redhat.com Fri Jan 28 16:39:21 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:39:21 -0500 Subject: rpms/Gtk-Perl/devel - New directory Message-ID: <200501281639.j0SGdL7I024322@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/Gtk-Perl/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24312/Gtk-Perl/devel Log Message: Directory /cvs/extras/rpms/Gtk-Perl/devel added to the repository From fedora-extras-commits at redhat.com Fri Jan 28 16:39:38 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:39:38 -0500 Subject: rpms/Gtk-Perl Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501281639.j0SGdcrL024381@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/Gtk-Perl In directory cvs.fedora.redhat.com:/tmp/cvs-serv24372 Added Files: Makefile import.log Log Message: Setup of module Gtk-Perl --- NEW FILE Makefile --- # Top level Makefile for module Gtk-Perl all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Jan 28 16:39:38 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:39:38 -0500 Subject: rpms/Gtk-Perl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501281639.j0SGdcmx024384@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/Gtk-Perl/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24372/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module Gtk-Perl --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jan 28 16:40:17 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:40:17 -0500 Subject: rpms/Gtk-Perl/devel Gtk-Perl.spec, NONE, 1.1 filter-depends.sh, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501281640.j0SGeHmk024487@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/Gtk-Perl/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24474/devel Modified Files: .cvsignore sources Added Files: Gtk-Perl.spec filter-depends.sh Log Message: auto-import Gtk-Perl-0.7008-37 on branch devel from Gtk-Perl-0.7008-37.src.rpm --- NEW FILE Gtk-Perl.spec --- %define _use_internal_dependency_generator 0 Summary: Perl extensions for GTK+ (the Gimp ToolKit) Name: Gtk-Perl Version: 0.7008 Release: 37 License: LGPL Group: System Environment/Libraries URL: http://www.gtkperl.org/ Source: http://www.gtkperl.org/Gtk-Perl-%{version}.tar.gz Source10: filter-depends.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gtk+-devel, gdk-pixbuf-devel, libglade-devel BuildRequires: gnome-libs-devel, Mesa-devel BuildRequires: gtkhtml-devel, gal-devel, perl-XML-Parser # Internal perl provides not caught by the find-provides Provides: perl(Gnome::Applet::Types) Provides: perl(Gtk::GLArea::Types) Provides: perl(Gtk::Gdk::Pixbuf::Types) Provides: perl(Gtk::GladeXML::Types) Provides: perl(Gtk::XmHTML::Types) %define __find_requires %{SOURCE10} Obsoletes: gtk+-perl %description This package includes Perl extensions for GTK+ (the Gimp ToolKit), a library used for creating graphical user interfaces for the X Window System. The extensions provided in this package allow you to write graphical interfaces using Perl and GTK+. If you install this package, you will need to also have Perl and GTK+ installed. %prep %setup # copied from mandrake srpm # fix for new MakeMaker (ie new perl 5.8.0) %{__perl} -pi -e '/CCCMD/ && s|/m;|/mg;|' */Makefile.PL %build CFLAGS="%{optflags}" %{__perl} Makefile.PL \ PREFIX=%{buildroot}%{_prefix} \ INSTALLDIRS=vendor \ --without-guessing %{__make} %{?_smp_mflags} for dir in GdkImlib GdkPixbuf Glade Gnome GtkXmHTML ; do pushd ${dir} CFLAGS="%{optflags}" %{__perl} Makefile.PL \ PREFIX=%{buildroot}%{_prefix} \ INSTALLDIRS=vendor %{__make} %{?_smp_mflags} popd done %install %{__rm} -rf %{buildroot} %{__make} install \ VENDORPREFIX=%{buildroot}%{_prefix} \ INSTALLDIRS=vendor for dir in GdkImlib GdkPixbuf Glade Gnome GtkXmHTML ; do pushd ${dir} %{__make} install \ VENDORPREFIX=%{buildroot}%{_prefix} \ INSTALLDIRS=vendor popd done ### Clean up buildroot %{__rm} -rf %{buildroot}%{_libdir}/perl5/*/*-linux-thread-multi/ %{__rm} -f `find %{buildroot}%{_libdir}/perl5/vendor_perl/*/*-linux*/ \ -name .packlist -o -name '*.bs'` %clean %{__rm} -rf %{buildroot} %files %defattr(-, root, root, 0755) %doc ChangeLog NOTES README VERSIONS %{_libdir}/perl5/vendor_perl/*/*-linux*/Gnome/ %{_libdir}/perl5/vendor_perl/*/*-linux*/Gtk/ %{_libdir}/perl5/vendor_perl/*/*-linux*/Gtk.pm %{_libdir}/perl5/vendor_perl/*/*-linux*/Gnome.pm %{_libdir}/perl5/vendor_perl/*/*-linux*/auto/Gnome/ %{_libdir}/perl5/vendor_perl/*/*-linux*/auto/Gtk/ %{_mandir}/man?/* %changelog * Thu Nov 4 2004 Matthias Saou 0.7008-36 - Take over where Red Hat left off : http://www.redhat.com/archives/fedora-devel-list/2004-August/msg00455.html - Major spec file cleanup. * Tue Mar 02 2004 Elliot Lee - rebuilt * Fri Feb 13 2004 Elliot Lee - rebuilt * Tue Jun 17 2003 Chip Turner 0.7008-35 - rebuild * Mon Jan 27 2003 Chip Turner - version bump and rebuild * Sat Dec 14 2002 Chip Turner - don't use internal rpm dep generator * Wed Nov 20 2002 Chip Turner - rebuild * Thu Aug 15 2002 Chip Turner - fix for perl 5.8.0 - filter out perl(XML::Writer) dependency * Tue Aug 6 2002 Chip Turner - automated release bump and build * Sat Jan 26 2002 Jeff Johnson - added perl provides. * Wed Jan 09 2002 Tim Powers - automated rebuild * Fri Dec 14 2001 Trond Eivind Glomsr?d 0.7008-4 - Don't hardcode 5.6.0 * Thu Aug 30 2001 Trond Eivind Glomsr?d 0.7008-3 - remove *::reference man pages, as we don't ship all the modules the package wants do build them (#52851) * Tue Jul 31 2001 Trond Eivind Glomsr?d - More BuildRequires * Mon Jul 23 2001 Trond Eivind Glomsr?d - Use %%{_tmppath} - 0.7008 - Update URL and file location - s/Copyright/License/ - add more buildrequires (#49784) * Thu Jul 5 2001 Tim Powers - fixed file list so that we own the dirs we need to - remove perl-temp-files * Mon May 21 2001 Tim Powers - rebuilt against newer gtk+ libs * Thu Jan 11 2001 Tim Powers - excludearched ia64 * Sun Dec 10 2000 Tim Powers - built the added modules for bug 22013 since he uses that stuff. * Mon Nov 20 2000 Tim Powers - rebuilt to fix bad dir perms * Fri Nov 10 2000 Tim Powers - updated to 0.7004 - added docs * Mon Jul 24 2000 Prospector - rebuilt * Mon Jul 17 2000 Tim Powers - added defattr * Mon Jul 10 2000 Tim Powers - rebuilt * Mon Jul 03 2000 Prospector - automatic rebuild * Mon May 22 2000 Tim Powers - updated to 0.7 - built for 7.0 * Tue Dec 21 1999 Tim Powers - updated to 0.6123 - built for 6.2 * Fri Jun 25 1999 Tim Powers - rebuilt for 6.1 * Mon May 10 1999 Cristian Gafton - version 0.5121 * Tue Dec 02 1998 Michael Maher - updated to version 0.4 * Fri Oct 08 1998 Michael Maher - cleaned up spec, built for 5.2 powertools. - added buildroot * Tue Jul 14 1998 The Rasterman - Made it rebuild on multiple architectures (still linux only tho) - this NEEDS to be buildrooted. not willign to do that quite yet. * Fri Jul 10 1998 Jeff Carr - Turned of -O2 on the ppc version - I'm not sure about the LGPL part --- NEW FILE filter-depends.sh --- #!/bin/sh /usr/lib/rpm/find-requires.perl $* | grep -v HTTP::GHTTP | grep -v OpenGL | grep -v XML::Writer Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/Gtk-Perl/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Jan 2005 16:39:36 -0000 1.1 +++ .cvsignore 28 Jan 2005 16:40:15 -0000 1.2 @@ -0,0 +1 @@ +Gtk-Perl-0.7008.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/Gtk-Perl/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Jan 2005 16:39:36 -0000 1.1 +++ sources 28 Jan 2005 16:40:15 -0000 1.2 @@ -0,0 +1 @@ +b499abb5db7794f200abbf07879dd65d Gtk-Perl-0.7008.tar.gz From fedora-extras-commits at redhat.com Fri Jan 28 16:40:17 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:40:17 -0500 Subject: rpms/Gtk-Perl import.log,1.1,1.2 Message-ID: <200501281640.j0SGeHx5024484@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/Gtk-Perl In directory cvs.fedora.redhat.com:/tmp/cvs-serv24474 Modified Files: import.log Log Message: auto-import Gtk-Perl-0.7008-37 on branch devel from Gtk-Perl-0.7008-37.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/Gtk-Perl/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 Jan 2005 16:39:36 -0000 1.1 +++ import.log 28 Jan 2005 16:40:15 -0000 1.2 @@ -0,0 +1 @@ +Gtk-Perl-0_7008-37:HEAD:Gtk-Perl-0.7008-37.src.rpm:1106930408 From fedora-extras-commits at redhat.com Fri Jan 28 16:42:56 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:42:56 -0500 Subject: rpms/perl-libintl - New directory Message-ID: <200501281642.j0SGgu0M024601@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/perl-libintl In directory cvs.fedora.redhat.com:/tmp/cvs-serv24594/perl-libintl Log Message: Directory /cvs/extras/rpms/perl-libintl added to the repository From fedora-extras-commits at redhat.com Fri Jan 28 16:42:56 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:42:56 -0500 Subject: rpms/perl-libintl/devel - New directory Message-ID: <200501281642.j0SGgug9024604@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/perl-libintl/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24594/perl-libintl/devel Log Message: Directory /cvs/extras/rpms/perl-libintl/devel added to the repository From fedora-extras-commits at redhat.com Fri Jan 28 16:43:12 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:43:12 -0500 Subject: rpms/perl-libintl Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501281643.j0SGhCjv024663@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/perl-libintl In directory cvs.fedora.redhat.com:/tmp/cvs-serv24654 Added Files: Makefile import.log Log Message: Setup of module perl-libintl --- NEW FILE Makefile --- # Top level Makefile for module perl-libintl all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 28 16:43:12 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:43:12 -0500 Subject: rpms/perl-libintl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501281643.j0SGhCgI024666@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/perl-libintl/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24654/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-libintl --- NEW 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 Jan 28 16:43:47 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:43:47 -0500 Subject: rpms/perl-libintl import.log,1.1,1.2 Message-ID: <200501281643.j0SGhl94024760@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/perl-libintl In directory cvs.fedora.redhat.com:/tmp/cvs-serv24750 Modified Files: import.log Log Message: auto-import perl-libintl-1.11-2 on branch devel from perl-libintl-1.11-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-libintl/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 Jan 2005 16:43:10 -0000 1.1 +++ import.log 28 Jan 2005 16:43:45 -0000 1.2 @@ -0,0 +1 @@ +perl-libintl-1_11-2:HEAD:perl-libintl-1.11-2.src.rpm:1106930619 From fedora-extras-commits at redhat.com Fri Jan 28 16:43:47 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:43:47 -0500 Subject: rpms/perl-libintl/devel perl-libintl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501281643.j0SGhlwd024764@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/perl-libintl/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24750/devel Modified Files: .cvsignore sources Added Files: perl-libintl.spec Log Message: auto-import perl-libintl-1.11-2 on branch devel from perl-libintl-1.11-2.src.rpm --- NEW FILE perl-libintl.spec --- %define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib) %define perl_vendorarch %(eval "`perl -V:installvendorarch`"; echo $installvendorarch) %define real_name libintl-perl Summary: Internationalization library for Perl, compatible with gettext Name: perl-libintl Version: 1.11 Release: 2 License: LGPL Group: Applications/CPAN URL: http://search.cpan.org/dist/libintl-perl/ Source: http://search.cpan.org/CPAN/authors/id/G/GU/GUIDO/libintl-perl-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl Provides: perl-libintl-perl = %{version}-%{release} Provides: perl(Locale::gettext_xs) BuildArch: noarch %description The package libintl-perl is an internationalization library for Perl that aims to be compatible with the Uniforum message translations system as implemented for example in GNU gettext. %prep %setup -n libintl-perl-%{version} %build %{__perl} Makefile.PL \ PREFIX="%{buildroot}%{_prefix}" \ INSTALLDIRS="vendor" %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} %makeinstall ### Clean up buildroot %{__rm} -rf %{buildroot}%{perl_archlib} \ %{buildroot}%{perl_vendorarch} %clean %{__rm} -rf %{buildroot} %files %defattr(-, root, root, 0755) %doc ChangeLog COPYING* NEWS README THANKS TODO %{perl_vendorlib}/Locale/ %{_mandir}/man?/* %changelog * Tue Nov 9 2004 Matthias Saou 1.11-2 - Fix : Added perl(Locale::gettext_xs) provides. * Thu Nov 4 2004 Matthias Saou 1.11-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-libintl/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Jan 2005 16:43:10 -0000 1.1 +++ .cvsignore 28 Jan 2005 16:43:45 -0000 1.2 @@ -0,0 +1 @@ +libintl-perl-1.11.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-libintl/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Jan 2005 16:43:10 -0000 1.1 +++ sources 28 Jan 2005 16:43:45 -0000 1.2 @@ -0,0 +1 @@ +091e05542e36f030c785f2919f05b73f libintl-perl-1.11.tar.gz From fedora-extras-commits at redhat.com Fri Jan 28 16:44:43 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:44:43 -0500 Subject: rpms/liboil - New directory Message-ID: <200501281644.j0SGihDG024876@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/liboil In directory cvs.fedora.redhat.com:/tmp/cvs-serv24869/liboil Log Message: Directory /cvs/extras/rpms/liboil added to the repository From fedora-extras-commits at redhat.com Fri Jan 28 16:44:43 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:44:43 -0500 Subject: rpms/liboil/devel - New directory Message-ID: <200501281644.j0SGihV5024879@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/liboil/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24869/liboil/devel Log Message: Directory /cvs/extras/rpms/liboil/devel added to the repository From fedora-extras-commits at redhat.com Fri Jan 28 16:44:55 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:44:55 -0500 Subject: rpms/liboil Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501281644.j0SGitFu024938@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/liboil In directory cvs.fedora.redhat.com:/tmp/cvs-serv24929 Added Files: Makefile import.log Log Message: Setup of module liboil --- NEW FILE Makefile --- # Top level Makefile for module liboil all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 28 16:44:55 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:44:55 -0500 Subject: rpms/liboil/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501281644.j0SGituU024941@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/liboil/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24929/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module liboil --- NEW 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 Jan 28 16:45:31 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:45:31 -0500 Subject: rpms/liboil import.log,1.1,1.2 Message-ID: <200501281645.j0SGjVJd025036@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/liboil In directory cvs.fedora.redhat.com:/tmp/cvs-serv25027 Modified Files: import.log Log Message: auto-import liboil-0.3.0-1 on branch devel from liboil-0.3.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/liboil/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 Jan 2005 16:44:53 -0000 1.1 +++ import.log 28 Jan 2005 16:45:29 -0000 1.2 @@ -0,0 +1 @@ +liboil-0_3_0-1:HEAD:liboil-0.3.0-1.src.rpm:1106930722 From fedora-extras-commits at redhat.com Fri Jan 28 16:45:31 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:45:31 -0500 Subject: rpms/liboil/devel liboil.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501281645.j0SGjVJg025040@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/liboil/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25027/devel Modified Files: .cvsignore sources Added Files: liboil.spec Log Message: auto-import liboil-0.3.0-1 on branch devel from liboil-0.3.0-1.src.rpm --- NEW FILE liboil.spec --- Summary: Library of Optimized Inner Loops, CPU optimized functions Name: liboil Version: 0.3.0 Release: 1 License: LGPL Group: System Environment/Libraries URL: http://www.schleef.org/liboil/ Source: http://www.schleef.org/liboil/download/liboil-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: glib2-devel, gcc-c++ %description Liboil is a library of simple functions that are optimized for various CPUs. These functions are generally loops implementing simple algorithms, such as converting an array of N integers to floating-poing numbers or multiplying and summing an array of N numbers. Clearly such functions are candidates for significant optimization using various techniques, especially by using extended instructions provided by modern CPUs (Altivec, MMX, SSE, etc.). %package devel Summary: Development files and static library for liboil Group: Development/Libraries Requires: %{name} = %{version}, pkgconfig %description devel Liboil is a library of simple functions that are optimized for various CPUs. These functions are generally loops implementing simple algorithms, such as converting an array of N integers to floating-poing numbers or multiplying and summing an array of N numbers. Clearly such functions are candidates for significant optimization using various techniques, especially by using extended instructions provided by modern CPUs (Altivec, MMX, SSE, etc.). %prep %setup %build %configure %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} %makeinstall %clean %{__rm} -rf %{buildroot} %post /sbin/ldconfig %postun /sbin/ldconfig %files %defattr(-, root, root, 0755) %doc ChangeLog %{_libdir}/*.so.* %files devel %defattr(-, root, root, 0755) %{_includedir}/* %{_libdir}/*.a %exclude %{_libdir}/*.la %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %changelog * Fri Jan 28 2005 Matthias Saou 0.3.0-1 - Update to 0.3.0. * Wed Nov 24 2004 Matthias Saou 0.2.2-1 - Update to 0.2.2. * Thu Nov 4 2004 Matthias Saou 0.2.0-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liboil/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Jan 2005 16:44:53 -0000 1.1 +++ .cvsignore 28 Jan 2005 16:45:29 -0000 1.2 @@ -0,0 +1 @@ +liboil-0.3.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/liboil/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Jan 2005 16:44:53 -0000 1.1 +++ sources 28 Jan 2005 16:45:29 -0000 1.2 @@ -0,0 +1 @@ +db1dc6b0dc1263a99075d5e34725636d liboil-0.3.0.tar.gz From fedora-extras-commits at redhat.com Fri Jan 28 17:21:43 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 28 Jan 2005 12:21:43 -0500 Subject: rpms/libgnomemm26/devel libgnomemm.spec,1.2,1.3 sources,1.2,1.3 Message-ID: <200501281721.j0SHLhBc025866@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libgnomemm26/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25860 Modified Files: libgnomemm.spec sources Log Message: Merge patches from Thorsten. Index: libgnomemm.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomemm26/devel/libgnomemm.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libgnomemm.spec 10 Dec 2004 22:03:05 -0000 1.2 +++ libgnomemm.spec 28 Jan 2005 17:21:41 -0000 1.3 @@ -1,6 +1,6 @@ Name: libgnomemm26 Version: 2.6.0 -Release: 1 +Release: 2 Epoch: 0 Summary: A C++ interface for Gnome libs (a GUI library for X). @@ -8,6 +8,7 @@ License: LGPL URL: http://gtkmm.sourceforge.net/ Source0: http://ftp.gnome.org/pub/GNOME/sources/libgnomemm/2.6/libgnomemm-%{version}.tar.bz2 +Patch0: libgnomemm-2.6.0-autoreconf.patch.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -36,6 +37,10 @@ %prep %setup -q -n libgnomemm-%{version} +%ifarch x86_64 +# Patch was build after: aclocal -I scripts && automake -c -f && autoconf && libtoolize --copy --force +%patch0 -p1 +%endif %build @@ -76,6 +81,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Thu Jan 27 2005 Thorsten Leemhuis - 2.6.0-2 +- Add autoreconf patch; fixes build on x86_64 + * Mon Jun 27 2004 Denis Leroy - 0:2.6.0-0.fdr.1 - Upgrade to 2.6.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgnomemm26/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:44:16 -0000 1.2 +++ sources 28 Jan 2005 17:21:41 -0000 1.3 @@ -1 +1,2 @@ 684a11aa4726e4f9b148866d1662fc24 libgnomemm-2.6.0.tar.bz2 +f2aa1d551aebdf2de0fda18c7d789caa libgnomemm-2.6.0-autoreconf.patch.bz2 From fedora-extras-commits at redhat.com Fri Jan 28 17:36:47 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 28 Jan 2005 12:36:47 -0500 Subject: rpms/perl-MLDBM/devel perl-MLDBM.spec,1.1,1.2 Message-ID: <200501281736.j0SHaliT025936@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/perl-MLDBM/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25929 Modified Files: perl-MLDBM.spec Log Message: Fix release number, #146430, from Jose. Index: perl-MLDBM.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MLDBM/devel/perl-MLDBM.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-MLDBM.spec 11 Dec 2004 16:03:28 -0000 1.1 +++ perl-MLDBM.spec 28 Jan 2005 17:36:45 -0000 1.2 @@ -2,7 +2,7 @@ Name: perl-MLDBM Version: 2.01 -Release: 0.fdr.1.2 +Release: 1 Epoch: 0 Summary: Store multi-level hash structure in single level tied hash From fedora-extras-commits at redhat.com Fri Jan 28 17:38:30 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 28 Jan 2005 12:38:30 -0500 Subject: rpms/libgnomeuimm26/devel libgnomeuimm.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200501281738.j0SHcU2p025978@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libgnomeuimm26/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25972 Modified Files: libgnomeuimm.spec sources Log Message: Merge patches from Thorsten. Index: libgnomeuimm.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomeuimm26/devel/libgnomeuimm.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libgnomeuimm.spec 10 Dec 2004 22:03:05 -0000 1.2 +++ libgnomeuimm.spec 28 Jan 2005 17:38:28 -0000 1.3 @@ -1,6 +1,6 @@ Name: libgnomeuimm26 Version: 2.6.0 -Release: 1 +Release: 2 Epoch: 0 Summary: A C++ interface for Gnome libs (a GUI library for X). @@ -8,6 +8,7 @@ License: LGPL URL: http://gtkmm.sourceforge.net/ Source0: http://ftp.gnome.org/pub/GNOME/sources/libgnomeuimm/2.6/libgnomeuimm-%{version}.tar.bz2 +Patch0: libgnomeuimm-2.6.0-autoreconf.patch.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -44,6 +45,11 @@ %prep %setup -q -n libgnomeuimm-%{version} +%ifarch x86_64 +# Patch was build after: +#aclocal -I scripts && automake -c -f && autoconf && libtoolize --copy --force +%patch0 -p1 +%endif %build @@ -83,6 +89,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Thu Jan 27 2005 Thorsten Leemhuis - 2.6.0-2 +- Add autoreconf patch; fixes build on x86_64 + * Mon Jun 27 2004 Denis Leroy - 0:2.6.0-0.fdr.1 - Upgrade to 2.6.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgnomeuimm26/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:44:19 -0000 1.2 +++ sources 28 Jan 2005 17:38:28 -0000 1.3 @@ -1 +1,2 @@ 88cef74f116ba3272d1cec46f6566d85 libgnomeuimm-2.6.0.tar.bz2 +38304421cb8ee4b099e60996cf6ca84d libgnomeuimm-2.6.0-autoreconf.patch.bz2 From fedora-extras-commits at redhat.com Fri Jan 28 21:13:11 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 28 Jan 2005 16:13:11 -0500 Subject: rpms/apt/devel apt.spec,1.6,1.7 default.conf,1.3,1.4 Message-ID: <200501282113.j0SLDBoc029222@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/apt/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv29216 Modified Files: apt.spec default.conf Log Message: Allow-Duplicated += kernel-xen*, kernel-*-devel. Index: apt.spec =================================================================== RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- apt.spec 23 Jan 2005 18:22:45 -0000 1.6 +++ apt.spec 28 Jan 2005 21:13:08 -0000 1.7 @@ -17,7 +17,7 @@ Summary: Debian's Advanced Packaging Tool with RPM support. Name: apt Version: 0.5.15cnc6 -Release: 13.%{svnver} +Release: 14.%{svnver} Epoch: 0 Group: System Environment/Base URL: https://moin.conectiva.com.br/AptRpm @@ -360,6 +360,10 @@ %changelog +* Fri Jan 28 2005 Ville Skytt?? - 0:0.5.15cnc6-14.r362 +- Add xen kernels and more kernel-*-devel variants to Allow-Duplicated in + apt.conf.d/default.conf. + * Sun Jan 23 2005 Ville Skytt?? - 0:0.5.15cnc6-13.r362 - Add kernel-devel to Allow-Duplicated in apt.conf.d/default.conf. Index: default.conf =================================================================== RCS file: /cvs/extras/rpms/apt/devel/default.conf,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- default.conf 23 Jan 2005 18:22:45 -0000 1.3 +++ default.conf 28 Jan 2005 21:13:08 -0000 1.4 @@ -26,9 +26,9 @@ // 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|source|sourcecode|devel))?(-(unsupported-modules))?$"; "^gpg-pubkey$"; }; + Allow-Duplicated { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|xen[0U]))?(-(devel|source(code)?|unsupported-modules))?$"; "^gpg-pubkey$"; }; // XXX: not used currently - //Allow-Duplicated-Upgrade { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|source|sourcecode|devel))?(-(unsupported-modules))?$"; }; + //Allow-Duplicated-Upgrade { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|xen[0U]))?(-(devel|source(code)?|unsupported-modules))?$"; }; // "Upgrade" allow-duplicated packages as well Upgrade-Virtual "true"; // Enable source rebuilds From fedora-extras-commits at redhat.com Sat Jan 29 16:28:32 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 29 Jan 2005 11:28:32 -0500 Subject: rpms/gc import.log,1.5,1.6 Message-ID: <200501291628.j0TGSW8D011277@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gc In directory cvs.fedora.redhat.com:/tmp/cvs-serv11268 Modified Files: import.log Log Message: auto-import gc-6.4-2 on branch devel from gc-6.4-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gc/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 8 Nov 2004 04:22:03 -0000 1.5 +++ import.log 29 Jan 2005 16:28:30 -0000 1.6 @@ -2,3 +2,4 @@ gc-6_3-0_fdr_1_rh90:HEAD:gc-6.3-0.fdr.1.rh90.src.rpm:1099887705 gc-6_3-0_fdr_1_1:HEAD:gc-6.3-0.fdr.1.1.src.rpm:1099887711 gc-6_3-0_fdr_1_2:HEAD:gc-6.3-0.fdr.1.2.src.rpm:1099887723 +gc-6_4-2:HEAD:gc-6.4-2.src.rpm:1107016107 From fedora-extras-commits at redhat.com Sat Jan 29 16:28:32 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 29 Jan 2005 11:28:32 -0500 Subject: rpms/gc/devel gc6.4-opendl.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gc.spec, 1.5, 1.6 sources, 1.3, 1.4 gc-6.3-opendl.patch, 1.1, NONE Message-ID: <200501291628.j0TGSWhB011281@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gc/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv11268/devel Modified Files: .cvsignore gc.spec sources Added Files: gc6.4-opendl.patch Removed Files: gc-6.3-opendl.patch Log Message: auto-import gc-6.4-2 on branch devel from gc-6.4-2.src.rpm gc6.4-opendl.patch: --- NEW FILE gc6.4-opendl.patch --- --- gc6.4/Makefile.am.opendl 2004-12-16 18:27:52.000000000 -0600 +++ gc6.4/Makefile.am 2005-01-10 09:58:12.000000000 -0600 @@ -55,7 +55,7 @@ # Include THREADDLLIBS here to ensure that the correct versions of # linuxthread semaphore functions get linked: -libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) +libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) libgc_la_DEPENDENCIES = @addobjs@ libgc_la_LDFLAGS = -version-info 1:2:0 @@ -65,7 +65,7 @@ sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s libgccpp_la_SOURCES = gc_cpp.cc -libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) +libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) libgccpp_la_LDFLAGS = -version-info 1:2:0 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 test_cpp_SOURCES = tests/test_cpp.cc -test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +test_cpp_LDADD = ./libgc.la ./libgccpp.la TESTS = gctest $(extra_checks) --- gc6.4/Makefile.in.opendl 2004-12-20 20:00:44.000000000 -0600 +++ gc6.4/Makefile.in 2005-01-10 09:59:11.000000000 -0600 @@ -188,7 +188,7 @@ # Include THREADDLLIBS here to ensure that the correct versions of # linuxthread semaphore functions get linked: -libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) +libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) libgc_la_DEPENDENCIES = @addobjs@ libgc_la_LDFLAGS = -version-info 1:2:0 @@ -199,7 +199,7 @@ libgccpp_la_SOURCES = gc_cpp.cc -libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) +libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) libgccpp_la_LDFLAGS = -version-info 1:2:0 AM_CXXFLAGS = @GC_CFLAGS@ @@ -212,9 +212,9 @@ # gctest_OBJECTS = test.o gctest_SOURCES = tests/test.c -gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +gctest_LDADD = ./libgc.la test_cpp_SOURCES = tests/test_cpp.cc -test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +test_cpp_LDADD = ./libgc.la ./libgccpp.la TESTS = gctest $(extra_checks) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gc/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:21:45 -0000 1.3 +++ .cvsignore 29 Jan 2005 16:28:30 -0000 1.4 @@ -1 +1 @@ -gc6.3.tar.gz +gc6.4.tar.gz Index: gc.spec =================================================================== RCS file: /cvs/extras/rpms/gc/devel/gc.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gc.spec 10 Dec 2004 22:03:02 -0000 1.5 +++ gc.spec 29 Jan 2005 16:28:30 -0000 1.6 @@ -1,22 +1,20 @@ # $Id$ -# define to --enable-threads, --enable-parallel-mark -%define threads 1 - -#define beta alpha6 - Summary: C++ Garbage Collector Name: gc Epoch: 0 -Version: 6.3 -Release: 1%{?dist_tag} +Version: 6.4 +# For Extras +Release: 2 +# For kde-redhat +#Release: 0.2%{?dist_tag}.kde Group: System Environment/Libraries License: BSD Url: http://www.hpl.hp.com/personal/Hans_Boehm/gc/ -Source: http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.3.tar.gz +Source: http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.4.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Patch1: gc-6.3-opendl.patch +Patch1: gc6.4-opendl.patch %description @@ -42,7 +40,10 @@ %configure \ --disable-static \ --enable-cplusplus \ - %{?threads: --enable-threads=posix --enable-parallel-mark} + --enable-threads=posix \ +%ifarch %{ix86} + --enable-parallel-mark +%endif make %{?_smp_mflags} @@ -84,6 +85,14 @@ %changelog +* Wed Jan 26 2005 Rex Dieter 0:6.4-2 +- --enable-threads unconditionally +- --enable-parallel-mark only on %%ix86 (#144681) + +* Mon Jan 10 2005 Rex Dieter 0:6.4-1 +- 6.4 +- update opendl patch + * Fri Jul 09 2004 Rex Dieter 0:6.3-0.fdr.1 - 6.3(final) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gc/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:21:45 -0000 1.3 +++ sources 29 Jan 2005 16:28:30 -0000 1.4 @@ -1 +1 @@ -8b37ee18cbeb1dfd1866958e280db871 gc6.3.tar.gz +ef03495e980b834a99c0e27eedaa546e gc6.4.tar.gz --- gc-6.3-opendl.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jan 29 16:42:15 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Sat, 29 Jan 2005 11:42:15 -0500 Subject: devel/irssi irssi.spec,1.4,1.5 Message-ID: <200501291642.j0TGgFtT011375@cvs.fedora.redhat.com> Author: anvil Update of /cvs/extras/devel/irssi In directory cvs.fedora.redhat.com:/tmp/cvs-serv11368 Modified Files: irssi.spec Log Message: irssi.spec: Reduce Perl dir ownership and add MODULE_COMPAT dependency. (#143703) Index: irssi.spec =================================================================== RCS file: /cvs/extras/devel/irssi/irssi.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- irssi.spec 10 Dec 2004 22:03:04 -0000 1.4 +++ irssi.spec 29 Jan 2005 16:42:13 -0000 1.5 @@ -3,7 +3,7 @@ Summary: Modular text mode IRC client with Perl scripting Name: irssi Version: 0.8.9 -Release: 4 +Release: 5 Epoch: 0 License: GPL Group: Applications/Communications @@ -18,6 +18,8 @@ %{?_with_glib1:BuildRequires: glib-devel} %{!?_with_glib1:BuildRequires: glib2-devel} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + # ---------------------------------------------------------------------------- %description @@ -73,10 +75,6 @@ %defattr(-,root,root,-) %doc docs/*.txt docs/*.html AUTHORS COPYING NEWS README TODO convert-replace-trigger.pl %config(noreplace) %{_sysconfdir}/%{name}.conf -%dir %{_libdir}/perl*/* -%dir %(eval "`perl -V:installvendorlib`"; echo $installvendorlib) -%dir %{perl_vendorarch} -%dir %{perl_vendorarch}/auto %{_bindir}/%{name} %{_bindir}/botti %{_datadir}/%{name} @@ -88,6 +86,9 @@ # ---------------------------------------------------------------------------- %changelog +* Fri Dec 24 2004 Michael Schwendt 0:0.8.9-5 +- Reduce Perl dir ownership and add MODULE_COMPAT dependency. + * Fri Apr 2 2004 Dams 0:0.8.9-0.fdr.4 - Rebuilt to use new perl to prevent random segmentation fault at load time From fedora-extras-commits at redhat.com Sat Jan 29 20:37:57 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 15:37:57 -0500 Subject: rpms/rpmlint/devel .cvsignore, 1.3, 1.4 rpmlint-fedora-config, 1.1, 1.2 rpmlint.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200501292037.j0TKbvkM014373@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/rpmlint/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv14367 Modified Files: .cvsignore rpmlint-fedora-config rpmlint.spec sources Log Message: Update to 0.65, improve default config. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rpmlint/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 05:18:56 -0000 1.3 +++ .cvsignore 29 Jan 2005 20:37:55 -0000 1.4 @@ -1 +1 @@ -rpmlint-0.61.tar.bz2 +rpmlint-0.65.tar.bz2 Index: rpmlint-fedora-config =================================================================== RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint-fedora-config,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rpmlint-fedora-config 8 Nov 2004 05:18:23 -0000 1.1 +++ rpmlint-fedora-config 29 Jan 2005 20:37:55 -0000 1.2 @@ -6,12 +6,12 @@ setOption("Vendor", "Fedora Linux") setOption("Distribution", "Fedora Linux") -setOption("ReleaseExtension", "(\d+\.)+fdr\.\d+(\..*)?") +setOption("ReleaseExtension", None) setOption("ValidBuildHost", ".*") setOption("Packager", ".*") setOption("UseVersionInChangeLog", 1) setOption("UseBzip2", 0) -setOption("UseEpoch", 1) +setOption("UseEpoch", 0) setOption("ValidSrcPerms", (0644, )) setOption("ValidGroups", ( "Amusements/Games", @@ -78,5 +78,5 @@ # Output filters addFilter("W: .* source-or-patch-not-[bg]zipped .*") addFilter("E: .* lib-package-without-%mklibname") -addFilter("E: .* no-dependancy (perl|python)-base.*") +addFilter("E: .* no-dependency (perl|python)-base.*") addFilter("W: .* (python|perl5)-naming-policy-not-applied.*") Index: rpmlint.spec =================================================================== RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- rpmlint.spec 10 Dec 2004 22:03:10 -0000 1.6 +++ rpmlint.spec 29 Jan 2005 20:37:55 -0000 1.7 @@ -1,18 +1,18 @@ Name: rpmlint -Version: 0.61 -Release: 2 +Version: 0.65 +Release: 1 Epoch: 0 Summary: RPM correctness checker Group: Development/Tools License: GPL URL: http://people.mandrakesoft.com/~flepied/projects/rpmlint/ -Source0: http://people.mandrakesoft.com/~flepied/projects/rpmlint/dist/rpmlint-0.61.tar.bz2 +Source0: http://people.mandrakesoft.com/~flepied/projects/rpmlint/dist/rpmlint-0.65.tar.bz2 Source1: %{name}-fedora-config BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python >= 0:1.5.2, rpm-python, make, perl +BuildRequires: python >= 0:1.5.2, rpm-python, make, %{__perl} Requires: rpm-python, python >= 0:1.5.2, cpio %description @@ -22,6 +22,8 @@ %prep %setup -q +%{__perl} -pi -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \ + FilesCheck.py I18NCheck.py %build @@ -31,9 +33,10 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT - -# Install Fedora config as the default. -install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config +install -pm 644 rpmlint.bash-completion $RPM_BUILD_ROOT%{_datadir}/rpmlint +install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d +touch $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/rpmlint +install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config # Take care of files that may be generated later. touch $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config{c,o} @@ -56,16 +59,35 @@ rm -rf $RPM_BUILD_ROOT +%triggerin -- bash-completion +if [ ! -e %{_sysconfdir}/bash_completion.d/rpmlint ] ; then + ln -s %{_datadir}/rpmlint/rpmlint.bash-completion \ + %{_sysconfdir}/bash_completion.d/rpmlint +fi + +%triggerun -- bash-completion +[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/rpmlint + + %files -f %{name}-%{version}-files.list %defattr(-,root,root,0755) %doc AUTHORS COPYING ChangeLog README %{_bindir}/rpm* %dir %{_datadir}/rpmlint +%{_datadir}/rpmlint/rpmlint.bash-completion %dir %{_sysconfdir}/rpmlint %config(noreplace) %{_sysconfdir}/rpmlint/config +%ghost %{_sysconfdir}/bash_completion.d/rpmlint %changelog +* Sat Jan 29 2005 Ville Skytt?? - 0:0.65-1 +- Update to 0.65. + +* Sat Jan 1 2005 Ville Skytt?? - 0:0.64-1 +- Update to 0.64. +- Default config tweaks: don't mandate Epochs nor "fdr" in Release. + * Tue Oct 19 2004 Ville Skytt?? - 0:0.61-0.fdr.2 - Requires cpio (bug 2169). Index: sources =================================================================== RCS file: /cvs/extras/rpms/rpmlint/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 05:18:56 -0000 1.3 +++ sources 29 Jan 2005 20:37:55 -0000 1.4 @@ -1 +1 @@ -1e43509038848f1d8256a7ab2efe527b rpmlint-0.61.tar.bz2 +7e238f5121e2451fc1e100a4f13f26f0 rpmlint-0.65.tar.bz2 From fedora-extras-commits at redhat.com Sat Jan 29 21:07:18 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 29 Jan 2005 16:07:18 -0500 Subject: rpms/libsafe/devel libsafe-2.0-16.spec,1.2,1.3 Message-ID: <200501292107.j0TL7IAl015135@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/libsafe/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv15123 Modified Files: libsafe-2.0-16.spec Log Message: ExclusiveArch: i386 Index: libsafe-2.0-16.spec =================================================================== RCS file: /cvs/extras/rpms/libsafe/devel/libsafe-2.0-16.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libsafe-2.0-16.spec 17 Dec 2004 01:38:37 -0000 1.2 +++ libsafe-2.0-16.spec 29 Jan 2005 21:07:16 -0000 1.3 @@ -10,6 +10,7 @@ Patch0: libsafe-2.0-16c.patch URL: http://www.research.avayalabs.com/project/libsafe/index.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +ExclusiveArch: i386 %description The libsafe library protects a process against the exploitation of buffer @@ -87,6 +88,8 @@ rm -f /etc/ld.so.preload.tmp %changelog +* Sat Jan 29 2005 Warren Togami + * Thu Dec 16 2004 Warren Togami 2.0-16c - Patch with Steve Grubb's libsafe-2.0-16c improvements From fedora-extras-commits at redhat.com Sat Jan 29 21:12:55 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 29 Jan 2005 16:12:55 -0500 Subject: rpms/synaptic/devel synaptic.spec,1.6,1.7 Message-ID: <200501292112.j0TLCtAN015193@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/synaptic/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv15180 Modified Files: synaptic.spec Log Message: ExclusiveArch: i386 Index: synaptic.spec =================================================================== RCS file: /cvs/extras/rpms/synaptic/devel/synaptic.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- synaptic.spec 18 Jan 2005 18:31:07 -0000 1.6 +++ synaptic.spec 29 Jan 2005 21:12:53 -0000 1.7 @@ -4,7 +4,7 @@ Summary: Graphical frontend for APT package manager. Name: synaptic Version: 0.55.3 -Release: 1 +Release: 2 License: GPL Group: Applications/System Source: http://savannah.nongnu.org/download/synaptic/synaptic-%{version}.tar.gz @@ -20,6 +20,7 @@ BuildRequires: libstdc++-devel, gettext BuildRequires: xmlto, perl-XML-Parser BuildRequires: scrollkeeper +ExclusiveArch: i386 %description Synaptic is a graphical package management @@ -102,6 +103,9 @@ %{_mandir}/man8/%{name}.8* %changelog +* Sat Jan 29 2005 Warren Togami 0.55.3-2 +- ExclusiveArch: i386 + * Tue Nov 09 2004 Panu Matilainen 0.55.3-1 - update to 0.55.3 From fedora-extras-commits at redhat.com Sat Jan 29 21:19:53 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 29 Jan 2005 16:19:53 -0500 Subject: rpms/apt/devel apt.spec,1.7,1.8 Message-ID: <200501292119.j0TLJrLJ015279@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/apt/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv15263 Modified Files: apt.spec Log Message: also exclude ppc64 Index: apt.spec =================================================================== RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- apt.spec 28 Jan 2005 21:13:08 -0000 1.7 +++ apt.spec 29 Jan 2005 21:19:50 -0000 1.8 @@ -17,12 +17,12 @@ Summary: Debian's Advanced Packaging Tool with RPM support. Name: apt Version: 0.5.15cnc6 -Release: 14.%{svnver} +Release: 15.%{svnver} Epoch: 0 Group: System Environment/Base URL: https://moin.conectiva.com.br/AptRpm License: GPL -ExcludeArch: x86_64 +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.15cnc6.tar.bz2 @@ -360,6 +360,9 @@ %changelog +* Sat Jan 29 2005 Warren Togami - 0:0.5.15cnc6-15.r362 +- ExcludeArch: ppc64 + * Fri Jan 28 2005 Ville Skytt?? - 0:0.5.15cnc6-14.r362 - Add xen kernels and more kernel-*-devel variants to Allow-Duplicated in apt.conf.d/default.conf. From fedora-extras-commits at redhat.com Sat Jan 29 21:20:58 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 29 Jan 2005 16:20:58 -0500 Subject: rpms/synaptic/devel synaptic.spec,1.7,1.8 Message-ID: <200501292120.j0TLKwLA015354@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/synaptic/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv15332 Modified Files: synaptic.spec Log Message: exclude multilib archs instead Index: synaptic.spec =================================================================== RCS file: /cvs/extras/rpms/synaptic/devel/synaptic.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- synaptic.spec 29 Jan 2005 21:12:53 -0000 1.7 +++ synaptic.spec 29 Jan 2005 21:20:56 -0000 1.8 @@ -20,7 +20,7 @@ BuildRequires: libstdc++-devel, gettext BuildRequires: xmlto, perl-XML-Parser BuildRequires: scrollkeeper -ExclusiveArch: i386 +ExcludeArch: x86_64 ppc64 %description Synaptic is a graphical package management @@ -104,7 +104,7 @@ %changelog * Sat Jan 29 2005 Warren Togami 0.55.3-2 -- ExclusiveArch: i386 +- ExcludeArch: x86_64 ppc64 * Tue Nov 09 2004 Panu Matilainen 0.55.3-1 - update to 0.55.3 From fedora-extras-commits at redhat.com Sat Jan 29 21:20:59 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 16:20:59 -0500 Subject: rpms/fontforge/devel fontforge.spec,1.6,1.7 pfaicon.gif,1.1,NONE Message-ID: <200501292120.j0TLKxjo015371@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/fontforge/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv15343 Modified Files: fontforge.spec Removed Files: pfaicon.gif Log Message: Miscellaneous small improvements. Index: fontforge.spec =================================================================== RCS file: /cvs/extras/rpms/fontforge/devel/fontforge.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fontforge.spec 27 Jan 2005 18:19:46 -0000 1.6 +++ fontforge.spec 29 Jan 2005 21:20:57 -0000 1.7 @@ -1,6 +1,6 @@ Name: fontforge Version: 0.0 -Release: 1.20041231 +Release: 2.20041231 Epoch: 0 Summary: An outline and bitmap font editor @@ -10,7 +10,6 @@ Source0: http://dl.sf.net/fontforge/fontforge_full-20041231.tgz Source1: fontforge.desktop Source2: http://dl.sf.net/fontforge/fontforge_htdocs-20041231.tgz -Source3: pfaicon.gif Patch1: fontforge-20040618-docview.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -22,7 +21,6 @@ BuildRequires: libxml2-devel BuildRequires: freetype-devel BuildRequires: XFree86-devel -BuildRequires: ImageMagick BuildRequires: desktop-file-utils BuildRequires: libuninameslist-devel Obsoletes: pfaedit @@ -34,34 +32,40 @@ (Type2) and CID-keyed fonts. %prep -%setup -q -n fontforge-20041231 +%setup -q -n %{name}-20041231 %patch1 -p2 -b .docview mkdir htdocs tar xzf %{SOURCE2} -C htdocs rm -rf htdocs/scripts +chmod 644 htdocs/* mkdir cidmaps tar xzf htdocs/cidmaps.tgz -C cidmaps find . -name "CVS" -type d -print | xargs rm -r +for i in fontforge/fontforge.1 fontforge/sfddiff.1 ; do + iconv -f iso-8859-1 -t utf-8 $i -o $i.utf8 ; mv $i.utf8 $i +done + +sed -i -e 's/-rpath $(libdir)//' fontforge/Makefile*.in + %build %configure --with-regular-link --with-freetype-bytecode=no -# Parallell make not working. +# Parallel make not working. make DOCDIR=%{_docdir}/%{name}-%{version}/htdocs + %install rm -rf $RPM_BUILD_ROOT # make install DESTDIR=$RPM_BUILD_ROOT fails. %makeinstall install -p -m 644 cidmaps/Adobe* $RPM_BUILD_ROOT%{_datadir}/fontforge -rm -f $RPM_BUILD_ROOT%{_libdir}/libgunicode.la $RPM_BUILD_ROOT%{_libdir}/libgdraw.la -rm -f $RPM_BUILD_ROOT%{_libdir}/libgunicode.so $RPM_BUILD_ROOT%{_libdir}/libgdraw.so +rm -f $RPM_BUILD_ROOT%{_libdir}/libg{draw,unicode}.{la,so} -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -convert %{SOURCE3} fontforge.png -install -m 644 fontforge.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ +install -Dpm 644 htdocs/ffanvil32.png \ + $RPM_BUILD_ROOT%{_datadir}/pixmaps/fontforge.png desktop-file-install \ --vendor fedora \ @@ -69,6 +73,8 @@ --add-category X-Fedora \ %{SOURCE1} +chmod -x $RPM_BUILD_ROOT%{_libdir}/pkgconfig/fontforge.pc + %clean rm -rf $RPM_BUILD_ROOT @@ -81,17 +87,24 @@ %files %defattr(-,root,root,-) -%doc AUTHORS INSTALL LICENSE README htdocs +%doc AUTHORS LICENSE htdocs %{_bindir}/* -%{_libdir}/*.so.* +%{_libdir}/libg*.so.* %{_libdir}/pkgconfig/fontforge.pc -%{_datadir}/applications/*.desktop -%{_datadir}/%{name} -%{_datadir}/pixmaps/*.png +%{_datadir}/applications/*fontforge.desktop +%{_datadir}/fontforge +%{_datadir}/pixmaps/fontforge.png %{_mandir}/man1/*.1* %changelog +* Sat Jan 29 2005 Ville Skytt?? - 0:0.0-2.20041231 +- Avoid RPATH. +- Convert man pages to UTF-8. +- Fix pkgconfig and doc file permissions. +- Use updated upstream icon. +- Don't include installation documentation. + * Mon Jan 17 2005 Marius L. J??hndal - 0:0.0-1.20041231 - Updated to 20041231. From fedora-extras-commits at redhat.com Sat Jan 29 22:23:14 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 17:23:14 -0500 Subject: rpms/imlib2 import.log,1.7,1.8 Message-ID: <200501292223.j0TMNE96016195@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/imlib2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv16186 Modified Files: import.log Log Message: auto-import imlib2-1.2.0-0.fdr.4.1 on branch FC-1 from imlib2-1.2.0-0.fdr.4.1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/imlib2/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 8 Nov 2004 04:35:58 -0000 1.7 +++ import.log 29 Jan 2005 22:23:12 -0000 1.8 @@ -4,3 +4,4 @@ imlib2-1_0_6-0_fdr_3_2:HEAD:imlib2-1.0.6-0.fdr.3.2.src.rpm:1099888552 imlib2-1_1_2-0_fdr_1_1:FC-1:imlib2-1.1.2-0.fdr.1.1.src.rpm:1099888555 imlib2-1_1_2-0_fdr_1_2:HEAD:imlib2-1.1.2-0.fdr.1.2.src.rpm:1099888558 +imlib2-1_2_0-0_fdr_4_1:FC-1:imlib2-1.2.0-0.fdr.4.1.src.rpm:1107037385 From fedora-extras-commits at redhat.com Sat Jan 29 22:23:14 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 17:23:14 -0500 Subject: rpms/imlib2/FC-1 imlib2-1.2.0-configure-xlib64.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 imlib2.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200501292223.j0TMNEqR016199@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/imlib2/FC-1 In directory cvs.fedora.redhat.com:/tmp/cvs-serv16186/FC-1 Modified Files: .cvsignore imlib2.spec sources Added Files: imlib2-1.2.0-configure-xlib64.patch Log Message: auto-import imlib2-1.2.0-0.fdr.4.1 on branch FC-1 from imlib2-1.2.0-0.fdr.4.1.src.rpm imlib2-1.2.0-configure-xlib64.patch: --- NEW FILE imlib2-1.2.0-configure-xlib64.patch --- --- configure.old 2005-01-09 18:36:09.314185880 +0100 +++ configure 2005-01-09 18:37:15.840072408 +0100 @@ -20262,7 +20262,7 @@ if test "x$have_x" = "xyes"; then x_dir="/usr/X11R6"; x_cflags="-I"$x_dir"/include" - x_libs="-L"$x_dir"/lib -lX11 -lXext" + x_libs="-L"$x_dir"/lib64 -lX11 -lXext" echo "$as_me:$LINENO: result: enabling X11 support" >&5 echo "${ECHO_T}enabling X11 support" >&6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/imlib2/FC-1/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:35:55 -0000 1.3 +++ .cvsignore 29 Jan 2005 22:23:12 -0000 1.4 @@ -1 +1 @@ -imlib2-1.1.2.tar.gz +imlib2-1.2.0.tar.gz Index: imlib2.spec =================================================================== RCS file: /cvs/extras/rpms/imlib2/FC-1/imlib2.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- imlib2.spec 8 Nov 2004 04:35:55 -0000 1.4 +++ imlib2.spec 29 Jan 2005 22:23:12 -0000 1.5 @@ -1,15 +1,19 @@ Summary: A graphic library for file loading, saving, rendering, and manipulation Name: imlib2 -Version: 1.1.2 -Release: 0.fdr.1.1 +Version: 1.2.0 +Release: 0.fdr.4.1 Epoch: 0 License: BSD Group: System Environment/Libraries URL: http://www.enlightenment.org/pages/imlib2.html Source0: http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz +Patch0: imlib2-1.2.0-configure-xlib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: XFree86-devel libjpeg-devel libpng-devel libtiff-devel BuildRequires: libungif-devel freetype-devel libtool bzip2-devel +%ifarch x86_64 +BuildRequires: perl +%endif %package devel Summary: Development package for %{name} @@ -39,33 +43,45 @@ %prep %setup -q +%ifarch x86_64 +%patch0 -b .patch0 +%endif # ----------------------------------------------------------------------------- %build %configure \ -%ifarch %{ix86} x86_64 ia64 + --x-libraries=%{_prefix}/X11R6/%{_lib} \ + --with-pic \ +%ifarch %{ix86} ia64 --enable-mmx +%else + --disable-mmx +%endif +%ifarch x86_64 +# fix hardcoded rpath im Makefiles on x86_64 due to freetype-config --libs +# returning "-L/usr/lib64 -Wl,--rpath -Wl,/usr/lib64 -lfreetype -lz": +perl -pi.orig -e 's|-Wl,--rpath -Wl,/usr/lib64||g;' Makefile */Makefile */*/Makefile imlib2-config %endif -make %{?_smp_mflags} -make -C demo +make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool # ----------------------------------------------------------------------------- %install rm -rf $RPM_BUILD_ROOT __doc -make install DESTDIR=$RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -C demo +make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool cp -a doc __doc rm -f __doc/Makefile* rm -f \ - $RPM_BUILD_ROOT%{_libdir}/libImlib2.la \ - $RPM_BUILD_ROOT%{_libdir}/imlib2_loaders/*/*.*a \ + $RPM_BUILD_ROOT%{_libdir}/imlib2/{loaders,filters}/*.a \ $RPM_BUILD_ROOT%{_bindir}/{color_spaces,imlib2,*test} +# ship .la files due to a bug in kdelibs (see changelog): +# $RPM_BUILD_ROOT%{_libdir}/libImlib2.la \ + # ----------------------------------------------------------------------------- %clean @@ -79,22 +95,62 @@ %files %defattr(-,root,root,-) %doc COPYING AUTHORS README ChangeLog TODO __doc/* -%{_bindir}/imconvert %{_bindir}/imlib2_view +%{_bindir}/imlib2_bumpmap +%{_bindir}/imlib2_colorspace +%{_bindir}/imlib2_conv +%{_bindir}/imlib2_poly +%{_bindir}/imlib2_show %{_libdir}/libImlib2.so.* -%{_libdir}/imlib2_loaders +%{_datadir}/imlib2/data/ +%dir %{_libdir}/imlib2/filters/ +%{_libdir}/imlib2/filters/*.so +%{_libdir}/imlib2/filters/*.la +%dir %{_libdir}/imlib2/loaders/ +%{_libdir}/imlib2/loaders/*.so +%{_libdir}/imlib2/loaders/*.la %files devel %defattr(-,root,root,-) %{_bindir}/imlib2-config %{_includedir}/Imlib2.h %{_libdir}/libImlib2.a +%{_libdir}/libImlib2.la %{_libdir}/libImlib2.so %{_libdir}/pkgconfig/imlib2.pc # ----------------------------------------------------------------------------- %changelog +* Tue Jan 18 2005 Michael Schwendt - 0:1.2.0-4 +- Make this 1.2.0-0.fdr.4 for FC2 and older. +- Really include libtool archives to fix fedora.us bug #2284. + +* Fri Jan 14 2005 Thorsten Leemhuis - 0:1.2.0-3 +- Move filters and loaders back into main package where they belong + +* Mon Jan 10 2005 Thorsten Leemhuis - 0:1.2.0-2 +- Don't ship *.?.a in {_libdir}/imlib/filters/ and loaders/ + +* Sun Jan 09 2005 Thorsten Leemhuis - 0:1.2.0-1 +- Ship .la files ue to a bug in kdelibs; see + https://bugzilla.fedora.us/show_bug.cgi?id=2284 + http://bugzilla.redhat.com/bugzilla/142244 + http://bugs.kde.org/93359 +- Use make param LIBTOOL=/usr/bin/libtool - fixes hardcoded rpath on x86_64 +- fix hardcoded rpath im Makefiles on x86_64 due to freetype-config --libs + returning "-L/usr/lib64 -Wl,--rpath -Wl,/usr/lib64 -lfreetype -lz" +- Update to 1.2.0 -- fixes several security issues +- remove explicit libdir=_libdir - 1.2.9 does not need it anymore +- removeddemo compile/install; +- use configure param --x-libraries={_prefix}/X11R6/{_lib} and patch to fix + "cannot find -lX11" + +* Thu Dec 30 2004 Thorsten Leemhuis - 0:1.1.2-2 +- Disable mmx on x86_64 (fixes Build error) +- Add explicit libdir=_libdir to make calls to avoid install errors on x86_64 +- Add --with-pic configure option (taken from Matthias Saou's package) + * Sat Sep 25 2004 Ville Skytt?? - 0:1.1.2-0.fdr.1 - Update to 1.1.2, fixes CAN-2004-0802. - Enable MMX on all ix86, x86_64 and ia64, it seems runtime-detected. Index: sources =================================================================== RCS file: /cvs/extras/rpms/imlib2/FC-1/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:35:55 -0000 1.3 +++ sources 29 Jan 2005 22:23:12 -0000 1.4 @@ -1 +1 @@ -3389bad516032c951fda4fe620df0cef imlib2-1.1.2.tar.gz +853fb77100ee3c3ca944f52c892ab49b imlib2-1.2.0.tar.gz From fedora-extras-commits at redhat.com Sat Jan 29 22:24:01 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 17:24:01 -0500 Subject: rpms/imlib2 import.log,1.8,1.9 Message-ID: <200501292224.j0TMO1CU016314@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/imlib2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv16304 Modified Files: import.log Log Message: auto-import imlib2-1.2.0-0.fdr.4.2 on branch FC-2 from imlib2-1.2.0-0.fdr.4.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/imlib2/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 29 Jan 2005 22:23:12 -0000 1.8 +++ import.log 29 Jan 2005 22:23:59 -0000 1.9 @@ -5,3 +5,4 @@ imlib2-1_1_2-0_fdr_1_1:FC-1:imlib2-1.1.2-0.fdr.1.1.src.rpm:1099888555 imlib2-1_1_2-0_fdr_1_2:HEAD:imlib2-1.1.2-0.fdr.1.2.src.rpm:1099888558 imlib2-1_2_0-0_fdr_4_1:FC-1:imlib2-1.2.0-0.fdr.4.1.src.rpm:1107037385 +imlib2-1_2_0-0_fdr_4_2:FC-2:imlib2-1.2.0-0.fdr.4.2.src.rpm:1107037432 From fedora-extras-commits at redhat.com Sat Jan 29 22:24:01 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 17:24:01 -0500 Subject: rpms/imlib2/FC-2 imlib2-1.2.0-configure-xlib64.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 imlib2.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200501292224.j0TMO1bT016318@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/imlib2/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv16304/FC-2 Modified Files: .cvsignore imlib2.spec sources Added Files: imlib2-1.2.0-configure-xlib64.patch Log Message: auto-import imlib2-1.2.0-0.fdr.4.2 on branch FC-2 from imlib2-1.2.0-0.fdr.4.2.src.rpm imlib2-1.2.0-configure-xlib64.patch: --- NEW FILE imlib2-1.2.0-configure-xlib64.patch --- --- configure.old 2005-01-09 18:36:09.314185880 +0100 +++ configure 2005-01-09 18:37:15.840072408 +0100 @@ -20262,7 +20262,7 @@ if test "x$have_x" = "xyes"; then x_dir="/usr/X11R6"; x_cflags="-I"$x_dir"/include" - x_libs="-L"$x_dir"/lib -lX11 -lXext" + x_libs="-L"$x_dir"/lib64 -lX11 -lXext" echo "$as_me:$LINENO: result: enabling X11 support" >&5 echo "${ECHO_T}enabling X11 support" >&6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/imlib2/FC-2/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:35:58 -0000 1.3 +++ .cvsignore 29 Jan 2005 22:23:59 -0000 1.4 @@ -1 +1 @@ -imlib2-1.1.2.tar.gz +imlib2-1.2.0.tar.gz Index: imlib2.spec =================================================================== RCS file: /cvs/extras/rpms/imlib2/FC-2/imlib2.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- imlib2.spec 8 Nov 2004 04:35:58 -0000 1.5 +++ imlib2.spec 29 Jan 2005 22:23:59 -0000 1.6 @@ -1,15 +1,19 @@ Summary: A graphic library for file loading, saving, rendering, and manipulation Name: imlib2 -Version: 1.1.2 -Release: 0.fdr.1.2 +Version: 1.2.0 +Release: 0.fdr.4.2 Epoch: 0 License: BSD Group: System Environment/Libraries URL: http://www.enlightenment.org/pages/imlib2.html Source0: http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz +Patch0: imlib2-1.2.0-configure-xlib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: XFree86-devel libjpeg-devel libpng-devel libtiff-devel BuildRequires: libungif-devel freetype-devel libtool bzip2-devel +%ifarch x86_64 +BuildRequires: perl +%endif %package devel Summary: Development package for %{name} @@ -39,33 +43,45 @@ %prep %setup -q +%ifarch x86_64 +%patch0 -b .patch0 +%endif # ----------------------------------------------------------------------------- %build %configure \ -%ifarch %{ix86} x86_64 ia64 + --x-libraries=%{_prefix}/X11R6/%{_lib} \ + --with-pic \ +%ifarch %{ix86} ia64 --enable-mmx +%else + --disable-mmx +%endif +%ifarch x86_64 +# fix hardcoded rpath im Makefiles on x86_64 due to freetype-config --libs +# returning "-L/usr/lib64 -Wl,--rpath -Wl,/usr/lib64 -lfreetype -lz": +perl -pi.orig -e 's|-Wl,--rpath -Wl,/usr/lib64||g;' Makefile */Makefile */*/Makefile imlib2-config %endif -make %{?_smp_mflags} -make -C demo +make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool # ----------------------------------------------------------------------------- %install rm -rf $RPM_BUILD_ROOT __doc -make install DESTDIR=$RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -C demo +make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool cp -a doc __doc rm -f __doc/Makefile* rm -f \ - $RPM_BUILD_ROOT%{_libdir}/libImlib2.la \ - $RPM_BUILD_ROOT%{_libdir}/imlib2_loaders/*/*.*a \ + $RPM_BUILD_ROOT%{_libdir}/imlib2/{loaders,filters}/*.a \ $RPM_BUILD_ROOT%{_bindir}/{color_spaces,imlib2,*test} +# ship .la files due to a bug in kdelibs (see changelog): +# $RPM_BUILD_ROOT%{_libdir}/libImlib2.la \ + # ----------------------------------------------------------------------------- %clean @@ -79,22 +95,62 @@ %files %defattr(-,root,root,-) %doc COPYING AUTHORS README ChangeLog TODO __doc/* -%{_bindir}/imconvert %{_bindir}/imlib2_view +%{_bindir}/imlib2_bumpmap +%{_bindir}/imlib2_colorspace +%{_bindir}/imlib2_conv +%{_bindir}/imlib2_poly +%{_bindir}/imlib2_show %{_libdir}/libImlib2.so.* -%{_libdir}/imlib2_loaders +%{_datadir}/imlib2/data/ +%dir %{_libdir}/imlib2/filters/ +%{_libdir}/imlib2/filters/*.so +%{_libdir}/imlib2/filters/*.la +%dir %{_libdir}/imlib2/loaders/ +%{_libdir}/imlib2/loaders/*.so +%{_libdir}/imlib2/loaders/*.la %files devel %defattr(-,root,root,-) %{_bindir}/imlib2-config %{_includedir}/Imlib2.h %{_libdir}/libImlib2.a +%{_libdir}/libImlib2.la %{_libdir}/libImlib2.so %{_libdir}/pkgconfig/imlib2.pc # ----------------------------------------------------------------------------- %changelog +* Tue Jan 18 2005 Michael Schwendt - 0:1.2.0-4 +- Make this 1.2.0-0.fdr.4 for FC2 and older. +- Really include libtool archives to fix fedora.us bug #2284. + +* Fri Jan 14 2005 Thorsten Leemhuis - 0:1.2.0-3 +- Move filters and loaders back into main package where they belong + +* Mon Jan 10 2005 Thorsten Leemhuis - 0:1.2.0-2 +- Don't ship *.?.a in {_libdir}/imlib/filters/ and loaders/ + +* Sun Jan 09 2005 Thorsten Leemhuis - 0:1.2.0-1 +- Ship .la files ue to a bug in kdelibs; see + https://bugzilla.fedora.us/show_bug.cgi?id=2284 + http://bugzilla.redhat.com/bugzilla/142244 + http://bugs.kde.org/93359 +- Use make param LIBTOOL=/usr/bin/libtool - fixes hardcoded rpath on x86_64 +- fix hardcoded rpath im Makefiles on x86_64 due to freetype-config --libs + returning "-L/usr/lib64 -Wl,--rpath -Wl,/usr/lib64 -lfreetype -lz" +- Update to 1.2.0 -- fixes several security issues +- remove explicit libdir=_libdir - 1.2.9 does not need it anymore +- removeddemo compile/install; +- use configure param --x-libraries={_prefix}/X11R6/{_lib} and patch to fix + "cannot find -lX11" + +* Thu Dec 30 2004 Thorsten Leemhuis - 0:1.1.2-2 +- Disable mmx on x86_64 (fixes Build error) +- Add explicit libdir=_libdir to make calls to avoid install errors on x86_64 +- Add --with-pic configure option (taken from Matthias Saou's package) + * Sat Sep 25 2004 Ville Skytt?? - 0:1.1.2-0.fdr.1 - Update to 1.1.2, fixes CAN-2004-0802. - Enable MMX on all ix86, x86_64 and ia64, it seems runtime-detected. Index: sources =================================================================== RCS file: /cvs/extras/rpms/imlib2/FC-2/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:35:58 -0000 1.3 +++ sources 29 Jan 2005 22:23:59 -0000 1.4 @@ -1 +1 @@ -3389bad516032c951fda4fe620df0cef imlib2-1.1.2.tar.gz +853fb77100ee3c3ca944f52c892ab49b imlib2-1.2.0.tar.gz From fedora-extras-commits at redhat.com Sat Jan 29 22:57:19 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 17:57:19 -0500 Subject: rpms/zope import.log,1.2,1.3 Message-ID: <200501292257.j0TMvJoe016510@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/zope In directory cvs.fedora.redhat.com:/tmp/cvs-serv16501 Modified Files: import.log Log Message: auto-import zope-2.7.4-1 on branch devel from zope-2.7.4-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/zope/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 9 Jan 2005 12:09:24 -0000 1.2 +++ import.log 29 Jan 2005 22:57:17 -0000 1.3 @@ -1 +1,2 @@ zope-2_7_3-6:HEAD:zope-2.7.3-6.src.rpm:1105272558 +zope-2_7_4-1:HEAD:zope-2.7.4-1.src.rpm:1107039430 From fedora-extras-commits at redhat.com Sat Jan 29 22:57:19 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 17:57:19 -0500 Subject: rpms/zope/devel zope.logrotate.cron.in, NONE, 1.1 zope.logrotate.in, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 zope.spec, 1.1, 1.2 Message-ID: <200501292257.j0TMvJJg016514@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/zope/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv16501/devel Modified Files: .cvsignore sources zope.spec Added Files: zope.logrotate.cron.in zope.logrotate.in Log Message: auto-import zope-2.7.4-1 on branch devel from zope-2.7.4-1.src.rpm --- NEW FILE zope.logrotate.cron.in --- #!/bin/bash . <>/sysconfig/zope for instance in $ZOPE_INSTANCES; do logrotate $instance/etc/logrotate.conf done --- NEW FILE zope.logrotate.in --- <>/log/*.log { missingok sharedscripts rotate 4 weekly compress postrotate <>/bin/zopectl logreopen >/dev/null 2>&1 endscript } Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/zope/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Jan 2005 12:09:24 -0000 1.2 +++ .cvsignore 29 Jan 2005 22:57:17 -0000 1.3 @@ -1 +1 @@ -Zope-2.7.3-0.tgz +Zope-2.7.4-0.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/zope/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Jan 2005 12:09:24 -0000 1.2 +++ sources 29 Jan 2005 22:57:17 -0000 1.3 @@ -1 +1 @@ -15001ab6d429dc80b1f49735e8d2ee10 Zope-2.7.3-0.tgz +97c310f1de4609956c176588b08b25c5 Zope-2.7.4-0.tgz Index: zope.spec =================================================================== RCS file: /cvs/extras/rpms/zope/devel/zope.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- zope.spec 9 Jan 2005 12:09:24 -0000 1.1 +++ zope.spec 29 Jan 2005 22:57:17 -0000 1.2 @@ -12,19 +12,20 @@ Name: zope Summary: Web application server for flexible content management applications -Version: 2.7.3 -Release: 6 +Version: 2.7.4 +Release: 1 License: ZPL Group: System Environment/Daemons URL: http://www.zope.org/ -Source: http://zope.org/Products/Zope/2.7.3/Zope-2.7.3-0.tgz +Source: http://zope.org/Products/Zope/2.7.4/Zope-2.7.4-0.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: zope.init.in -#Source2: http://plope.com/software/zope-rpm/zope.logrotate.in Source2: zope.sysconfig.in Source3: zope.zopectl.in Source4: zope-README.Fedora +Source5: zope.logrotate.in +Source6: zope.logrotate.cron.in Patch0: zope-2.7.3-config.patch BuildRequires: python-devel >= %{python_minver} @@ -47,7 +48,9 @@ # Do not use -b option, or we'll install the backup too %patch0 -p1 -b .config rm -f skel/etc/zope.conf.in.config +chmod -x skel/import/README.txt cp -p %{SOURCE4} README.Fedora +cp -p %{SOURCE5} skel/etc/logrotate.conf.in %build @@ -75,6 +78,7 @@ install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/zope install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/zope install -D -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/zopectl +install -D -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/zope-logrotate perl -pi -e 's,<>,%{_sysconfdir},g; s,<>,%{_bindir},g; s,<>,%{_localstatedir},g; @@ -82,12 +86,13 @@ $RPM_BUILD_ROOT%{_initrddir}/zope \ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/zope \ $RPM_BUILD_ROOT%{_bindir}/zopectl \ + $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/zope-logrotate \ README.Fedora skel/etc/zope.conf.in # Install the skel, translating paths, into the build root %{__python} "utilities/copyzopeskel.py" \ --sourcedir="skel" \ - --targetdir="$RPM_BUILD_ROOT%{_localstatedir}/lib/zope" \ + --targetdir="$RPM_BUILD_ROOT%{instance_home}" \ --replace="INSTANCE_HOME:%{instance_home}" \ --replace="SOFTWARE_HOME:%{software_home}" \ --replace="ZOPE_HOME:%{zope_home}" \ @@ -96,7 +101,8 @@ # Actually copy all the other files over make install -chmod 700 $RPM_BUILD_ROOT%{_localstatedir}/lib/zope +chmod 700 $RPM_BUILD_ROOT%{instance_home} +chmod 755 $RPM_BUILD_ROOT%{zope_home} # Symlink to include in the docs ln -sf %{zope_home}/doc docs @@ -110,6 +116,8 @@ compileall.compile_dir(\"$RPM_BUILD_ROOT%{zope_home}\", \ ddir=\"%{zope_home}\", force=1)" + + %clean rm -rf $RPM_BUILD_ROOT @@ -137,18 +145,50 @@ fi + %files %defattr(-, root, root, -) +%doc %{zope_home}/doc %doc docs README.Fedora %config(noreplace) %{_sysconfdir}/sysconfig/zope %config %{_initrddir}/zope +%config %{_sysconfdir}/cron.daily/zope-logrotate %attr(0755, root, root) %{_bindir}/zopectl -%{zope_home} -%attr(-, %{zope_user}, %{zope_group}) %verify(not md5 size mtime) %{instance_home} +%dir %{zope_home} +%{zope_home}/bin +%{zope_home}/import +%{zope_home}/lib +%dir %{zope_home}/skel +%{zope_home}/skel/bin +%{zope_home}/skel/Extensions +%{zope_home}/skel/import +%{zope_home}/skel/log +%{zope_home}/skel/Products +%{zope_home}/skel/README.txt +%{zope_home}/skel/var +%config %{zope_home}/skel/etc +%attr(-, %{zope_user}, %{zope_group}) %dir %{instance_home} +%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/bin +%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/Extensions +%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/import +%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/log +%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/Products +%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/README.txt +%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/var +%attr(-, %{zope_user}, %{zope_group}) %config %{instance_home}/etc + %changelog -* Fri Dec 10 2004 Aurelien Bompard 2.7.3-6 +* Wed Jan 26 2005 Aurelien Bompard 2.7.4-1 +- version 2.7.4 +- flag the documentation as %%doc +- make %%zope_home go+rx to allow users to create instances and to allow + access to docs +- add a logrotate cron job +- flag config files as %%config even in %%zope_home and %%instance_home + +* Fri Dec 10 2004 Aurelien Bompard 2.7.3-0.fdr.6 - activate "security-policy-implementation python" in zope.conf * Sun Nov 21 2004 Aurelien Bompard 2.7.3-0.fdr.5 From fedora-extras-commits at redhat.com Sat Jan 29 23:29:38 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:29:38 -0500 Subject: rpms/awstats import.log,1.2,1.3 Message-ID: <200501292329.j0TNTc4x017332@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/awstats In directory cvs.fedora.redhat.com:/tmp/cvs-serv17323 Modified Files: import.log Log Message: auto-import awstats-6.3-0.fdr.0.1.20050122.2 on branch FC-2 from awstats-6.3-0.fdr.0.1.20050122.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/awstats/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 8 Nov 2004 04:04:34 -0000 1.2 +++ import.log 29 Jan 2005 23:29:36 -0000 1.3 @@ -1 +1,2 @@ awstats-6_1-0_fdr_6:HEAD:awstats-6.1-0.fdr.6.src.rpm:1099886674 +awstats-6_3-0_fdr_0_1_20050122_2:FC-2:awstats-6.3-0.fdr.0.1.20050122.2.src.rpm:1107041369 From fedora-extras-commits at redhat.com Sat Jan 29 23:29:38 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:29:38 -0500 Subject: rpms/awstats/FC-2 .cvsignore, 1.2, 1.3 awstats.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200501292329.j0TNTc2o017336@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/awstats/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv17323/FC-2 Modified Files: .cvsignore awstats.spec sources Log Message: auto-import awstats-6.3-0.fdr.0.1.20050122.2 on branch FC-2 from awstats-6.3-0.fdr.0.1.20050122.2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-2/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:04:34 -0000 1.2 +++ .cvsignore 29 Jan 2005 23:29:36 -0000 1.3 @@ -1 +1 @@ -awstats-6.1.tgz +awstats-6.3.tgz Index: awstats.spec =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-2/awstats.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- awstats.spec 8 Nov 2004 04:04:34 -0000 1.1 +++ awstats.spec 29 Jan 2005 23:29:36 -0000 1.2 @@ -1,11 +1,12 @@ Name: awstats -Version: 6.1 -Release: 0.fdr.6 +Version: 6.3 +Release: 0.fdr.0.1.20050122.2 Summary: Advanced Web Statistics License: GPL Group: Applications/Internet URL: http://awstats.sourceforge.net -Source0: http://dl.sf.net/awstats/awstats-6.1.tgz +Source0: http://awstats.sourceforge.net/files/awstats-6.3.tgz +#Source0: http://dl.sf.net/awstats/awstats-6.3.tgz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: httpd @@ -150,6 +151,12 @@ %{_datadir}/%{name}/wwwroot/js %changelog +* Thu Jan 27 2005 Aurelien Bompard 6.3-0.fdr.0.1.20050122 +- update to 6.3pre to fix vulnerability + +* Sun Nov 28 2004 Aurelien Bompard 6.2-0.fdr.1 +- version 6.2 + * Thu May 20 2004 Aurelien Bompard 6.1-0.fdr.6 - remove redundant substitution Index: sources =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-2/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:04:34 -0000 1.2 +++ sources 29 Jan 2005 23:29:36 -0000 1.3 @@ -1 +1 @@ -4f02c0fc4f1a0f946fcae3b3768bf113 awstats-6.1.tgz +4335067362c3033ca2c03e08abc67d73 awstats-6.3.tgz From fedora-extras-commits at redhat.com Sat Jan 29 23:30:44 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:30:44 -0500 Subject: rpms/awstats import.log,1.3,1.4 Message-ID: <200501292330.j0TNUiln017442@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/awstats In directory cvs.fedora.redhat.com:/tmp/cvs-serv17433 Modified Files: import.log Log Message: auto-import awstats-6.3-0.1.20050122 on branch devel from awstats-6.3-0.1.20050122.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/awstats/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 29 Jan 2005 23:29:36 -0000 1.3 +++ import.log 29 Jan 2005 23:30:42 -0000 1.4 @@ -1,2 +1,3 @@ awstats-6_1-0_fdr_6:HEAD:awstats-6.1-0.fdr.6.src.rpm:1099886674 awstats-6_3-0_fdr_0_1_20050122_2:FC-2:awstats-6.3-0.fdr.0.1.20050122.2.src.rpm:1107041369 +awstats-6_3-0_1_20050122:HEAD:awstats-6.3-0.1.20050122.src.rpm:1107041435 From fedora-extras-commits at redhat.com Sat Jan 29 23:30:44 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:30:44 -0500 Subject: rpms/awstats/devel .cvsignore, 1.2, 1.3 awstats.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200501292330.j0TNUilD017446@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/awstats/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17433/devel Modified Files: .cvsignore awstats.spec sources Log Message: auto-import awstats-6.3-0.1.20050122 on branch devel from awstats-6.3-0.1.20050122.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/awstats/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:04:34 -0000 1.2 +++ .cvsignore 29 Jan 2005 23:30:42 -0000 1.3 @@ -1 +1 @@ -awstats-6.1.tgz +awstats-6.3.tgz Index: awstats.spec =================================================================== RCS file: /cvs/extras/rpms/awstats/devel/awstats.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- awstats.spec 10 Dec 2004 22:03:01 -0000 1.2 +++ awstats.spec 29 Jan 2005 23:30:42 -0000 1.3 @@ -1,11 +1,12 @@ Name: awstats -Version: 6.1 -Release: 6 +Version: 6.3 +Release: 0.1.20050122 Summary: Advanced Web Statistics License: GPL Group: Applications/Internet URL: http://awstats.sourceforge.net -Source0: http://dl.sf.net/awstats/awstats-6.1.tgz +Source0: http://awstats.sourceforge.net/files/awstats-6.3.tgz +#Source0: http://dl.sf.net/awstats/awstats-6.3.tgz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: httpd @@ -150,6 +151,12 @@ %{_datadir}/%{name}/wwwroot/js %changelog +* Thu Jan 27 2005 Aurelien Bompard 6.3-0.1.20050122 +- update to 6.3pre to fix vulnerability + +* Sun Nov 28 2004 Aurelien Bompard 6.2-0.fdr.1 +- version 6.2 + * Thu May 20 2004 Aurelien Bompard 6.1-0.fdr.6 - remove redundant substitution Index: sources =================================================================== RCS file: /cvs/extras/rpms/awstats/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:04:34 -0000 1.2 +++ sources 29 Jan 2005 23:30:42 -0000 1.3 @@ -1 +1 @@ -4f02c0fc4f1a0f946fcae3b3768bf113 awstats-6.1.tgz +4335067362c3033ca2c03e08abc67d73 awstats-6.3.tgz From fedora-extras-commits at redhat.com Sat Jan 29 23:32:27 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:32:27 -0500 Subject: rpms/libkexif import.log,1.2,1.3 Message-ID: <200501292332.j0TNWRak017567@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libkexif In directory cvs.fedora.redhat.com:/tmp/cvs-serv17557 Modified Files: import.log Log Message: auto-import libkexif-0.2.1-1 on branch devel from libkexif-0.2.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libkexif/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 12 Jan 2005 20:12:52 -0000 1.2 +++ import.log 29 Jan 2005 23:32:25 -0000 1.3 @@ -1 +1,2 @@ libkexif-0_1-2:HEAD:libkexif-0.1-2.src.rpm:1105560811 +libkexif-0_2_1-1:HEAD:libkexif-0.2.1-1.src.rpm:1107041539 From fedora-extras-commits at redhat.com Sat Jan 29 23:32:27 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:32:27 -0500 Subject: rpms/libkexif/devel .cvsignore, 1.2, 1.3 libkexif.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200501292332.j0TNWRqa017570@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libkexif/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17557/devel Modified Files: .cvsignore libkexif.spec sources Log Message: auto-import libkexif-0.2.1-1 on branch devel from libkexif-0.2.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libkexif/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Jan 2005 20:12:52 -0000 1.2 +++ .cvsignore 29 Jan 2005 23:32:25 -0000 1.3 @@ -1 +1 @@ -libkexif-0.1.tar.bz2 +libkexif-0.2.1.tar.bz2 Index: libkexif.spec =================================================================== RCS file: /cvs/extras/rpms/libkexif/devel/libkexif.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libkexif.spec 12 Jan 2005 20:12:52 -0000 1.1 +++ libkexif.spec 29 Jan 2005 23:32:25 -0000 1.2 @@ -1,19 +1,18 @@ Name: libkexif -Version: 0.1 -Release: 2 +Version: 0.2.1 +Release: 1 Epoch: 0 Summary: Allow Kipi plugins to extract EXIF information Group: System Environment/Libraries License: GPL -URL: http://extragear.kde.org/apps/kipi.php -Source0: http://dl.sf.net/digikam/libkexif-0.1.tar.bz2 +URL: http://extragear.kde.org/apps/kipi +Source0: http://dl.sf.net/digikam/libkexif-0.2.1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libexif-devel >= 0:0.5.7, kdelibs-devel >= 6:3.0 BuildRequires: gettext - %description This library allows Kipi plugins to extract EXIF information from JPEG files. @@ -72,7 +71,11 @@ %changelog -* Wed Jan 05 2005 Aurelien Bompard 0:0.1-2 +* Mon Jan 24 2005 Aurelien Bompard 0:0.2.1-1 +- version 0.2.1 +- update URL tag + +* Wed Jan 05 2005 Aurelien Bompard 0:0.1-0.fdr.2 - Licence is GPL not LGPL - Fix -devel description and requirements - Switch group to "System Environment/Libraries" Index: sources =================================================================== RCS file: /cvs/extras/rpms/libkexif/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Jan 2005 20:12:52 -0000 1.2 +++ sources 29 Jan 2005 23:32:25 -0000 1.3 @@ -1 +1 @@ -2d1ed6285fd9490c72327ff6dacd9185 libkexif-0.1.tar.bz2 +28a7eb727d6a884343ce8cbe061cb58f libkexif-0.2.1.tar.bz2 From fedora-extras-commits at redhat.com Sat Jan 29 23:45:10 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:45:10 -0500 Subject: rpms/gwenview import.log,1.3,1.4 Message-ID: <200501292345.j0TNjA9X017702@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/gwenview In directory cvs.fedora.redhat.com:/tmp/cvs-serv17693 Modified Files: import.log Log Message: auto-import gwenview-1.1.6-0.fdr.2.2 on branch FC-2 from gwenview-1.1.6-0.fdr.2.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gwenview/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 8 Nov 2004 04:33:22 -0000 1.3 +++ import.log 29 Jan 2005 23:45:08 -0000 1.4 @@ -1,2 +1,3 @@ gwenview-1_0_1-0_fdr_4_1:HEAD:gwenview-1.0.1-0.fdr.4.1.src.rpm:1099888393 gwenview-1_0_1-0_fdr_4_1_90:HEAD:gwenview-1.0.1-0.fdr.4.1.90.src.rpm:1099888402 +gwenview-1_1_6-0_fdr_2_2:FC-2:gwenview-1.1.6-0.fdr.2.2.src.rpm:1107042302 From fedora-extras-commits at redhat.com Sat Jan 29 23:45:10 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:45:10 -0500 Subject: rpms/gwenview/FC-2 .cvsignore, 1.2, 1.3 gwenview.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200501292345.j0TNjAie017707@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/gwenview/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv17693/FC-2 Modified Files: .cvsignore gwenview.spec sources Log Message: auto-import gwenview-1.1.6-0.fdr.2.2 on branch FC-2 from gwenview-1.1.6-0.fdr.2.2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gwenview/FC-2/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:33:13 -0000 1.2 +++ .cvsignore 29 Jan 2005 23:45:08 -0000 1.3 @@ -1 +1 @@ -gwenview-1.0.1.tar.bz2 +gwenview-1.1.6.tar.bz2 Index: gwenview.spec =================================================================== RCS file: /cvs/extras/rpms/gwenview/FC-2/gwenview.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gwenview.spec 8 Nov 2004 04:33:22 -0000 1.2 +++ gwenview.spec 29 Jan 2005 23:45:08 -0000 1.3 @@ -1,32 +1,20 @@ - -# Fedora Core 2 support. -%define fedora_release %(if test -n "$(rpm -ql fedora-release | grep -m1 etc)"; then rpm -q --qf "%%{version}" fedora-release; else echo 0; fi ) -%if "%fedora_release" > "1" -%define target_kde32 1 -%endif -%{?_with_kde32: %define target_kde32 1} - Name: gwenview -Version: 1.0.1 -Release: 0.fdr.4.1.90 +Version: 1.1.6 +Release: 0.fdr.2.2 Epoch: 0 Summary: Simple image viewer for KDE. Group: Applications/Multimedia License: GPL URL: http://gwenview.sf.net -Source0: http://dl.sf.net/gwenview/gwenview-1.0.1.tar.bz2 +Source0: http://dl.sf.net/gwenview/gwenview-1.1.6.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdelibs-devel >= 6:3.0.0, arts-devel -BuildRequires: XFree86-devel, zlib-devel, libjpeg-devel -BuildRequires: libart_lgpl-devel, desktop-file-utils -BuildRequires: libpng-devel, gettext - -%if 0%{?target_kde32} -BuildRequires: libmng-devel fam-devel glib2-devel -%endif - +BuildRequires: kdelibs-devel >= 6:3.1 +BuildRequires: desktop-file-utils +BuildRequires: libkipi-devel +BuildRequires: gettext +#BuildRequires: fam-devel glib2-devel %description Gwenview is an image viewer for KDE. @@ -38,14 +26,15 @@ %prep %setup -q -perl -pi -e 's,Categories=Qt;KDE;Graphics,Categories=Qt;KDE;Graphics;,' desktopfiles/gwenview.desktop perl -pi -e 's,Commend\[ko\]=,Comment\[ko\]=,' desktopfiles/gwenview.desktop +#perl -pi -e 's,Categories=Qt;KDE;Graphics,Categories=Qt;KDE;Graphics;,' desktopfiles/gwenview.desktop %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh %configure --disable-rpath \ --disable-debug \ - --enable-final + --enable-kipi +# --enable-final \ make %{?_smp_mflags} @@ -54,22 +43,19 @@ make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install --vendor fedora --delete-original \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ --add-category X-Fedora \ --add-category Application \ --add-category Viewer \ $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop -# KDE 3.2: -%if 0%{?target_kde32} -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/kde -mv $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop $RPM_BUILD_ROOT%{_datadir}/applications/kde/ -%endif +rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/{xx,ven,nso} +%find_lang %{name} -rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/{xx,ven,nso} +%post -p /sbin/ldconfig -%find_lang %{name} +%postun -p /sbin/ldconfig %clean @@ -80,18 +66,24 @@ %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README TODO CREDITS %{_bindir}/* -%if 0%{?target_kde32} %{_datadir}/applications/kde/*.desktop -%else -%{_datadir}/applications/*.desktop -%endif %{_datadir}/apps/konqueror/servicemenus/* %{_datadir}/icons/*/*/apps/* -%{_datadir}/apps/%{name} +%{_datadir}/apps/* +%{_datadir}/services/*.desktop %{_mandir}/man1/* +%{_libdir}/lib* +%{_libdir}/kde3/lib* %changelog +* Wed Nov 24 2004 Aurelien Bompard 0:1.1.6-0.fdr.2 +- remove hardcoded requirement to kipi-plugins + +* Mon Oct 25 2004 Aurelien Bompard 0:1.1.6-0.fdr.1 +- version 1.1.6 +- drop FC1 support + * Wed Mar 17 2004 Aurelien Bompard 0:1.0.1-0.fdr.4 - fix typo in desktop file Index: sources =================================================================== RCS file: /cvs/extras/rpms/gwenview/FC-2/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:33:13 -0000 1.2 +++ sources 29 Jan 2005 23:45:08 -0000 1.3 @@ -1 +1 @@ -98bc89e3bda282cf192f84bd1fc03fdf gwenview-1.0.1.tar.bz2 +2c1bf6f363165273350888e0a7e00168 gwenview-1.1.6.tar.bz2 From fedora-extras-commits at redhat.com Sat Jan 29 23:45:59 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:45:59 -0500 Subject: rpms/gwenview import.log,1.4,1.5 Message-ID: <200501292345.j0TNjxxW017814@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/gwenview In directory cvs.fedora.redhat.com:/tmp/cvs-serv17804 Modified Files: import.log Log Message: auto-import gwenview-1.1.6-2 on branch devel from gwenview-1.1.6-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gwenview/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 29 Jan 2005 23:45:08 -0000 1.4 +++ import.log 29 Jan 2005 23:45:57 -0000 1.5 @@ -1,3 +1,4 @@ gwenview-1_0_1-0_fdr_4_1:HEAD:gwenview-1.0.1-0.fdr.4.1.src.rpm:1099888393 gwenview-1_0_1-0_fdr_4_1_90:HEAD:gwenview-1.0.1-0.fdr.4.1.90.src.rpm:1099888402 gwenview-1_1_6-0_fdr_2_2:FC-2:gwenview-1.1.6-0.fdr.2.2.src.rpm:1107042302 +gwenview-1_1_6-2:HEAD:gwenview-1.1.6-2.src.rpm:1107042351 From fedora-extras-commits at redhat.com Sat Jan 29 23:45:59 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:45:59 -0500 Subject: rpms/gwenview/devel .cvsignore, 1.2, 1.3 gwenview.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200501292345.j0TNjxPE017817@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/gwenview/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17804/devel Modified Files: .cvsignore gwenview.spec sources Log Message: auto-import gwenview-1.1.6-2 on branch devel from gwenview-1.1.6-2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gwenview/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:33:13 -0000 1.2 +++ .cvsignore 29 Jan 2005 23:45:57 -0000 1.3 @@ -1 +1 @@ -gwenview-1.0.1.tar.bz2 +gwenview-1.1.6.tar.bz2 Index: gwenview.spec =================================================================== RCS file: /cvs/extras/rpms/gwenview/devel/gwenview.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gwenview.spec 10 Dec 2004 22:03:03 -0000 1.3 +++ gwenview.spec 29 Jan 2005 23:45:57 -0000 1.4 @@ -1,32 +1,20 @@ - -# Fedora Core 2 support. -%define fedora_release %(if test -n "$(rpm -ql fedora-release | grep -m1 etc)"; then rpm -q --qf "%%{version}" fedora-release; else echo 0; fi ) -%if "%fedora_release" > "1" -%define target_kde32 1 -%endif -%{?_with_kde32: %define target_kde32 1} - Name: gwenview -Version: 1.0.1 -Release: 4 +Version: 1.1.6 +Release: 2 Epoch: 0 Summary: Simple image viewer for KDE. Group: Applications/Multimedia License: GPL URL: http://gwenview.sf.net -Source0: http://dl.sf.net/gwenview/gwenview-1.0.1.tar.bz2 +Source0: http://dl.sf.net/gwenview/gwenview-1.1.6.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdelibs-devel >= 6:3.0.0, arts-devel -BuildRequires: XFree86-devel, zlib-devel, libjpeg-devel -BuildRequires: libart_lgpl-devel, desktop-file-utils -BuildRequires: libpng-devel, gettext - -%if 0%{?target_kde32} -BuildRequires: libmng-devel fam-devel glib2-devel -%endif - +BuildRequires: kdelibs-devel >= 6:3.1 +BuildRequires: desktop-file-utils +BuildRequires: libkipi-devel +BuildRequires: gettext +#BuildRequires: fam-devel glib2-devel %description Gwenview is an image viewer for KDE. @@ -38,14 +26,15 @@ %prep %setup -q -perl -pi -e 's,Categories=Qt;KDE;Graphics,Categories=Qt;KDE;Graphics;,' desktopfiles/gwenview.desktop perl -pi -e 's,Commend\[ko\]=,Comment\[ko\]=,' desktopfiles/gwenview.desktop +#perl -pi -e 's,Categories=Qt;KDE;Graphics,Categories=Qt;KDE;Graphics;,' desktopfiles/gwenview.desktop %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh %configure --disable-rpath \ --disable-debug \ - --enable-final + --enable-kipi +# --enable-final \ make %{?_smp_mflags} @@ -54,22 +43,19 @@ make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install --vendor fedora --delete-original \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ --add-category X-Fedora \ --add-category Application \ --add-category Viewer \ $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop -# KDE 3.2: -%if 0%{?target_kde32} -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/kde -mv $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop $RPM_BUILD_ROOT%{_datadir}/applications/kde/ -%endif +rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/{xx,ven,nso} +%find_lang %{name} -rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/{xx,ven,nso} +%post -p /sbin/ldconfig -%find_lang %{name} +%postun -p /sbin/ldconfig %clean @@ -80,18 +66,24 @@ %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README TODO CREDITS %{_bindir}/* -%if 0%{?target_kde32} %{_datadir}/applications/kde/*.desktop -%else -%{_datadir}/applications/*.desktop -%endif %{_datadir}/apps/konqueror/servicemenus/* %{_datadir}/icons/*/*/apps/* -%{_datadir}/apps/%{name} +%{_datadir}/apps/* +%{_datadir}/services/*.desktop %{_mandir}/man1/* +%{_libdir}/lib* +%{_libdir}/kde3/lib* %changelog +* Wed Nov 24 2004 Aurelien Bompard 0:1.1.6-2 +- remove hardcoded requirement to kipi-plugins + +* Mon Oct 25 2004 Aurelien Bompard 0:1.1.6-0.fdr.1 +- version 1.1.6 +- drop FC1 support + * Wed Mar 17 2004 Aurelien Bompard 0:1.0.1-0.fdr.4 - fix typo in desktop file Index: sources =================================================================== RCS file: /cvs/extras/rpms/gwenview/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:33:13 -0000 1.2 +++ sources 29 Jan 2005 23:45:57 -0000 1.3 @@ -1 +1 @@ -98bc89e3bda282cf192f84bd1fc03fdf gwenview-1.0.1.tar.bz2 +2c1bf6f363165273350888e0a7e00168 gwenview-1.1.6.tar.bz2 From fedora-extras-commits at redhat.com Sat Jan 29 23:47:58 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:47:58 -0500 Subject: rpms/showimg - New directory Message-ID: <200501292347.j0TNlwgA017940@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/showimg In directory cvs.fedora.redhat.com:/tmp/cvs-serv17933/showimg Log Message: Directory /cvs/extras/rpms/showimg added to the repository From fedora-extras-commits at redhat.com Sat Jan 29 23:47:58 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:47:58 -0500 Subject: rpms/showimg/devel - New directory Message-ID: <200501292347.j0TNlw7F017943@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/showimg/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17933/showimg/devel Log Message: Directory /cvs/extras/rpms/showimg/devel added to the repository From fedora-extras-commits at redhat.com Sat Jan 29 23:48:16 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:48:16 -0500 Subject: rpms/showimg Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501292348.j0TNmGZx018002@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/showimg In directory cvs.fedora.redhat.com:/tmp/cvs-serv17993 Added Files: Makefile import.log Log Message: Setup of module showimg --- NEW FILE Makefile --- # Top level Makefile for module showimg all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 29 23:48:16 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:48:16 -0500 Subject: rpms/showimg/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501292348.j0TNmGuc018005@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/showimg/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17993/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module showimg --- NEW 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 Jan 29 23:49:58 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:49:58 -0500 Subject: rpms/showimg import.log,1.1,1.2 Message-ID: <200501292349.j0TNnwNC018100@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/showimg In directory cvs.fedora.redhat.com:/tmp/cvs-serv18091 Modified Files: import.log Log Message: auto-import showimg-0.9.4.1-2 on branch devel from showimg-0.9.4.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/showimg/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 29 Jan 2005 23:48:14 -0000 1.1 +++ import.log 29 Jan 2005 23:49:56 -0000 1.2 @@ -0,0 +1 @@ +showimg-0_9_4_1-2:HEAD:showimg-0.9.4.1-2.src.rpm:1107042589 From fedora-extras-commits at redhat.com Sat Jan 29 23:49:58 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:49:58 -0500 Subject: rpms/showimg/devel showimg.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501292349.j0TNnwEZ018104@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/showimg/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv18091/devel Modified Files: .cvsignore sources Added Files: showimg.spec Log Message: auto-import showimg-0.9.4.1-2 on branch devel from showimg-0.9.4.1-2.src.rpm --- NEW FILE showimg.spec --- Name: showimg Version: 0.9.4.1 Release: 2 Epoch: 0 Summary: Feature-rich image viewer for KDE. Group: Applications/Multimedia License: GPL URL: http://www.jalix.org/projects/showimg Source0: http://www.jalix.org/projects/showimg/download/0.9.4-1/showimg-0.9.4-1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils BuildRequires: kdebase-devel >= 6:3.0.0 BuildRequires: gettext BuildRequires: glib2-devel BuildRequires: libkipi-devel, libkexif-devel, libexif-devel Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig %description ShowImg is a feature-rich image viewer for KDE including an image management system. It is highly configurable and supports numerous image formats. %prep %setup -q -n %{name}-0.9.4-1 #perl -pi -e 's/KDE_DOCS=AUTO/KDE_DOCS=showimg/g' doc/??/Makefile.am %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh %configure --disable-rpath \ --disable-debug \ # --enable-final \ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/kde desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ --add-category X-Fedora \ --add-category Application \ --add-category Viewer \ --add-category Graphics \ $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/%{name}.desktop rm -f $RPM_BUILD_ROOT%{_datadir}/apps/showimg/convert2png.pl #find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %find_lang %{name} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README %{_bindir}/* %{_datadir}/applications/kde/*.desktop %{_datadir}/apps/%{name} %{_datadir}/apps/konqueror/servicemenus/* %{_datadir}/apps/showimgpart/showimgpart.rc %{_datadir}/services/showimgpart.desktop %{_datadir}/icons/*/*/apps/* %{_mandir}/man1/* %{_datadir}/doc/HTML/*/%{name} %{_datadir}/mimelnk/image/*.desktop %{_libdir}/kde3/libshowimgpart.* %{_libdir}/libshowimgcore.* %changelog * Mon Jan 24 2005 Aurelien Bompard 0:0.9.4.1-2 - rebuild for libkexif 0.2.1 * Thu Jan 20 2005 Aurelien Bompard 0:0.9.4.1-0.fdr.1 - version 0.9.4-1: fixes a dependency problem on libkexif 0.2.x * Wed Dec 01 2004 Aurelien Bompard 0:0.9.4-0.fdr.2 - fix BuildRequires * Tue Nov 30 2004 Aurelien Bompard 0:0.9.4-0.fdr.1 - version 0.9.4 final - remove perl script requiring the GIMP module until it is packaged * Mon Nov 22 2004 Aurelien Bompard 0:0.9.4-0.fdr.0.3.rc2 - update to rc2 * Mon Nov 15 2004 Aurelien Bompard 0:0.9.4-0.fdr.0.2.rc1 - update to rc1 * Sun Sep 26 2004 Aurelien Bompard 0:0.9.4-0.fdr.1 - version 0.9.4 - drop support for FC1 (EOL) - use libkipi for plugins * Tue Jul 06 2004 Aurelien Bompard 0:0.9.3-0.fdr.1 - version 0.9.3 - make digikam support conditionnal * Tue Mar 23 2004 Aurelien Bompard 0:0.9.2-0.fdr.1 - version 0.9.2 * Mon Mar 22 2004 Aurelien Bompard 0:0.9.1-0.fdr.2 - let rpm set dependencies on libjpeg and kdelibs - desktop file for kde32 should not have the fedora prefix * Sun Mar 21 2004 Aurelien Bompard 0:0.9.1-0.fdr.1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/showimg/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 29 Jan 2005 23:48:14 -0000 1.1 +++ .cvsignore 29 Jan 2005 23:49:56 -0000 1.2 @@ -0,0 +1 @@ +showimg-0.9.4-1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/showimg/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 29 Jan 2005 23:48:14 -0000 1.1 +++ sources 29 Jan 2005 23:49:56 -0000 1.2 @@ -0,0 +1 @@ +d6cebe9a627aaa4f0ec57e95f403d5fa showimg-0.9.4-1.tar.bz2 From fedora-extras-commits at redhat.com Sun Jan 30 22:28:08 2005 From: fedora-extras-commits at redhat.com (Phillip Compton (pcompton)) Date: Sun, 30 Jan 2005 17:28:08 -0500 Subject: devel/firestarter .cvsignore, 1.6, 1.7 firestarter.spec, 1.6, 1.7 sources, 1.6, 1.7 Message-ID: <200501302228.j0UMS81E010284@cvs.fedora.redhat.com> Author: pcompton Update of /cvs/extras/devel/firestarter In directory cvs.fedora.redhat.com:/tmp/cvs-serv10273 Modified Files: .cvsignore firestarter.spec sources Log Message: firestarter 1.0.3 (many bugfixes, especially for samba users) Index: .cvsignore =================================================================== RCS file: /cvs/extras/devel/firestarter/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 19 Dec 2004 15:39:05 -0000 1.6 +++ .cvsignore 30 Jan 2005 22:28:05 -0000 1.7 @@ -1 +1,2 @@ firestarter-1.0.1.tar.gz +firestarter-1.0.3.tar.gz Index: firestarter.spec =================================================================== RCS file: /cvs/extras/devel/firestarter/firestarter.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- firestarter.spec 19 Dec 2004 15:39:05 -0000 1.6 +++ firestarter.spec 30 Jan 2005 22:28:05 -0000 1.7 @@ -1,12 +1,12 @@ Name: firestarter -Version: 1.0.1 +Version: 1.0.3 Release: 1 Summary: The Firestarter firewall tool for GNOME Group: Applications/Internet License: GPL URL: http://firestarter.sourceforge.net -Source0: http://download.sourceforge.net/firestarter/firestarter-1.0.1.tar.gz +Source0: http://download.sourceforge.net/firestarter/firestarter-1.0.3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -148,6 +148,9 @@ %changelog +* Sun Jan 30 2005 Phillip Compton 1.0.3-1 +- 1.0.3. + * Sun Dec 19 2004 Phillip Compton 1.0.1-1 - 1.0.1. Index: sources =================================================================== RCS file: /cvs/extras/devel/firestarter/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 19 Dec 2004 15:39:05 -0000 1.6 +++ sources 30 Jan 2005 22:28:05 -0000 1.7 @@ -1 +1,2 @@ ef5afad42201639f282dec4eda20720d firestarter-1.0.1.tar.gz +f46860a9e16dac4b693bd05f16370b03 firestarter-1.0.3.tar.gz From fedora-extras-commits at redhat.com Mon Jan 31 17:17:32 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 31 Jan 2005 12:17:32 -0500 Subject: rpms/rrdtool/devel rrdtool.spec,1.5,1.6 Message-ID: <200501311717.j0VHHWYK025402@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/rrdtool/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25396 Modified Files: rrdtool.spec Log Message: Fix for bug #146513. Index: rrdtool.spec =================================================================== RCS file: /cvs/extras/rpms/rrdtool/devel/rrdtool.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- rrdtool.spec 13 Jan 2005 18:27:47 -0000 1.5 +++ rrdtool.spec 31 Jan 2005 17:17:30 -0000 1.6 @@ -3,7 +3,7 @@ Summary: Round Robin Database Tool to store and display time-series data Name: rrdtool Version: 1.0.49 -Release: 2 +Release: 3 License: GPL Group: Applications/Databases URL: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/ @@ -96,8 +96,8 @@ EOF # Put perl files back where they belong -%{__mkdir_p} %{buildroot}%{perl_sitearch}/ -%{__mv} %{buildroot}%{_libdir}/perl/* %{buildroot}%{perl_sitearch}/ +%{__mkdir_p} %{buildroot}%{perl_vendorarch}/ +%{__mv} %{buildroot}%{_libdir}/perl/* %{buildroot}%{perl_vendorarch}/ # We only want .txt and .html files for the main documentation %{__mkdir_p} doc2/doc @@ -122,8 +122,8 @@ %doc CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO doc2/doc %{_bindir}/* %{_libdir}/*.so.* -%{perl_sitearch}/*.pm -%{perl_sitearch}/auto/* +%{perl_vendorarch}/*.pm +%{perl_vendorarch}/auto/* %{_mandir}/man1/* @@ -147,6 +147,9 @@ %changelog +* Mon Jan 31 2005 Matthias Saou 1.0.49-3 +- Put perl modules in vendor_perl and not site_perl. #146513 + * Thu Jan 13 2005 Matthias Saou 1.0.49-2 - Minor cleanups. From fedora-extras-commits at redhat.com Mon Jan 31 17:30:18 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 31 Jan 2005 12:30:18 -0500 Subject: rpms/yasm - New directory Message-ID: <200501311730.j0VHUI8E025512@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/yasm In directory cvs.fedora.redhat.com:/tmp/cvs-serv25505/yasm Log Message: Directory /cvs/extras/rpms/yasm added to the repository From fedora-extras-commits at redhat.com Mon Jan 31 17:30:18 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 31 Jan 2005 12:30:18 -0500 Subject: rpms/yasm/devel - New directory Message-ID: <200501311730.j0VHUI2B025515@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/yasm/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25505/yasm/devel Log Message: Directory /cvs/extras/rpms/yasm/devel added to the repository From fedora-extras-commits at redhat.com Mon Jan 31 17:30:36 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 31 Jan 2005 12:30:36 -0500 Subject: rpms/yasm Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501311730.j0VHUaTF025574@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/yasm In directory cvs.fedora.redhat.com:/tmp/cvs-serv25565 Added Files: Makefile import.log Log Message: Setup of module yasm --- NEW FILE Makefile --- # Top level Makefile for module yasm all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 31 17:30:36 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 31 Jan 2005 12:30:36 -0500 Subject: rpms/yasm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501311730.j0VHUa9H025577@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/yasm/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25565/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module yasm --- NEW 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 Jan 31 17:31:17 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 31 Jan 2005 12:31:17 -0500 Subject: rpms/yasm import.log,1.1,1.2 Message-ID: <200501311731.j0VHVHxx025670@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/yasm In directory cvs.fedora.redhat.com:/tmp/cvs-serv25661 Modified Files: import.log Log Message: auto-import yasm-0.4.0-1 on branch devel from yasm-0.4.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/yasm/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 31 Jan 2005 17:30:34 -0000 1.1 +++ import.log 31 Jan 2005 17:31:15 -0000 1.2 @@ -0,0 +1 @@ +yasm-0_4_0-1:HEAD:yasm-0.4.0-1.src.rpm:1107192665 From fedora-extras-commits at redhat.com Mon Jan 31 17:31:17 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 31 Jan 2005 12:31:17 -0500 Subject: rpms/yasm/devel yasm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501311731.j0VHVHP9025674@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/yasm/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25661/devel Modified Files: .cvsignore sources Added Files: yasm.spec Log Message: auto-import yasm-0.4.0-1 on branch devel from yasm-0.4.0-1.src.rpm --- NEW FILE yasm.spec --- Summary: Complete rewrite of the NASM assembler Name: yasm Version: 0.4.0 Release: 1 License: BSD Group: Development/Languages URL: http://www.tortall.net/projects/yasm/ Source: http://www.tortall.net/projects/yasm/releases/yasm-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: bison, byacc, xmlto, gettext-devel %description Yasm is a complete rewrite of the NASM assembler under the "new" BSD License (some portions are under other licenses, see COPYING for details). It is designed from the ground up to allow for multiple assembler syntaxes to be supported (eg, NASM, TASM, GAS, etc.) in addition to multiple output object formats and even multiple instruction sets. Another primary module of the overall design is an optimizer module. %package devel Summary: Header files and static libraries for yasm Group: Development/Libraries Requires: %{name} = %{version} %description devel Yasm is a complete rewrite of the NASM assembler under the "new" BSD License (some portions are under other licenses, see COPYING for details). It is designed from the ground up to allow for multiple assembler syntaxes to be supported (eg, NASM, TASM, GAS, etc.) in addition to multiple output object formats and even multiple instruction sets. Another primary module of the overall design is an optimizer module. Install this package if you need to rebuild applications that use yasm. %prep %setup %build %configure %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} %makeinstall %clean %{__rm} -rf %{buildroot} %post /sbin/ldconfig %postun /sbin/ldconfig %files %defattr(-, root, root, 0755) %doc Artistic.txt AUTHORS BSD.txt ChangeLog COPYING GNU* NEWS README %{_bindir}/yasm %{_libdir}/*.so.* %dir %{_libdir}/yasm/ %{_libdir}/yasm/*.so %{_mandir}/man1/yasm.1* %files devel %defattr(-, root, root, 0755) %{_includedir}/libyasm.h %{_includedir}/libyasm/ %{_libdir}/*.a %exclude %{_libdir}/*.la %{_libdir}/*.so %dir %{_libdir}/yasm/ %{_libdir}/yasm/*.a %exclude %{_libdir}/yasm/*.la %{_mandir}/man7/yasm_arch.7* %changelog * Fri Jan 28 2005 Matthias Saou 0.4.0-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yasm/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 31 Jan 2005 17:30:34 -0000 1.1 +++ .cvsignore 31 Jan 2005 17:31:15 -0000 1.2 @@ -0,0 +1 @@ +yasm-0.4.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yasm/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 31 Jan 2005 17:30:34 -0000 1.1 +++ sources 31 Jan 2005 17:31:15 -0000 1.2 @@ -0,0 +1 @@ +2360e20c4e105ba95f4e9135a7901183 yasm-0.4.0.tar.gz From fedora-extras-commits at redhat.com Mon Jan 31 17:41:24 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 31 Jan 2005 12:41:24 -0500 Subject: rpms/lmarbles/devel .cvsignore, 1.2, 1.3 lmarbles.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200501311741.j0VHfOLb025802@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/lmarbles/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25795 Modified Files: .cvsignore lmarbles.spec sources Log Message: Update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lmarbles/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Nov 2004 02:47:45 -0000 1.2 +++ .cvsignore 31 Jan 2005 17:41:22 -0000 1.3 @@ -1 +1 @@ -lmarbles-1.0.6.tar.gz +lmarbles-1.0.7.tar.gz Index: lmarbles.spec =================================================================== RCS file: /cvs/extras/rpms/lmarbles/devel/lmarbles.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- lmarbles.spec 16 Nov 2004 17:57:17 -0000 1.4 +++ lmarbles.spec 31 Jan 2005 17:41:22 -0000 1.5 @@ -1,12 +1,10 @@ -# $Id$ - Summary: Atomix clone where you create figures out of marbles Name: lmarbles -Version: 1.0.6 -Release: 4 +Version: 1.0.7 +Release: 1 License: GPL Group: Amusements/Games -URL: http://www.lgames.org/ +URL: http://lgames.sourceforge.net/ Source: http://dl.sf.net/lgames/lmarbles-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: SDL >= 1.1.4, SDL_mixer @@ -28,23 +26,23 @@ %build -%configure +%configure --localstatedir=%{_var}/lib/games %{__make} %{?_smp_mflags} # Having it as png seems more consistent -convert lmarbles48.gif %{name}.png +convert lmarbles48.gif lmarbles.png %install %{__rm} -rf %{buildroot} %{__make} install DESTDIR=%{buildroot} -%{__install} -D %{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}.png +%{__install} -D lmarbles.png %{buildroot}%{_datadir}/pixmaps/lmarbles.png %{__cat} > %{name}.desktop << EOF [Desktop Entry] Name=LMarbles Comment=Atomix clone where you create figures out of marbles -Exec=%{name} -Icon=%{name}.png +Exec=lmarbles +Icon=lmarbles.png Terminal=false Type=Application Categories=Application;Game; @@ -61,20 +59,27 @@ %{__rm} -rf %{buildroot} +%post +update-desktop-database %{_datadir}/applications &>/dev/null || : + +%postun +update-desktop-database %{_datadir}/applications &>/dev/null || : + + %files %defattr(-, root, root, 0755) %doc AUTHORS COPYING ChangeLog README TODO -%attr(2551, root, games) %{_bindir}/%{name} -%{_datadir}/applications/fedora-%{name}.desktop -%{_datadir}/games/%{name}/ -%{_datadir}/pixmaps/%{name}.png -%{_mandir}/man6/%{name}* -%config(noreplace) %attr(664, games, games) %{_var}/lib/games/marbles.prfs +%attr(2551, root, games) %{_bindir}/lmarbles +%{_datadir}/applications/fedora-lmarbles.desktop +%{_datadir}/lmarbles/ +%{_datadir}/pixmaps/lmarbles.png +%{_mandir}/man6/lmarbles.6* +%config(noreplace) %attr(664, games, games) %{_var}/lib/games/lmarbles.prfs %changelog -* Tue Nov 16 2004 Matthias Saou 1.0.6-4 -- Bump release to provide Extras upgrade path. +* Wed Jan 26 2005 Matthias Saou 1.0.7-1 +- Update to 1.0.7. * Wed May 19 2004 Matthias Saou 1.0.6-3 - Rebuild for Fedora Core 2. Index: sources =================================================================== RCS file: /cvs/extras/rpms/lmarbles/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Nov 2004 02:47:45 -0000 1.2 +++ sources 31 Jan 2005 17:41:22 -0000 1.3 @@ -1 +1 @@ -ad162da8fa298cac680e13c02fea258c lmarbles-1.0.6.tar.gz +b29156bc5021877d080e5e268012f4ec lmarbles-1.0.7.tar.gz From fedora-extras-commits at redhat.com Mon Jan 31 17:44:36 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 31 Jan 2005 12:44:36 -0500 Subject: rpms/synergy/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 synergy.spec, 1.4, 1.5 Message-ID: <200501311744.j0VHiaXM025864@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/synergy/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25855 Modified Files: .cvsignore sources synergy.spec Log Message: Update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/synergy/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Jan 2005 14:52:55 -0000 1.3 +++ .cvsignore 31 Jan 2005 17:44:34 -0000 1.4 @@ -1 +1 @@ -synergy-1.2.1.tar.gz +synergy-1.2.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/synergy/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Jan 2005 14:52:55 -0000 1.3 +++ sources 31 Jan 2005 17:44:34 -0000 1.4 @@ -1 +1 @@ -6f004011141ccd3292798ec2a3aef2c2 synergy-1.2.1.tar.gz +d43fe74fc3aeb541bb38f0dceaffebb4 synergy-1.2.2.tar.gz Index: synergy.spec =================================================================== RCS file: /cvs/extras/rpms/synergy/devel/synergy.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- synergy.spec 13 Jan 2005 14:52:55 -0000 1.4 +++ synergy.spec 31 Jan 2005 17:44:34 -0000 1.5 @@ -1,6 +1,6 @@ Summary: Mouse and keyboard sharing utility Name: synergy -Version: 1.2.1 +Version: 1.2.2 Release: 1 License: GPL Group: System Environment/Daemons @@ -44,6 +44,9 @@ %changelog +* Mon Jan 31 2005 Matthias Saou 1.2.2-1 +- Update to 1.2.2. + * Thu Jan 13 2005 Matthias Saou 1.2.1-1 - Update to 1.2.1. From fedora-extras-commits at redhat.com Sat Jan 1 11:09:11 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 1 Jan 2005 06:09:11 -0500 Subject: rpms/perl-XML-RSS - New directory Message-ID: <200501011109.j01B9BkW021532@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/perl-XML-RSS In directory cvs.fedora.redhat.com:/tmp/cvs-serv21525/perl-XML-RSS Log Message: Directory /cvs/extras/rpms/perl-XML-RSS added to the repository From fedora-extras-commits at redhat.com Sat Jan 1 11:09:11 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 1 Jan 2005 06:09:11 -0500 Subject: rpms/perl-XML-RSS/devel - New directory Message-ID: <200501011109.j01B9BCB021535@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/perl-XML-RSS/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv21525/perl-XML-RSS/devel Log Message: Directory /cvs/extras/rpms/perl-XML-RSS/devel added to the repository From fedora-extras-commits at redhat.com Sat Jan 1 11:09:34 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 1 Jan 2005 06:09:34 -0500 Subject: rpms/perl-XML-RSS Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501011109.j01B9YLG021596@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/perl-XML-RSS In directory cvs.fedora.redhat.com:/tmp/cvs-serv21587 Added Files: Makefile import.log Log Message: Setup of module perl-XML-RSS --- NEW FILE Makefile --- # Top level Makefile for module perl-XML-RSS all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sat Jan 1 11:09:34 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 1 Jan 2005 06:09:34 -0500 Subject: rpms/perl-XML-RSS/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501011109.j01B9Y35021599@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/perl-XML-RSS/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv21587/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-XML-RSS --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Jan 1 11:10:19 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 1 Jan 2005 06:10:19 -0500 Subject: rpms/perl-XML-RSS import.log,1.1,1.2 Message-ID: <200501011110.j01BAJ7J021692@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/perl-XML-RSS In directory cvs.fedora.redhat.com:/tmp/cvs-serv21683 Modified Files: import.log Log Message: auto-import perl-XML-RSS-1.05-1 on branch devel from perl-XML-RSS-1.05-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-XML-RSS/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Jan 2005 11:09:32 -0000 1.1 +++ import.log 1 Jan 2005 11:10:17 -0000 1.2 @@ -0,0 +1 @@ +perl-XML-RSS-1_05-1:HEAD:perl-XML-RSS-1.05-1.src.rpm:1104577827 From fedora-extras-commits at redhat.com Sat Jan 1 11:10:19 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 1 Jan 2005 06:10:19 -0500 Subject: rpms/perl-XML-RSS/devel perl-XML-RSS.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501011110.j01BAJks021696@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/perl-XML-RSS/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv21683/devel Modified Files: .cvsignore sources Added Files: perl-XML-RSS.spec Log Message: auto-import perl-XML-RSS-1.05-1 on branch devel from perl-XML-RSS-1.05-1.src.rpm --- NEW FILE perl-XML-RSS.spec --- %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-XML-RSS Version: 1.05 Release: 1 Epoch: 0 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1, perl(Test::Manifest), perl(XML::Parser) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. %prep %setup -q -n XML-RSS-%{version} chmod 644 Changes README TODO find examples -type f -exec chmod 644 {} ';' find examples -type d -exec chmod 755 {} ';' %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check || : make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README TODO examples %{perl_vendorlib}/XML %{_mandir}/man3/*.3* %changelog * Sat Aug 14 2004 Ville Skytt?? - 0:1.05-0.fdr.1 - Update to 1.05, patches applied upstream. * Sun Jul 11 2004 Ville Skytt?? - 0:1.04-0.fdr.2 - Bring up to date with current fedora.us Perl spec template. * Sun Mar 14 2004 Ville Skytt?? - 0:1.04-0.fdr.1 - Update to 1.04. - Reduce directory ownership bloat. * Fri Nov 21 2003 Ville Skytt?? - 0:1.02-0.fdr.2 - Eliminate some spurious test warnings. * Sun Oct 12 2003 Ville Skytt?? - 0:1.02-0.fdr.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-XML-RSS/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jan 2005 11:09:32 -0000 1.1 +++ .cvsignore 1 Jan 2005 11:10:17 -0000 1.2 @@ -0,0 +1 @@ +XML-RSS-1.05.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-XML-RSS/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jan 2005 11:09:32 -0000 1.1 +++ sources 1 Jan 2005 11:10:17 -0000 1.2 @@ -0,0 +1 @@ +3eaa65ec6316edec3194b6a2f384a65c XML-RSS-1.05.tar.gz From fedora-extras-commits at redhat.com Sat Jan 1 12:15:09 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 07:15:09 -0500 Subject: rpms/bonnie++/devel bonnie++.spec,1.5,1.6 Message-ID: <200501011215.j01CF9oa022543@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/bonnie++/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22537 Modified Files: bonnie++.spec Log Message: Produce sane debuginfo package, #143422. Index: bonnie++.spec =================================================================== RCS file: /cvs/extras/rpms/bonnie++/devel/bonnie++.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- bonnie++.spec 10 Dec 2004 22:03:01 -0000 1.5 +++ bonnie++.spec 1 Jan 2005 12:15:07 -0000 1.6 @@ -1,6 +1,6 @@ Name: bonnie++ -Version: 1.03 -Release: 2.a +Version: 1.03a +Release: 3 Epoch: 0 Summary: Bonnie++ filesystem and disk benchmark & burn-in suite @@ -26,6 +26,7 @@ %prep %setup -q -n bonnie++-1.03a %patch -p0 +sed -i 's|${INSTALL}\s\+-s\b|${INSTALL}|' Makefile %build @@ -55,7 +56,11 @@ %changelog +* Mon Dec 20 2004 Ville Skytt?? - 0:1.03a-3 +- Let rpmbuild take care of stripping binaries. + * Sun May 18 2003 Warren Togami - 0:1.03-0.fdr.2.a - #267 Ville's docs, optflags and mandir patch + * Fri May 06 2003 Warren Togami - 0:1.03-0.fdr.1.a - Initial RPM release From fedora-extras-commits at redhat.com Sat Jan 1 12:31:30 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 07:31:30 -0500 Subject: rpms/icu - New directory Message-ID: <200501011231.j01CVUS5022668@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/icu In directory cvs.fedora.redhat.com:/tmp/cvs-serv22661/icu Log Message: Directory /cvs/extras/rpms/icu added to the repository From fedora-extras-commits at redhat.com Sat Jan 1 12:31:30 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 07:31:30 -0500 Subject: rpms/icu/devel - New directory Message-ID: <200501011231.j01CVUBe022671@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/icu/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22661/icu/devel Log Message: Directory /cvs/extras/rpms/icu/devel added to the repository From fedora-extras-commits at redhat.com Sat Jan 1 12:31:49 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 07:31:49 -0500 Subject: rpms/icu Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501011231.j01CVnuk022738@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/icu In directory cvs.fedora.redhat.com:/tmp/cvs-serv22729 Added Files: Makefile import.log Log Message: Setup of module icu --- NEW FILE Makefile --- # Top level Makefile for module icu all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 1 12:31:49 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 07:31:49 -0500 Subject: rpms/icu/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501011231.j01CVngY022741@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/icu/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22729/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module icu --- NEW 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 Jan 1 12:37:37 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 07:37:37 -0500 Subject: rpms/icu import.log,1.1,1.2 Message-ID: <200501011237.j01CbbJ2022857@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/icu In directory cvs.fedora.redhat.com:/tmp/cvs-serv22848 Modified Files: import.log Log Message: auto-import icu-3.2-1 on branch devel from icu-3.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/icu/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Jan 2005 12:31:47 -0000 1.1 +++ import.log 1 Jan 2005 12:37:35 -0000 1.2 @@ -0,0 +1 @@ +icu-3_2-1:HEAD:icu-3.2-1.src.rpm:1104583048 From fedora-extras-commits at redhat.com Sat Jan 1 12:37:37 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 07:37:37 -0500 Subject: rpms/icu/devel icu.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501011237.j01CbbME022861@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/icu/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22848/devel Modified Files: .cvsignore sources Added Files: icu.spec Log Message: auto-import icu-3.2-1 on branch devel from icu-3.2-1.src.rpm --- NEW FILE icu.spec --- # Notes: # - According to upstream, icu may trigger a gcc bug with -O2 which manifests # itself as failure in data/locales/ja.txt. This does not seem to occur # any more with icu 3.0 and gcc 3.3.[23], but in case it resurfaces, see # source/runConfigureICU for the upstream recommended C(XX)FLAGS # (-O3 and -O as of 3.0) and force use of them in the build section. Name: icu Version: 3.2 Release: 1 Summary: International Components for Unicode Group: Applications/Text License: X License URL: http://oss.software.ibm.com/icu/ Source: ftp://www-126.ibm.com/pub/icu/3.2/icu-3.2.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen graphviz %description The International Components for Unicode (ICU) libraries provide robust and full-featured Unicode services on a wide variety of platforms. ICU supports the most current version of the Unicode standard, and they provide support for supplementary Unicode characters (needed for GB 18030 repertoire support). As computing environments become more heterogeneous, software portability becomes more important. ICU lets you produce the same results across all the various platforms you support, without sacrificing performance. It offers great flexibility to extend and customize the supplied services. %package -n lib%{name} Summary: International Components for Unicode - libraries Group: System Environment/Libraries %description -n lib%{name} %{summary}. %package -n lib%{name}-devel Summary: Development files for International Components for Unicode Group: Development/Libraries Requires: lib%{name} = %{version}-%{release} %description -n lib%{name}-devel %{summary}. %package -n lib%{name}-doc Summary: Documentation for International Components for Unicode Group: Documentation %description -n lib%{name}-doc %{summary}. %prep %setup -q -n %{name} find . -name CVS -o -name .cvsignore | xargs -r rm -rf %{__perl} -pi -e 's/^(HAVE_DOT\b.*=).*$/$1 YES/' source/Doxyfile.in %build cd source %configure --enable-static --with-data-packaging=library --disable-samples make # %{?_smp_mflags} # -j(X>1) may "break" man pages as of 3.2, b.f.u #2357 make doc %install rm -rf $RPM_BUILD_ROOT source/__docs make -C source install DESTDIR=$RPM_BUILD_ROOT make -C source install-doc docdir=__docs chmod +x $RPM_BUILD_ROOT%{_libdir}/*.so.* %check || : make -C source check %clean rm -rf $RPM_BUILD_ROOT %post -n lib%{name} -p /sbin/ldconfig %postun -n lib%{name} -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc license.html readme.html %{_bindir}/derb %{_bindir}/genbrk %{_bindir}/gencnval %{_bindir}/genrb %{_bindir}/makeconv %{_bindir}/pkgdata %{_bindir}/uconv %{_sbindir}/* %{_mandir}/man1/derb.1* %{_mandir}/man1/gencnval.1* %{_mandir}/man1/genrb.1* %{_mandir}/man1/makeconv.1* %{_mandir}/man1/pkgdata.1* %{_mandir}/man1/uconv.1* %{_mandir}/man8/*.8* %files -n lib%{name} %defattr(-,root,root,-) %{_libdir}/*.so.* %files -n lib%{name}-devel %defattr(-,root,root,-) %{_bindir}/%{name}-config %{_mandir}/man1/%{name}-config.1* %{_includedir}/layout %{_includedir}/unicode %{_libdir}/*.a %{_libdir}/*.so %{_libdir}/%{name} %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/%{version} %{_datadir}/%{name}/%{version}/mkinstalldirs %{_datadir}/%{name}/%{version}/config %doc %{_datadir}/%{name}/%{version}/license.html %files -n lib%{name}-doc %defattr(-,root,root,-) %doc source/__docs/%{name}/html/* %changelog * Sat Jan 1 2005 Ville Skytt?? - 3.2-1 - Don't use %%{_smp_mflags} (b.f.u #2357). - Remove unnecessary Epochs. * Sat Dec 4 2004 Ville Skytt?? - 0:3.2-0.fdr.1 - Update to 3.2. * Sun Jul 18 2004 Ville Skytt?? - 0:3.0-0.fdr.1 - Update to 3.0, datadirs patch no longer needed. - Package data in shared libs, drop -locales subpackage. - Rename -docs subpackage to libicu-doc, and generate graphs with graphviz. * Sat Dec 13 2003 Ville Skytt?? - 0:2.6.1-0.fdr.3 - Partial fix for bad datadirs returned by icu-config (works as long as data packaging mode is not "common" or "dll"). * Sun Nov 23 2003 Ville Skytt?? - 0:2.6.1-0.fdr.2 - First complete version. * Sun Sep 28 2003 Ville Skytt?? - 0:2.6.1-0.fdr.1 - Update to 2.6.1. * Wed Aug 27 2003 Ville Skytt?? - 0:2.6-0.fdr.1 - First build, based on upstream and SuSE 8.2 packages. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/icu/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jan 2005 12:31:47 -0000 1.1 +++ .cvsignore 1 Jan 2005 12:37:35 -0000 1.2 @@ -0,0 +1 @@ +icu-3.2.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/icu/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jan 2005 12:31:47 -0000 1.1 +++ sources 1 Jan 2005 12:37:35 -0000 1.2 @@ -0,0 +1 @@ +55a85d2365338ece483d275119fd990c icu-3.2.tgz From fedora-extras-commits at redhat.com Sat Jan 1 12:57:17 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 07:57:17 -0500 Subject: rpms/perl-ExtUtils-CBuilder import.log,1.7,1.8 Message-ID: <200501011257.j01CvHoF023044@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder In directory cvs.fedora.redhat.com:/tmp/cvs-serv23034 Modified Files: import.log Log Message: auto-import perl-ExtUtils-CBuilder-0.06-0.fdr.1.rh90 on branch RHL-9 from perl-ExtUtils-CBuilder-0.06-0.fdr.1.rh90.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 8 Nov 2004 05:00:02 -0000 1.7 +++ import.log 1 Jan 2005 12:57:15 -0000 1.8 @@ -4,3 +4,4 @@ perl-ExtUtils-CBuilder-0_05-0_fdr_1_rh90:RHL-9:perl-ExtUtils-CBuilder-0.05-0.fdr.1.rh90.src.rpm:1099889984 perl-ExtUtils-CBuilder-0_05-0_fdr_1_1:FC-1:perl-ExtUtils-CBuilder-0.05-0.fdr.1.1.src.rpm:1099889993 perl-ExtUtils-CBuilder-0_05-0_fdr_1_2:HEAD:perl-ExtUtils-CBuilder-0.05-0.fdr.1.2.src.rpm:1099890002 +perl-ExtUtils-CBuilder-0_06-0_fdr_1_rh90:RHL-9:perl-ExtUtils-CBuilder-0.06-0.fdr.1.rh90.src.rpm:1104584228 From fedora-extras-commits at redhat.com Sat Jan 1 12:57:17 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 07:57:17 -0500 Subject: rpms/perl-ExtUtils-CBuilder/RHL-9 .cvsignore, 1.3, 1.4 perl-ExtUtils-CBuilder.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200501011257.j01CvH9M023047@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/RHL-9 In directory cvs.fedora.redhat.com:/tmp/cvs-serv23034/RHL-9 Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Log Message: auto-import perl-ExtUtils-CBuilder-0.06-0.fdr.1.rh90 on branch RHL-9 from perl-ExtUtils-CBuilder-0.06-0.fdr.1.rh90.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/RHL-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:59:44 -0000 1.3 +++ .cvsignore 1 Jan 2005 12:57:15 -0000 1.4 @@ -1 +1 @@ -ExtUtils-CBuilder-0.05.tar.gz +ExtUtils-CBuilder-0.06.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/RHL-9/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-ExtUtils-CBuilder.spec 8 Nov 2004 04:59:44 -0000 1.2 +++ perl-ExtUtils-CBuilder.spec 1 Jan 2005 12:57:15 -0000 1.3 @@ -1,7 +1,7 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-ExtUtils-CBuilder -Version: 0.05 +Version: 0.06 Release: 0.fdr.1.rh90 Epoch: 0 Summary: Compile and link C code for Perl modules @@ -9,12 +9,11 @@ Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/ExtUtils-CBuilder/ -Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.05.tar.gz +Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.06.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 -BuildRequires: perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -29,18 +28,20 @@ %build -%{__perl} Build.PL installdirs=vendor -./Build +%{__perl} Makefile.PL INSTALLDIRS=vendor +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -./Build install destdir=$RPM_BUILD_ROOT +make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check || : -./Build test +make test %clean @@ -55,6 +56,13 @@ %changelog +* Tue Dec 28 2004 Jose Pedro Oliveira - 0:0.06-0.fdr.1 +- Update to 0.06. + +* Mon Nov 29 2004 Ville Skytt?? - 0:0.05-1 +- Revert to building with ExtUtils::MakeMaker to eliminate a build + dependency loop with Module::Build. + * Fri Oct 15 2004 Jose Pedro Oliveira - 0:0.05-0.fdr.1 - Update to 0.05. - Building procedure: Makefile.PL -> Build.PL. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/RHL-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:59:44 -0000 1.3 +++ sources 1 Jan 2005 12:57:15 -0000 1.4 @@ -1 +1 @@ -5a2131578972da0b4914c92a39e6051d ExtUtils-CBuilder-0.05.tar.gz +3aef9536908deb4194583c3cfd5281b1 ExtUtils-CBuilder-0.06.tar.gz From fedora-extras-commits at redhat.com Sat Jan 1 12:58:08 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 07:58:08 -0500 Subject: rpms/perl-Test-MockObject import.log,1.4,1.5 Message-ID: <200501011258.j01Cw8u9023156@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Test-MockObject In directory cvs.fedora.redhat.com:/tmp/cvs-serv23145 Modified Files: import.log Log Message: auto-import perl-Test-MockObject-0.15-0.fdr.2.rh90 on branch RHL-9 from perl-Test-MockObject-0.15-0.fdr.2.rh90.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 8 Nov 2004 05:09:14 -0000 1.4 +++ import.log 1 Jan 2005 12:58:06 -0000 1.5 @@ -1,3 +1,4 @@ perl-Test-MockObject-0_14-0_fdr_1_rh90:HEAD:perl-Test-MockObject-0.14-0.fdr.1.rh90.src.rpm:1099890542 perl-Test-MockObject-0_14-0_fdr_1_1:HEAD:perl-Test-MockObject-0.14-0.fdr.1.1.src.rpm:1099890548 perl-Test-MockObject-0_14-0_fdr_1_2:HEAD:perl-Test-MockObject-0.14-0.fdr.1.2.src.rpm:1099890554 +perl-Test-MockObject-0_15-0_fdr_2_rh90:RHL-9:perl-Test-MockObject-0.15-0.fdr.2.rh90.src.rpm:1104584280 From fedora-extras-commits at redhat.com Sat Jan 1 12:58:08 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 07:58:08 -0500 Subject: rpms/perl-Test-MockObject/RHL-9 .cvsignore, 1.2, 1.3 perl-Test-MockObject.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200501011258.j01Cw8o0023160@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Test-MockObject/RHL-9 In directory cvs.fedora.redhat.com:/tmp/cvs-serv23145/RHL-9 Modified Files: .cvsignore perl-Test-MockObject.spec sources Log Message: auto-import perl-Test-MockObject-0.15-0.fdr.2.rh90 on branch RHL-9 from perl-Test-MockObject-0.15-0.fdr.2.rh90.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/RHL-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:09:02 -0000 1.2 +++ .cvsignore 1 Jan 2005 12:58:06 -0000 1.3 @@ -1 +1 @@ -Test-MockObject-0.14.tar.gz +Test-MockObject-0.15.tar.gz Index: perl-Test-MockObject.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/RHL-9/perl-Test-MockObject.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Test-MockObject.spec 8 Nov 2004 05:09:02 -0000 1.1 +++ perl-Test-MockObject.spec 1 Jan 2005 12:58:06 -0000 1.2 @@ -1,20 +1,20 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-Test-MockObject -Version: 0.14 -Release: 0.fdr.1.rh90 +Version: 0.15 +Release: 0.fdr.2.rh90 Epoch: 0 Summary: Perl extension for emulating troublesome interfaces Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Test-MockObject/ -Source: http://www.cpan.org/authors/id/C/CH/CHROMATIC/Test-MockObject-0.14.tar.gz +Source: http://www.cpan.org/authors/id/C/CH/CHROMATIC/Test-MockObject-0.15.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 -BuildRequires: perl(Scalar::Util), perl(Test::Builder), perl(Test::More) +BuildRequires: perl(Scalar::Util), perl(Test::Simple) >= 0.44 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -54,16 +54,22 @@ %files %defattr(-,root,root,-) %doc Changes README -%{perl_vendorlib}/* +%{perl_vendorlib}/Test/ %{_mandir}/man3/*.3* %changelog +* Tue Dec 28 2004 Jose Pedro Oliveira - 0:0.15-0.fdr.2 +- Build requires Test::Simple >= 0.44 (bug 2324). + +* Wed Dec 01 2004 Jose Pedro Oliveira - 0:0.15-0.fdr.1 +- Update to 0.15. + * Tue May 25 2004 Jose Pedro Oliveira - 0:0.14-0.fdr.1 - Update to 0.14. - Require perl >= 1:5.6.1 for vendor install dir support. - Use pure_install to avoid perllocal.pod workarounds. -- Moved make test to section %check. +- Moved make test to section %%check. * Wed Nov 19 2003 Ville Skytt?? - 0:0.12-0.fdr.1 - First build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/RHL-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:09:02 -0000 1.2 +++ sources 1 Jan 2005 12:58:06 -0000 1.3 @@ -1 +1 @@ -d64b366a3833eea8b6f5f8eabecb2a7f Test-MockObject-0.14.tar.gz +22f92c6e0797cc3e752293f1f26118ea Test-MockObject-0.15.tar.gz From fedora-extras-commits at redhat.com Sat Jan 1 12:59:13 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 07:59:13 -0500 Subject: rpms/perl-ExtUtils-CBuilder import.log,1.8,1.9 Message-ID: <200501011259.j01CxDib023266@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder In directory cvs.fedora.redhat.com:/tmp/cvs-serv23257 Modified Files: import.log Log Message: auto-import perl-ExtUtils-CBuilder-0.06-0.fdr.1.1 on branch FC-1 from perl-ExtUtils-CBuilder-0.06-0.fdr.1.1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 1 Jan 2005 12:57:15 -0000 1.8 +++ import.log 1 Jan 2005 12:59:11 -0000 1.9 @@ -5,3 +5,4 @@ perl-ExtUtils-CBuilder-0_05-0_fdr_1_1:FC-1:perl-ExtUtils-CBuilder-0.05-0.fdr.1.1.src.rpm:1099889993 perl-ExtUtils-CBuilder-0_05-0_fdr_1_2:HEAD:perl-ExtUtils-CBuilder-0.05-0.fdr.1.2.src.rpm:1099890002 perl-ExtUtils-CBuilder-0_06-0_fdr_1_rh90:RHL-9:perl-ExtUtils-CBuilder-0.06-0.fdr.1.rh90.src.rpm:1104584228 +perl-ExtUtils-CBuilder-0_06-0_fdr_1_1:FC-1:perl-ExtUtils-CBuilder-0.06-0.fdr.1.1.src.rpm:1104584345 From fedora-extras-commits at redhat.com Sat Jan 1 12:59:13 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 07:59:13 -0500 Subject: rpms/perl-ExtUtils-CBuilder/FC-1 .cvsignore, 1.3, 1.4 perl-ExtUtils-CBuilder.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200501011259.j01CxDoG023270@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-1 In directory cvs.fedora.redhat.com:/tmp/cvs-serv23257/FC-1 Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Log Message: auto-import perl-ExtUtils-CBuilder-0.06-0.fdr.1.1 on branch FC-1 from perl-ExtUtils-CBuilder-0.06-0.fdr.1.1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-1/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:59:53 -0000 1.3 +++ .cvsignore 1 Jan 2005 12:59:11 -0000 1.4 @@ -1 +1 @@ -ExtUtils-CBuilder-0.05.tar.gz +ExtUtils-CBuilder-0.06.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-1/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-ExtUtils-CBuilder.spec 8 Nov 2004 04:59:53 -0000 1.3 +++ perl-ExtUtils-CBuilder.spec 1 Jan 2005 12:59:11 -0000 1.4 @@ -1,7 +1,7 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-ExtUtils-CBuilder -Version: 0.05 +Version: 0.06 Release: 0.fdr.1.1 Epoch: 0 Summary: Compile and link C code for Perl modules @@ -9,12 +9,11 @@ Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/ExtUtils-CBuilder/ -Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.05.tar.gz +Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.06.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 -BuildRequires: perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -29,18 +28,20 @@ %build -%{__perl} Build.PL installdirs=vendor -./Build +%{__perl} Makefile.PL INSTALLDIRS=vendor +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -./Build install destdir=$RPM_BUILD_ROOT +make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check || : -./Build test +make test %clean @@ -55,6 +56,13 @@ %changelog +* Tue Dec 28 2004 Jose Pedro Oliveira - 0:0.06-0.fdr.1 +- Update to 0.06. + +* Mon Nov 29 2004 Ville Skytt?? - 0:0.05-1 +- Revert to building with ExtUtils::MakeMaker to eliminate a build + dependency loop with Module::Build. + * Fri Oct 15 2004 Jose Pedro Oliveira - 0:0.05-0.fdr.1 - Update to 0.05. - Building procedure: Makefile.PL -> Build.PL. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-1/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:59:53 -0000 1.3 +++ sources 1 Jan 2005 12:59:11 -0000 1.4 @@ -1 +1 @@ -5a2131578972da0b4914c92a39e6051d ExtUtils-CBuilder-0.05.tar.gz +3aef9536908deb4194583c3cfd5281b1 ExtUtils-CBuilder-0.06.tar.gz From fedora-extras-commits at redhat.com Sat Jan 1 13:00:23 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 08:00:23 -0500 Subject: rpms/perl-Test-MockObject import.log,1.5,1.6 Message-ID: <200501011300.j01D0NKD023383@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Test-MockObject In directory cvs.fedora.redhat.com:/tmp/cvs-serv23374 Modified Files: import.log Log Message: auto-import perl-Test-MockObject-0.15-0.fdr.2.1 on branch FC-1 from perl-Test-MockObject-0.15-0.fdr.2.1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 1 Jan 2005 12:58:06 -0000 1.5 +++ import.log 1 Jan 2005 13:00:21 -0000 1.6 @@ -2,3 +2,4 @@ perl-Test-MockObject-0_14-0_fdr_1_1:HEAD:perl-Test-MockObject-0.14-0.fdr.1.1.src.rpm:1099890548 perl-Test-MockObject-0_14-0_fdr_1_2:HEAD:perl-Test-MockObject-0.14-0.fdr.1.2.src.rpm:1099890554 perl-Test-MockObject-0_15-0_fdr_2_rh90:RHL-9:perl-Test-MockObject-0.15-0.fdr.2.rh90.src.rpm:1104584280 +perl-Test-MockObject-0_15-0_fdr_2_1:FC-1:perl-Test-MockObject-0.15-0.fdr.2.1.src.rpm:1104584414 From fedora-extras-commits at redhat.com Sat Jan 1 13:00:23 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 08:00:23 -0500 Subject: rpms/perl-Test-MockObject/FC-1 .cvsignore, 1.2, 1.3 perl-Test-MockObject.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200501011300.j01D0NKO023387@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Test-MockObject/FC-1 In directory cvs.fedora.redhat.com:/tmp/cvs-serv23374/FC-1 Modified Files: .cvsignore perl-Test-MockObject.spec sources Log Message: auto-import perl-Test-MockObject-0.15-0.fdr.2.1 on branch FC-1 from perl-Test-MockObject-0.15-0.fdr.2.1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-1/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:09:02 -0000 1.2 +++ .cvsignore 1 Jan 2005 13:00:21 -0000 1.3 @@ -1 +1 @@ -Test-MockObject-0.14.tar.gz +Test-MockObject-0.15.tar.gz Index: perl-Test-MockObject.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-1/perl-Test-MockObject.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Test-MockObject.spec 8 Nov 2004 05:09:08 -0000 1.2 +++ perl-Test-MockObject.spec 1 Jan 2005 13:00:21 -0000 1.3 @@ -1,20 +1,20 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-Test-MockObject -Version: 0.14 -Release: 0.fdr.1.1 +Version: 0.15 +Release: 0.fdr.2.1 Epoch: 0 Summary: Perl extension for emulating troublesome interfaces Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Test-MockObject/ -Source: http://www.cpan.org/authors/id/C/CH/CHROMATIC/Test-MockObject-0.14.tar.gz +Source: http://www.cpan.org/authors/id/C/CH/CHROMATIC/Test-MockObject-0.15.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 -BuildRequires: perl(Scalar::Util), perl(Test::Builder), perl(Test::More) +BuildRequires: perl(Scalar::Util), perl(Test::Simple) >= 0.44 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -54,16 +54,22 @@ %files %defattr(-,root,root,-) %doc Changes README -%{perl_vendorlib}/* +%{perl_vendorlib}/Test/ %{_mandir}/man3/*.3* %changelog +* Tue Dec 28 2004 Jose Pedro Oliveira - 0:0.15-0.fdr.2 +- Build requires Test::Simple >= 0.44 (bug 2324). + +* Wed Dec 01 2004 Jose Pedro Oliveira - 0:0.15-0.fdr.1 +- Update to 0.15. + * Tue May 25 2004 Jose Pedro Oliveira - 0:0.14-0.fdr.1 - Update to 0.14. - Require perl >= 1:5.6.1 for vendor install dir support. - Use pure_install to avoid perllocal.pod workarounds. -- Moved make test to section %check. +- Moved make test to section %%check. * Wed Nov 19 2003 Ville Skytt?? - 0:0.12-0.fdr.1 - First build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-1/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:09:02 -0000 1.2 +++ sources 1 Jan 2005 13:00:21 -0000 1.3 @@ -1 +1 @@ -d64b366a3833eea8b6f5f8eabecb2a7f Test-MockObject-0.14.tar.gz +22f92c6e0797cc3e752293f1f26118ea Test-MockObject-0.15.tar.gz From fedora-extras-commits at redhat.com Sat Jan 1 13:02:00 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 08:02:00 -0500 Subject: rpms/perl-ExtUtils-CBuilder import.log,1.9,1.10 Message-ID: <200501011302.j01D20jH024083@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder In directory cvs.fedora.redhat.com:/tmp/cvs-serv24074 Modified Files: import.log Log Message: auto-import perl-ExtUtils-CBuilder-0.06-0.fdr.1.2 on branch FC-2 from perl-ExtUtils-CBuilder-0.06-0.fdr.1.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/import.log,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- import.log 1 Jan 2005 12:59:11 -0000 1.9 +++ import.log 1 Jan 2005 13:01:58 -0000 1.10 @@ -6,3 +6,4 @@ perl-ExtUtils-CBuilder-0_05-0_fdr_1_2:HEAD:perl-ExtUtils-CBuilder-0.05-0.fdr.1.2.src.rpm:1099890002 perl-ExtUtils-CBuilder-0_06-0_fdr_1_rh90:RHL-9:perl-ExtUtils-CBuilder-0.06-0.fdr.1.rh90.src.rpm:1104584228 perl-ExtUtils-CBuilder-0_06-0_fdr_1_1:FC-1:perl-ExtUtils-CBuilder-0.06-0.fdr.1.1.src.rpm:1104584345 +perl-ExtUtils-CBuilder-0_06-0_fdr_1_2:FC-2:perl-ExtUtils-CBuilder-0.06-0.fdr.1.2.src.rpm:1104584511 From fedora-extras-commits at redhat.com Sat Jan 1 13:02:00 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 08:02:00 -0500 Subject: rpms/perl-ExtUtils-CBuilder/FC-2 .cvsignore, 1.3, 1.4 perl-ExtUtils-CBuilder.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200501011302.j01D20Yf024087@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv24074/FC-2 Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Log Message: auto-import perl-ExtUtils-CBuilder-0.06-0.fdr.1.2 on branch FC-2 from perl-ExtUtils-CBuilder-0.06-0.fdr.1.2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-2/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 05:00:02 -0000 1.3 +++ .cvsignore 1 Jan 2005 13:01:58 -0000 1.4 @@ -1 +1 @@ -ExtUtils-CBuilder-0.05.tar.gz +ExtUtils-CBuilder-0.06.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-2/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-ExtUtils-CBuilder.spec 8 Nov 2004 05:00:02 -0000 1.4 +++ perl-ExtUtils-CBuilder.spec 1 Jan 2005 13:01:58 -0000 1.5 @@ -1,7 +1,7 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-ExtUtils-CBuilder -Version: 0.05 +Version: 0.06 Release: 0.fdr.1.2 Epoch: 0 Summary: Compile and link C code for Perl modules @@ -9,12 +9,11 @@ Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/ExtUtils-CBuilder/ -Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.05.tar.gz +Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.06.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 -BuildRequires: perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -29,18 +28,20 @@ %build -%{__perl} Build.PL installdirs=vendor -./Build +%{__perl} Makefile.PL INSTALLDIRS=vendor +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -./Build install destdir=$RPM_BUILD_ROOT +make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check || : -./Build test +make test %clean @@ -55,6 +56,13 @@ %changelog +* Tue Dec 28 2004 Jose Pedro Oliveira - 0:0.06-0.fdr.1 +- Update to 0.06. + +* Mon Nov 29 2004 Ville Skytt?? - 0:0.05-1 +- Revert to building with ExtUtils::MakeMaker to eliminate a build + dependency loop with Module::Build. + * Fri Oct 15 2004 Jose Pedro Oliveira - 0:0.05-0.fdr.1 - Update to 0.05. - Building procedure: Makefile.PL -> Build.PL. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-2/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 05:00:02 -0000 1.3 +++ sources 1 Jan 2005 13:01:58 -0000 1.4 @@ -1 +1 @@ -5a2131578972da0b4914c92a39e6051d ExtUtils-CBuilder-0.05.tar.gz +3aef9536908deb4194583c3cfd5281b1 ExtUtils-CBuilder-0.06.tar.gz From fedora-extras-commits at redhat.com Sat Jan 1 13:03:24 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 08:03:24 -0500 Subject: rpms/perl-Test-MockObject import.log,1.6,1.7 Message-ID: <200501011303.j01D3O5Y024209@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Test-MockObject In directory cvs.fedora.redhat.com:/tmp/cvs-serv24200 Modified Files: import.log Log Message: auto-import perl-Test-MockObject-0.15-0.fdr.2.2 on branch FC-2 from perl-Test-MockObject-0.15-0.fdr.2.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 1 Jan 2005 13:00:21 -0000 1.6 +++ import.log 1 Jan 2005 13:03:22 -0000 1.7 @@ -3,3 +3,4 @@ perl-Test-MockObject-0_14-0_fdr_1_2:HEAD:perl-Test-MockObject-0.14-0.fdr.1.2.src.rpm:1099890554 perl-Test-MockObject-0_15-0_fdr_2_rh90:RHL-9:perl-Test-MockObject-0.15-0.fdr.2.rh90.src.rpm:1104584280 perl-Test-MockObject-0_15-0_fdr_2_1:FC-1:perl-Test-MockObject-0.15-0.fdr.2.1.src.rpm:1104584414 +perl-Test-MockObject-0_15-0_fdr_2_2:FC-2:perl-Test-MockObject-0.15-0.fdr.2.2.src.rpm:1104584595 From fedora-extras-commits at redhat.com Sat Jan 1 13:03:24 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 08:03:24 -0500 Subject: rpms/perl-Test-MockObject/FC-2 .cvsignore, 1.2, 1.3 perl-Test-MockObject.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200501011303.j01D3Oj2024213@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Test-MockObject/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv24200/FC-2 Modified Files: .cvsignore perl-Test-MockObject.spec sources Log Message: auto-import perl-Test-MockObject-0.15-0.fdr.2.2 on branch FC-2 from perl-Test-MockObject-0.15-0.fdr.2.2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-2/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:09:02 -0000 1.2 +++ .cvsignore 1 Jan 2005 13:03:22 -0000 1.3 @@ -1 +1 @@ -Test-MockObject-0.14.tar.gz +Test-MockObject-0.15.tar.gz Index: perl-Test-MockObject.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-2/perl-Test-MockObject.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Test-MockObject.spec 8 Nov 2004 05:09:14 -0000 1.3 +++ perl-Test-MockObject.spec 1 Jan 2005 13:03:22 -0000 1.4 @@ -1,20 +1,20 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-Test-MockObject -Version: 0.14 -Release: 0.fdr.1.2 +Version: 0.15 +Release: 0.fdr.2.2 Epoch: 0 Summary: Perl extension for emulating troublesome interfaces Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Test-MockObject/ -Source: http://www.cpan.org/authors/id/C/CH/CHROMATIC/Test-MockObject-0.14.tar.gz +Source: http://www.cpan.org/authors/id/C/CH/CHROMATIC/Test-MockObject-0.15.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 -BuildRequires: perl(Scalar::Util), perl(Test::Builder), perl(Test::More) +BuildRequires: perl(Scalar::Util), perl(Test::Simple) >= 0.44 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -54,16 +54,22 @@ %files %defattr(-,root,root,-) %doc Changes README -%{perl_vendorlib}/* +%{perl_vendorlib}/Test/ %{_mandir}/man3/*.3* %changelog +* Tue Dec 28 2004 Jose Pedro Oliveira - 0:0.15-0.fdr.2 +- Build requires Test::Simple >= 0.44 (bug 2324). + +* Wed Dec 01 2004 Jose Pedro Oliveira - 0:0.15-0.fdr.1 +- Update to 0.15. + * Tue May 25 2004 Jose Pedro Oliveira - 0:0.14-0.fdr.1 - Update to 0.14. - Require perl >= 1:5.6.1 for vendor install dir support. - Use pure_install to avoid perllocal.pod workarounds. -- Moved make test to section %check. +- Moved make test to section %%check. * Wed Nov 19 2003 Ville Skytt?? - 0:0.12-0.fdr.1 - First build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-2/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:09:02 -0000 1.2 +++ sources 1 Jan 2005 13:03:22 -0000 1.3 @@ -1 +1 @@ -d64b366a3833eea8b6f5f8eabecb2a7f Test-MockObject-0.14.tar.gz +22f92c6e0797cc3e752293f1f26118ea Test-MockObject-0.15.tar.gz From fedora-extras-commits at redhat.com Sat Jan 1 13:15:02 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 08:15:02 -0500 Subject: rpms/perl-ExtUtils-CBuilder/devel .cvsignore, 1.3, 1.4 perl-ExtUtils-CBuilder.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200501011315.j01DF20v024389@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24383 Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Log Message: Sync with 0.06-0.fdr.1 from Jose. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 05:00:02 -0000 1.3 +++ .cvsignore 1 Jan 2005 13:15:00 -0000 1.4 @@ -1 +1 @@ -ExtUtils-CBuilder-0.05.tar.gz +ExtUtils-CBuilder-0.06.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-ExtUtils-CBuilder.spec 29 Nov 2004 19:27:00 -0000 1.5 +++ perl-ExtUtils-CBuilder.spec 1 Jan 2005 13:15:00 -0000 1.6 @@ -1,7 +1,7 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-ExtUtils-CBuilder -Version: 0.05 +Version: 0.06 Release: 1 Epoch: 0 Summary: Compile and link C code for Perl modules @@ -9,7 +9,7 @@ Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/ExtUtils-CBuilder/ -Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.05.tar.gz +Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.06.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -56,6 +56,9 @@ %changelog +* Tue Dec 28 2004 Jose Pedro Oliveira - 0:0.06-1 +- Update to 0.06. + * Mon Nov 29 2004 Ville Skytt?? - 0:0.05-1 - Revert to building with ExtUtils::MakeMaker to eliminate a build dependency loop with Module::Build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 05:00:02 -0000 1.3 +++ sources 1 Jan 2005 13:15:00 -0000 1.4 @@ -1 +1 @@ -5a2131578972da0b4914c92a39e6051d ExtUtils-CBuilder-0.05.tar.gz +3aef9536908deb4194583c3cfd5281b1 ExtUtils-CBuilder-0.06.tar.gz From fedora-extras-commits at redhat.com Sat Jan 1 13:17:39 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 1 Jan 2005 08:17:39 -0500 Subject: rpms/perl-Test-MockObject/devel .cvsignore, 1.2, 1.3 perl-Test-MockObject.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200501011317.j01DHd96024442@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Test-MockObject/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24436 Modified Files: .cvsignore perl-Test-MockObject.spec sources Log Message: Sync with 0.15-0.fdr.2 from Jose. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:09:02 -0000 1.2 +++ .cvsignore 1 Jan 2005 13:17:37 -0000 1.3 @@ -1 +1 @@ -Test-MockObject-0.14.tar.gz +Test-MockObject-0.15.tar.gz Index: perl-Test-MockObject.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/perl-Test-MockObject.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Test-MockObject.spec 10 Dec 2004 22:03:09 -0000 1.4 +++ perl-Test-MockObject.spec 1 Jan 2005 13:17:37 -0000 1.5 @@ -1,20 +1,20 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-Test-MockObject -Version: 0.14 -Release: 1 +Version: 0.15 +Release: 2 Epoch: 0 Summary: Perl extension for emulating troublesome interfaces Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Test-MockObject/ -Source: http://www.cpan.org/authors/id/C/CH/CHROMATIC/Test-MockObject-0.14.tar.gz +Source: http://www.cpan.org/authors/id/C/CH/CHROMATIC/Test-MockObject-0.15.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 -BuildRequires: perl(Scalar::Util), perl(Test::Builder), perl(Test::More) +BuildRequires: perl(Scalar::Util), perl(Test::Simple) >= 0.44 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -54,16 +54,22 @@ %files %defattr(-,root,root,-) %doc Changes README -%{perl_vendorlib}/* +%{perl_vendorlib}/Test/ %{_mandir}/man3/*.3* %changelog +* Tue Dec 28 2004 Jose Pedro Oliveira - 0:0.15-2 +- Build requires Test::Simple >= 0.44 (bug 2324). + +* Wed Dec 01 2004 Jose Pedro Oliveira - 0:0.15-0.fdr.1 +- Update to 0.15. + * Tue May 25 2004 Jose Pedro Oliveira - 0:0.14-0.fdr.1 - Update to 0.14. - Require perl >= 1:5.6.1 for vendor install dir support. - Use pure_install to avoid perllocal.pod workarounds. -- Moved make test to section %check. +- Moved make test to section %%check. * Wed Nov 19 2003 Ville Skytt?? - 0:0.12-0.fdr.1 - First build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:09:02 -0000 1.2 +++ sources 1 Jan 2005 13:17:37 -0000 1.3 @@ -1 +1 @@ -d64b366a3833eea8b6f5f8eabecb2a7f Test-MockObject-0.14.tar.gz +22f92c6e0797cc3e752293f1f26118ea Test-MockObject-0.15.tar.gz From fedora-extras-commits at redhat.com Tue Jan 4 23:23:54 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 4 Jan 2005 18:23:54 -0500 Subject: rpms/bash-completion/devel bash-completion-openssl-cnf.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 bash-completion.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200501042323.j04NNsiL030993@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/bash-completion/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv30987 Modified Files: .cvsignore bash-completion.spec sources Added Files: bash-completion-openssl-cnf.patch Log Message: Update to 20050103. bash-completion-openssl-cnf.patch: --- NEW FILE bash-completion-openssl-cnf.patch --- --- bash_completion~ 2005-01-04 08:37:42.000000000 +0200 +++ bash_completion 2005-01-05 01:16:06.683299242 +0200 @@ -3179,6 +3179,7 @@ local config config=/etc/ssl/openssl.cnf + [ ! -f $config ] && config=/usr/share/ssl/openssl.cnf for (( i=2; i < COMP_CWORD; i++ )); do if [[ "${COMP_WORDS[i]}" == -config ]]; then config=${COMP_WORDS[i+1]} Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bash-completion/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:05:13 -0000 1.3 +++ .cvsignore 4 Jan 2005 23:23:51 -0000 1.4 @@ -1 +1 @@ -bash-completion-20041017.tar.bz2 +bash-completion-20050103.tar.bz2 Index: bash-completion.spec =================================================================== RCS file: /cvs/extras/rpms/bash-completion/devel/bash-completion.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bash-completion.spec 27 Nov 2004 15:44:30 -0000 1.3 +++ bash-completion.spec 4 Jan 2005 23:23:51 -0000 1.4 @@ -1,14 +1,15 @@ Name: bash-completion -Version: 20041017 -Release: 5 +Version: 20050103 +Release: 1 Epoch: 0 Summary: Programmable completion for Bash Group: System Environment/Shells License: GPL URL: http://www.caliban.org/bash/ -Source0: http://www.caliban.org/files/bash/bash-completion-20041017.tar.bz2 +Source0: http://www.caliban.org/files/bash/bash-completion-20050103.tar.bz2 Source1: %{name}.profile +Patch0: %{name}-openssl-cnf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -21,6 +22,7 @@ %prep %setup -q -n bash_completion +%patch0 %build @@ -128,6 +130,9 @@ %changelog +* Wed Jan 5 2005 Ville Skytt?? - 0:20050103-1 +- Update to 20050103. + * Sat Nov 27 2004 Ville Skytt?? - 0:20041017-5 - Change version scheme, bump release to provide Extras upgrade path. Index: sources =================================================================== RCS file: /cvs/extras/rpms/bash-completion/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:05:13 -0000 1.3 +++ sources 4 Jan 2005 23:23:51 -0000 1.4 @@ -1 +1 @@ -3fd0836127d01606a9dc4262f3e2e1fb bash-completion-20041017.tar.bz2 +0ee7009b18ff862f8a63c2395e5fd100 bash-completion-20050103.tar.bz2 From fedora-extras-commits at redhat.com Wed Jan 5 09:19:05 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 5 Jan 2005 04:19:05 -0500 Subject: rpms/xdesktopwaves - New directory Message-ID: <200501050919.j059J5cG006082@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/xdesktopwaves In directory cvs.fedora.redhat.com:/tmp/cvs-serv6075/xdesktopwaves Log Message: Directory /cvs/extras/rpms/xdesktopwaves added to the repository From fedora-extras-commits at redhat.com Wed Jan 5 09:19:05 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 5 Jan 2005 04:19:05 -0500 Subject: rpms/xdesktopwaves/devel - New directory Message-ID: <200501050919.j059J5S1006085@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/xdesktopwaves/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv6075/xdesktopwaves/devel Log Message: Directory /cvs/extras/rpms/xdesktopwaves/devel added to the repository From fedora-extras-commits at redhat.com Wed Jan 5 09:19:28 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 5 Jan 2005 04:19:28 -0500 Subject: rpms/xdesktopwaves Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501050919.j059JS6m006144@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/xdesktopwaves In directory cvs.fedora.redhat.com:/tmp/cvs-serv6135 Added Files: Makefile import.log Log Message: Setup of module xdesktopwaves --- NEW FILE Makefile --- # Top level Makefile for module xdesktopwaves all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 5 09:19:28 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 5 Jan 2005 04:19:28 -0500 Subject: rpms/xdesktopwaves/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501050919.j059JSgU006147@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/xdesktopwaves/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv6135/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xdesktopwaves --- NEW 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 Jan 5 09:20:17 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 5 Jan 2005 04:20:17 -0500 Subject: rpms/xdesktopwaves import.log,1.1,1.2 Message-ID: <200501050920.j059KHjW006240@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/xdesktopwaves In directory cvs.fedora.redhat.com:/tmp/cvs-serv6231 Modified Files: import.log Log Message: auto-import xdesktopwaves-1.2-1 on branch devel from xdesktopwaves-1.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xdesktopwaves/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 Jan 2005 09:19:26 -0000 1.1 +++ import.log 5 Jan 2005 09:20:15 -0000 1.2 @@ -0,0 +1 @@ +xdesktopwaves-1_2-1:HEAD:xdesktopwaves-1.2-1.src.rpm:1104916833 From fedora-extras-commits at redhat.com Wed Jan 5 09:20:17 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 5 Jan 2005 04:20:17 -0500 Subject: rpms/xdesktopwaves/devel xdesktopwaves.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501050920.j059KHrP006244@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/xdesktopwaves/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv6231/devel Modified Files: .cvsignore sources Added Files: xdesktopwaves.spec Log Message: auto-import xdesktopwaves-1.2-1 on branch devel from xdesktopwaves-1.2-1.src.rpm --- NEW FILE xdesktopwaves.spec --- # $Id: xdesktopwaves.spec,v 1.4 2004/12/07 07:32:08 adrian Exp $ Name: xdesktopwaves Version: 1.2 Release: 1 Summary: Simulation of water waves on the X Window System desktop License: GPL Group: Amusements/Graphics URL: http://xdesktopwaves.sf.net/ Source: http://dl.sf.net/xdesktopwaves/xdesktopwaves-1.2.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xorg-x11-devel, desktop-file-utils %description xdesktopwaves is a cellular automata setting the background of your X Window System desktop under water. Windows and mouse are like ships on the sea. Each movement of these ends up in moving water waves. You can even have rain and/or storm stirring up the water. %prep %setup -q %build %{__make} CFLAGS="$RPM_OPT_FLAGS -I/usr/X11R6/include" \ LFLAGS="-L/usr/X11R6/%{_lib}" %{?_smp_mflags} %install %{__rm} -rf $RPM_BUILD_ROOT %{__mkdir_p} $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1} %{__mkdir_p} $RPM_BUILD_ROOT{%{_datadir}/applications,%{_datadir}/pixmaps} %{__make} install BINDIR=$RPM_BUILD_ROOT%{_bindir} MAN1DIR=$RPM_BUILD_ROOT%{_mandir}/man1 %{__cp} -p %{name}.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps cat > %{name}.desktop < - 1.2-1 - Make with proper LFLAGS to support /usr/X11R6/lib64 location (fix confirmed as necessary via Matthias Saou's package). * Tue Dec 07 2004 Adrian Reber - 0:1.2-0.fdr.1 - updated to 1.2 * Mon Nov 22 2004 Adrian Reber - 0:1.0-0.fdr.1 - initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xdesktopwaves/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Jan 2005 09:19:26 -0000 1.1 +++ .cvsignore 5 Jan 2005 09:20:15 -0000 1.2 @@ -0,0 +1 @@ +xdesktopwaves-1.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xdesktopwaves/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Jan 2005 09:19:26 -0000 1.1 +++ sources 5 Jan 2005 09:20:15 -0000 1.2 @@ -0,0 +1 @@ +a91384eab6050402fd2112124ea7c8bb xdesktopwaves-1.2.tar.gz From fedora-extras-commits at redhat.com Wed Jan 5 18:56:27 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 5 Jan 2005 13:56:27 -0500 Subject: rpms/starfighter/devel starfighter.spec,1.2,1.3 Message-ID: <200501051856.j05IuRtM014082@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/starfighter/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv14073 Modified Files: starfighter.spec Log Message: Minor fix for the desktop file. Index: starfighter.spec =================================================================== RCS file: /cvs/extras/rpms/starfighter/devel/starfighter.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- starfighter.spec 16 Nov 2004 18:56:55 -0000 1.2 +++ starfighter.spec 5 Jan 2005 18:56:25 -0000 1.3 @@ -9,7 +9,7 @@ Summary: Project: Starfighter, a space arcade game Name: starfighter Version: 1.1 -Release: 2 +Release: 3 License: GPL Group: Amusements/Games URL: http://www.parallelrealities.co.uk/starfighter.php @@ -63,10 +63,10 @@ Encoding=UTF-8 EOF -%if %{!?_without_freedesktop:1}0 +%if 0%{!?_without_freedesktop:1} %{__mkdir_p} %{buildroot}%{_datadir}/applications desktop-file-install \ - --vendor %{desktop_vendor} \ + --vendor fedora \ --dir %{buildroot}%{_datadir}/applications \ %{name}.desktop %else @@ -86,13 +86,16 @@ %{_prefix}/share/games/starfighter %{_datadir}/pixmaps/starfighter.png %if %{!?_without_freedesktop:1}0 -%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop +%{_datadir}/applications/fedora-%{name}.desktop %else %{_sysconfdir}/X11/applnk/Games/%{name}.desktop %endif %changelog +* Wed Jan 5 2005 Matthias Saou 1.1-3 +- Fix desktop_vendor in the desktop file name (#143285). + * Tue Nov 16 2004 Matthias Saou 1.1-2 - Bump release to provide Extras upgrade path. From fedora-extras-commits at redhat.com Wed Jan 5 19:32:37 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 5 Jan 2005 14:32:37 -0500 Subject: rpms/perl-Module-CoreList - New directory Message-ID: <200501051932.j05JWbeg014809@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Module-CoreList In directory cvs.fedora.redhat.com:/tmp/cvs-serv14802/perl-Module-CoreList Log Message: Directory /cvs/extras/rpms/perl-Module-CoreList added to the repository From fedora-extras-commits at redhat.com Wed Jan 5 19:32:37 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 5 Jan 2005 14:32:37 -0500 Subject: rpms/perl-Module-CoreList/devel - New directory Message-ID: <200501051932.j05JWbBk014812@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Module-CoreList/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv14802/perl-Module-CoreList/devel Log Message: Directory /cvs/extras/rpms/perl-Module-CoreList/devel added to the repository From fedora-extras-commits at redhat.com Wed Jan 5 19:32:55 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 5 Jan 2005 14:32:55 -0500 Subject: rpms/perl-Module-CoreList Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501051932.j05JWtQM014871@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Module-CoreList In directory cvs.fedora.redhat.com:/tmp/cvs-serv14862 Added Files: Makefile import.log Log Message: Setup of module perl-Module-CoreList --- NEW FILE Makefile --- # Top level Makefile for module perl-Module-CoreList all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 5 19:32:55 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 5 Jan 2005 14:32:55 -0500 Subject: rpms/perl-Module-CoreList/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501051932.j05JWtSX014874@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Module-CoreList/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv14862/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Module-CoreList --- NEW 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 Jan 5 19:33:26 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 5 Jan 2005 14:33:26 -0500 Subject: rpms/perl-Module-CoreList import.log,1.1,1.2 Message-ID: <200501051933.j05JXQkg014967@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Module-CoreList In directory cvs.fedora.redhat.com:/tmp/cvs-serv14958 Modified Files: import.log Log Message: auto-import perl-Module-CoreList-1.98-2 on branch devel from perl-Module-CoreList-1.98-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Module-CoreList/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 Jan 2005 19:32:53 -0000 1.1 +++ import.log 5 Jan 2005 19:33:24 -0000 1.2 @@ -0,0 +1 @@ +perl-Module-CoreList-1_98-2:HEAD:perl-Module-CoreList-1.98-2.src.rpm:1104953598 From fedora-extras-commits at redhat.com Wed Jan 5 19:33:26 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 5 Jan 2005 14:33:26 -0500 Subject: rpms/perl-Module-CoreList/devel perl-Module-CoreList.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501051933.j05JXQB0014971@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Module-CoreList/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv14958/devel Modified Files: .cvsignore sources Added Files: perl-Module-CoreList.spec Log Message: auto-import perl-Module-CoreList-1.98-2 on branch devel from perl-Module-CoreList-1.98-2.src.rpm --- NEW FILE perl-Module-CoreList.spec --- %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-Module-CoreList Version: 1.98 Release: 2 Epoch: 0 Summary: Perl core modules indexed by perl versions Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Module-CoreList/ Source0: http://www.cpan.org/authors/id/R/RC/RCLAMP/Module-CoreList-1.98.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 BuildRequires: perl(Module::Build), perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Module::CoreList contains the hash of hashes %Module::CoreList::version, this is keyed on perl version as indicated in $]. The second level hash is module => version pairs. %prep %setup -q -n Module-CoreList-%{version} %{__perl} -pi -e 's{^#!/usr/local/perl5.6.1/bin/perl\b}{#!%{__perl}}' identify-dependencies %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT chmod -R u+w $RPM_BUILD_ROOT/* %check || : ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README identify-dependencies %{_bindir}/* %{perl_vendorlib}/Module/ %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %changelog * Tue Jan 04 2005 Jose Pedro Oliveira - 0:1.98-2 - BuildRequires: perl(Module::Build) (#2362). * Mon Jan 03 2005 Jose Pedro Oliveira - 0:1.98-0.fdr.1 - Update to 1.98. * Thu Dec 23 2004 Jose Pedro Oliveira - 0:1.97-0.fdr.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-CoreList/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Jan 2005 19:32:53 -0000 1.1 +++ .cvsignore 5 Jan 2005 19:33:24 -0000 1.2 @@ -0,0 +1 @@ +Module-CoreList-1.98.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-CoreList/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Jan 2005 19:32:53 -0000 1.1 +++ sources 5 Jan 2005 19:33:24 -0000 1.2 @@ -0,0 +1 @@ +ef50707fb0126e855771313c75f98bee Module-CoreList-1.98.tar.gz From fedora-extras-commits at redhat.com Thu Jan 6 09:07:10 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 6 Jan 2005 04:07:10 -0500 Subject: rpms/vpnc/devel vpnc-0.3.2-64bit.patch,NONE,1.1 vpnc.spec,1.2,1.3 Message-ID: <200501060907.j0697An9025928@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/vpnc/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25916 Modified Files: vpnc.spec Added Files: vpnc-0.3.2-64bit.patch Log Message: Fix 64bit vpnc-0.3.2-64bit.patch: --- NEW FILE vpnc-0.3.2-64bit.patch --- diff -ur /var/zab/src/vpnc-0.3.2/config.c vpnc-0.3.2/config.c --- /var/zab/src/vpnc-0.3.2/config.c 2004-11-21 16:11:48.000000000 -0800 +++ vpnc-0.3.2/config.c 2005-01-04 09:58:35.000000000 -0800 @@ -352,7 +352,7 @@ const char *p, *q; for (p = text, q = strchr(p, '\n'); q; p = q+1, q = strchr(p, '\n')) - printf("%s%.*s\n", pre, q-p, p); + printf("%s%.*s\n", pre, (int)(q-p), p); if (*p != '\0') printf("%s%s\n", pre, p); @@ -423,8 +423,9 @@ void do_config(int argc, char **argv) { char *s; - int i, c, known, s_len; + int i, c, known; int print_config = 0; + size_t s_len; for (i = 1; i < argc; i++) { if (argv[i][0] != '-') { diff -ur /var/zab/src/vpnc-0.3.2/isakmp-pkt.c vpnc-0.3.2/isakmp-pkt.c --- /var/zab/src/vpnc-0.3.2/isakmp-pkt.c 2004-11-21 14:15:41.000000000 -0800 +++ vpnc-0.3.2/isakmp-pkt.c 2005-01-04 09:56:31.000000000 -0800 @@ -293,14 +293,14 @@ struct isakmp_payload *new_isakmp_payload(uint8_t type) { - struct isakmp_payload *result = xallocc(sizeof(struct isakmp_packet)); + struct isakmp_payload *result = xallocc(sizeof(struct isakmp_payload)); result->type = type; return result; } struct isakmp_payload *new_isakmp_data_payload(uint8_t type, const void *data, size_t data_length) { - struct isakmp_payload *result = xallocc(sizeof(struct isakmp_packet)); + struct isakmp_payload *result = xallocc(sizeof(struct isakmp_payload)); if (type != ISAKMP_PAYLOAD_KE && type != ISAKMP_PAYLOAD_HASH && type != ISAKMP_PAYLOAD_SIG && type != ISAKMP_PAYLOAD_NONCE @@ -697,7 +697,7 @@ size_t isakmp_data_len; if (data_len < ISAKMP_PAYLOAD_O) { - DEBUG(2, printf("packet to short: len = %d < min = %d\n", data_len, ISAKMP_PAYLOAD_O)); + DEBUG(2, printf("packet to short: len = %lld < min = %d\n", (long long)data_len, ISAKMP_PAYLOAD_O)); reason = ISAKMP_N_UNEQUAL_PAYLOAD_LENGTHS; goto error; } @@ -730,8 +730,8 @@ isakmp_data_len = fetch4(); hex_dump("len", &isakmp_data_len, UINT32); if (o_data_len != isakmp_data_len) { - DEBUG(2, printf("isakmp length does not match packet length: isakmp = %d != datalen = %d\n", - isakmp_data_len, o_data_len)); + DEBUG(2, printf("isakmp length does not match packet length: isakmp = %lld != datalen = %lld\n", + (long long)isakmp_data_len, (long long)o_data_len)); reason = ISAKMP_N_UNEQUAL_PAYLOAD_LENGTHS; goto error; } diff -ur /var/zab/src/vpnc-0.3.2/isakmp-pkt.h vpnc-0.3.2/isakmp-pkt.h --- /var/zab/src/vpnc-0.3.2/isakmp-pkt.h 2004-11-21 14:15:05.000000000 -0800 +++ vpnc-0.3.2/isakmp-pkt.h 2005-01-04 10:03:26.000000000 -0800 @@ -41,7 +41,7 @@ uint8_t *data; } lots; } u; -}; +} __attribute__((packed)); struct isakmp_payload { struct isakmp_payload *next; @@ -102,7 +102,7 @@ struct isakmp_attribute *attributes; } modecfg; } u; -}; +} __attribute__((packed)); struct isakmp_packet { uint8_t i_cookie[ISAKMP_COOKIE_LENGTH]; @@ -112,7 +112,7 @@ uint8_t flags; uint32_t message_id; struct isakmp_payload *payload; -}; +} __attribute__((packed)); extern void *xallocc(size_t x); extern struct isakmp_packet *new_isakmp_packet(void); diff -ur /var/zab/src/vpnc-0.3.2/sysdep-bsd.c vpnc-0.3.2/sysdep-bsd.c --- /var/zab/src/vpnc-0.3.2/sysdep-bsd.c 2004-07-04 06:57:30.000000000 -0700 +++ vpnc-0.3.2/sysdep-bsd.c 2005-01-04 10:09:21.000000000 -0800 @@ -74,7 +74,7 @@ uint32_t timeout; } header; u_char data[MAX_MRU]; -}; +} __attribute__((packed)); /* Read/write frames from TUN device */ int tun_write(int fd, char *buf, int len) diff -ur /var/zab/src/vpnc-0.3.2/tunip.c vpnc-0.3.2/tunip.c --- /var/zab/src/vpnc-0.3.2/tunip.c 2004-11-17 12:23:43.000000000 -0800 +++ vpnc-0.3.2/tunip.c 2005-01-04 10:56:06.000000000 -0800 @@ -87,8 +87,8 @@ unsigned char use_fallback; /* use initial address as fallback? */ unsigned char use_dest; /* is dest address known yet? */ - unsigned long spi; /* security parameters index */ - unsigned long seq_id; /* for replay protection (not implemented) */ + uint32_t spi; /* security parameters index */ + uint32_t seq_id; /* for replay protection (not implemented) */ /* Encryption key */ const unsigned char *enc_secret; @@ -118,12 +118,12 @@ /* A real ESP header (RFC 2406) */ typedef struct esp_encap_header { - unsigned long spi; /* security parameters index */ - unsigned long seq_id; /* sequence id (unimplemented) */ + uint32_t spi; /* security parameters index */ + uint32_t seq_id; /* sequence id (unimplemented) */ /* variable-length payload data + padding */ /* unsigned char next_header */ /* optional auth data */ -} esp_encap_header_t; +} esp_encap_header_t __attribute__((packed)); struct encap_method { int fd; /* file descriptor for relevant socket */ @@ -136,7 +136,7 @@ unsigned int bufsize, bufpayload, var_header_size; int buflen; struct sockaddr_in from; - int fromlen; + socklen_t fromlen; int (*recv) (struct encap_method * encap, unsigned char *buf, unsigned int bufsize, struct sockaddr_in * from); @@ -151,7 +151,7 @@ struct peer_desc *peer, unsigned char *buf, unsigned int bufsize); void encap_udp_send_peer(struct encap_method *encap, struct peer_desc *peer, unsigned char *buf, unsigned int bufsize); -struct peer_desc *peer_find(unsigned long spi, struct encap_method *encap); +struct peer_desc *peer_find(uint32_t spi, struct encap_method *encap); int encap_esp_recv_peer(struct encap_method *encap, struct peer_desc *peer); /* Yuck! Global variables... */ @@ -220,7 +220,7 @@ int encap_rawip_recv(struct encap_method *encap, unsigned char *buf, unsigned int bufsize, struct sockaddr_in *from) { - int r; + ssize_t r; struct ip *p = (struct ip *)buf; encap->fromlen = sizeof(encap->from); @@ -231,7 +231,10 @@ return -1; } if (r < (p->ip_hl << 2) + encap->fixed_header_size) { - syslog(LOG_ALERT, "packet too short from %s", inet_ntoa(encap->from.sin_addr)); +#if 0 + syslog(LOG_ALERT, "packet too short from %s", + inet_ntoa(encap->from.sin_addr)); +#endif return -1; } #if 0 @@ -268,7 +271,7 @@ unsigned char *buf, unsigned int bufsize, struct sockaddr_in *from) { - int r; + ssize_t r; encap->fromlen = sizeof(encap->from); @@ -279,8 +282,10 @@ return -1; } if (r < encap->fixed_header_size) { +#if 0 syslog(LOG_ALERT, "packet too short from %s", inet_ntoa(encap->from.sin_addr)); +#endif return -1; } @@ -447,11 +452,11 @@ /* * Find the peer record associated with a given local SPI. */ -struct peer_desc *peer_find(unsigned long spi, struct encap_method *encap) +struct peer_desc *peer_find(uint32_t spi, struct encap_method *encap) { if (vpnpeer.local_sa->spi == spi && vpnpeer.local_sa->em == encap) return &vpnpeer; - syslog(LOG_ALERT, "unknown spi %ld", spi); + syslog(LOG_ALERT, "unknown spi %u", spi); return NULL; } @@ -623,7 +628,7 @@ return; } if (sent != encap->buflen) - syslog(LOG_ALERT, "truncated out (%d out of %d)", sent, encap->buflen); + syslog(LOG_ALERT, "truncated out (%llu out of %d)", (unsigned long long)sent, encap->buflen); } /* @@ -659,8 +664,8 @@ return; } if (sent != encap->buflen) - syslog(LOG_ALERT, "truncated out (%Zd out of %Zd)", - sent, encap->buflen); + syslog(LOG_ALERT, "truncated out (%lld out of %d)", + (long long)sent, encap->buflen); } int encap_esp_recv_peer(struct encap_method *encap, struct peer_desc *peer) @@ -838,7 +843,7 @@ char addr1[16]; strcpy(addr1, inet_ntoa(peer->remote_sa->dest.sin_addr)); syslog(LOG_NOTICE, - "spi %ld: remote address changed from %s to %s", + "spi %u: remote address changed from %s to %s", peer->remote_sa->spi, addr1, inet_ntoa(from.sin_addr)); peer->remote_sa->dest.sin_addr.s_addr = from.sin_addr.s_addr; peer->remote_sa->use_dest = 1; diff -ur /var/zab/src/vpnc-0.3.2/vpnc.c vpnc-0.3.2/vpnc.c --- /var/zab/src/vpnc-0.3.2/vpnc.c 2004-11-21 16:12:02.000000000 -0800 +++ vpnc-0.3.2/vpnc.c 2005-01-04 09:55:37.000000000 -0800 @@ -468,8 +468,8 @@ *r_p = NULL; if (r_length < ISAKMP_PAYLOAD_O || ((r_length - ISAKMP_PAYLOAD_O) % s->ivlen != 0)) { - DEBUG(2, printf("payload to short or not padded: len=%d, min=%d (ivlen=%d)\n", - r_length, ISAKMP_PAYLOAD_O, s->ivlen)); + DEBUG(2, printf("payload to short or not padded: len=%lld, min=%d (ivlen=%lld)\n", + (long long)r_length, ISAKMP_PAYLOAD_O, (long long)s->ivlen)); return ISAKMP_N_UNEQUAL_PAYLOAD_LENGTHS; } Index: vpnc.spec =================================================================== RCS file: /cvs/extras/rpms/vpnc/devel/vpnc.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- vpnc.spec 24 Dec 2004 03:16:24 -0000 1.2 +++ vpnc.spec 6 Jan 2005 09:07:08 -0000 1.3 @@ -1,6 +1,6 @@ Name: vpnc Version: 0.3.2 -Release: 2 +Release: 3 Summary: IPSec VPN client compatible with Cisco equipment Group: Applications/Internet @@ -9,6 +9,7 @@ Source0: vpnc-0.3.2.tar.gz Source1: generic-vpnc.conf Patch0: vpnc-0.3.2-pie.patch +Patch1: vpnc-0.3.2-64bit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgcrypt-devel > 0:1.1.90 @@ -23,6 +24,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build make @@ -45,6 +47,9 @@ /sbin/* %changelog +* Wed Jan 05 2005 Warren Togami 0.3.2-3 +- Fix 64bit + * Thu Dec 23 2004 Warren Togami 0.3.2-2 - make PIE (davej) From fedora-extras-commits at redhat.com Thu Jan 6 18:17:18 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 6 Jan 2005 13:17:18 -0500 Subject: rpms/gpgme03/devel gpgme-0.3.16-underquoted.patch, NONE, 1.1 gpgme03.spec, 1.5, 1.6 Message-ID: <200501061817.j06IHIju001696@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gpgme03/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv1690 Modified Files: gpgme03.spec Added Files: gpgme-0.3.16-underquoted.patch Log Message: Fix underquoted definition in gpgme.m4 gpgme-0.3.16-underquoted.patch: --- NEW FILE gpgme-0.3.16-underquoted.patch --- diff -Nur gpgme-0.3.16-orig/gpgme/gpgme.m4 gpgme-0.3.16/gpgme/gpgme.m4 --- gpgme-0.3.16-orig/gpgme/gpgme.m4 2002-08-23 21:48:30.000000000 +0200 +++ gpgme-0.3.16/gpgme/gpgme.m4 2005-01-06 19:04:50.006691496 +0100 @@ -6,7 +6,7 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) dnl Test for libgpgme and define GPGME_CFLAGS and GPGME_LIBS dnl -AC_DEFUN(AM_PATH_GPGME, +AC_DEFUN([AM_PATH_GPGME], [ AC_ARG_WITH(gpgme-prefix, AC_HELP_STRING([--with-gpgme-prefix=PFX], [prefix where GPGME is installed (optional)]), Index: gpgme03.spec =================================================================== RCS file: /cvs/extras/rpms/gpgme03/devel/gpgme03.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gpgme03.spec 30 Nov 2004 11:04:30 -0000 1.5 +++ gpgme03.spec 6 Jan 2005 18:17:16 -0000 1.6 @@ -1,12 +1,13 @@ Summary: GnuPG Made Easy interface library Name: gpgme03 Version: 0.3.16 -Release: 5 +Release: 6 Epoch: 0 License: GPL Group: Applications/System Source: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-0.3.16.tar.gz Patch: gpgme-0.3.16-select.patch +Patch1: gpgme-0.3.16-underquoted.patch URL: http://www.gnupg.org/related_software/gpgme/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gnupg >= 0:1.2.0, %{_bindir}/gpgsm @@ -32,6 +33,7 @@ %prep %setup -q -n gpgme-%{version} %patch -p1 -b .select +%patch1 -p1 -b .underquoted %build @@ -82,6 +84,9 @@ %changelog +* Thu Jan 6 2005 Michael Schwendt - 0.3.16-6 +- Fix underquoted definition in gpgme.m4. + * Tue Nov 30 2004 Michael Schwendt - 0.3.16-5 - Drop BR pth-devel and build --with-pth=no. It is neither used nor linked against libpth. configure.ac does a negative check for pth 1.2.0 From fedora-extras-commits at redhat.com Fri Jan 7 07:22:40 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 7 Jan 2005 02:22:40 -0500 Subject: rpms/pop-before-smtp - New directory Message-ID: <200501070722.j077Meqr011855@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/pop-before-smtp In directory cvs.fedora.redhat.com:/tmp/cvs-serv11842/pop-before-smtp Log Message: Directory /cvs/extras/rpms/pop-before-smtp added to the repository From fedora-extras-commits at redhat.com Fri Jan 7 07:22:40 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 7 Jan 2005 02:22:40 -0500 Subject: rpms/pop-before-smtp/devel - New directory Message-ID: <200501070722.j077MeSI011858@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/pop-before-smtp/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv11842/pop-before-smtp/devel Log Message: Directory /cvs/extras/rpms/pop-before-smtp/devel added to the repository From fedora-extras-commits at redhat.com Fri Jan 7 07:22:57 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 7 Jan 2005 02:22:57 -0500 Subject: rpms/pop-before-smtp Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501070722.j077MvWt011935@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/pop-before-smtp In directory cvs.fedora.redhat.com:/tmp/cvs-serv11920 Added Files: Makefile import.log Log Message: Setup of module pop-before-smtp --- NEW FILE Makefile --- # Top level Makefile for module pop-before-smtp all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 7 07:22:57 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 7 Jan 2005 02:22:57 -0500 Subject: rpms/pop-before-smtp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501070722.j077Mve8011938@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/pop-before-smtp/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv11920/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pop-before-smtp --- NEW 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 Jan 7 07:23:26 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 7 Jan 2005 02:23:26 -0500 Subject: rpms/pop-before-smtp import.log,1.1,1.2 Message-ID: <200501070723.j077NQf7012068@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/pop-before-smtp In directory cvs.fedora.redhat.com:/tmp/cvs-serv12052 Modified Files: import.log Log Message: auto-import pop-before-smtp-1.36-1 on branch devel from pop-before-smtp-1.36-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pop-before-smtp/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 Jan 2005 07:22:55 -0000 1.1 +++ import.log 7 Jan 2005 07:23:24 -0000 1.2 @@ -0,0 +1 @@ +pop-before-smtp-1_36-1:HEAD:pop-before-smtp-1.36-1.src.rpm:1105082599 From fedora-extras-commits at redhat.com Fri Jan 7 07:23:27 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 7 Jan 2005 02:23:27 -0500 Subject: rpms/pop-before-smtp/devel pop-before-smtp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501070723.j077NRVv012071@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/pop-before-smtp/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv12052/devel Modified Files: .cvsignore sources Added Files: pop-before-smtp.spec Log Message: auto-import pop-before-smtp-1.36-1 on branch devel from pop-before-smtp-1.36-1.src.rpm --- NEW FILE pop-before-smtp.spec --- Summary: Watch log for POP/IMAP auth, notify MTA to allow relay Name: pop-before-smtp Version: 1.36 Release: 1 Source: http://download.sourceforge.net/sourceforge/popbsmtp/pop-before-smtp-1.36.tar.gz URL: http://popbsmtp.sourceforge.net/ License: GPL or Artistic Group: System Environment/Daemons BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Spam prevention requires preventing open relaying through email servers. However, legit users want to be able to relay. If legit users always stayed in one spot, they'd be easy to describe to the daemon. However, what with roving laptops, logins from home, etc., legit users refuse to stay in one spot. pop-before-smtp watches the mail log, looking for successful pop/imap logins, and posts the originating IP address into a database which can be checked by Postfix, to allow relaying for people who have recently downloaded their email. %prep %setup -q -n pop-before-smtp-1.36 %build echo Nothing to build... %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_initrddir} mkdir -p $RPM_BUILD_ROOT%{_sbindir} mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 install pop-before-smtp $RPM_BUILD_ROOT%{_sbindir} pod2man pop-before-smtp >$RPM_BUILD_ROOT%{_mandir}/man8/pop-before-smtp.8 2>/dev/null perl -i -e 'undef $/; $_ = <>; s/\n=head1.*\n=cut//s; print' $RPM_BUILD_ROOT%_sbindir}/pop-before-smtp install pop-before-smtp-conf.pl $RPM_BUILD_ROOT%{_sysconfdir} install pop-before-smtp.init $RPM_BUILD_ROOT%{_initrddir}/pop-before-smtp %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc README ChangeLog pop-before-smtp-conf.pl %doc contrib/README* %attr(0644,root,root) %{_mandir}/man8/pop-before-smtp.8* %attr(0755,root,root) %{_sbindir}/pop-before-smtp %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pop-before-smtp-conf.pl %attr(0755,root,root) %{_initrddir}/pop-before-smtp %post [ $1 = 1 ] || exit 0 /sbin/chkconfig --add pop-before-smtp %preun [ $1 = 0 ] || exit 0 /sbin/chkconfig --del pop-before-smtp %changelog * Thu Jan 06 2005 Warren Togami 1.36-1 - 1.36 * Tue May 11 2004 Warren Togami 1.35-1 - 1.35, remove some docs * Sat Feb 07 2004 Warren Togami 1.34-0.fdr.1 - Update to 1.34 * Tue Sep 02 2003 Warren Togami 1.34-0.fdr.0.1.cvs20030717 - Fedora * Fri Mar 28 2003 Wayne Davison - Modified for 1.33 * Sun Dec 15 2002 Wayne Davison - Modified for 1.32 * Sat Aug 31 2002 Wayne Davison - Modified for 1.31 * Fri Apr 12 2002 Wayne Davison - Modified for 1.30 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pop-before-smtp/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Jan 2005 07:22:55 -0000 1.1 +++ .cvsignore 7 Jan 2005 07:23:24 -0000 1.2 @@ -0,0 +1 @@ +pop-before-smtp-1.36.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/pop-before-smtp/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Jan 2005 07:22:55 -0000 1.1 +++ sources 7 Jan 2005 07:23:24 -0000 1.2 @@ -0,0 +1 @@ +f437144b4730072416459e4e51614759 pop-before-smtp-1.36.tar.gz From fedora-extras-commits at redhat.com Fri Jan 7 08:31:37 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 7 Jan 2005 03:31:37 -0500 Subject: rpms/rkhunter import.log,1.2,1.3 Message-ID: <200501070831.j078Vba9013263@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/rkhunter In directory cvs.fedora.redhat.com:/tmp/cvs-serv13254 Modified Files: import.log Log Message: auto-import rkhunter-1.1.9-1 on branch devel from rkhunter-1.1.9-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/rkhunter/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 8 Nov 2004 05:17:52 -0000 1.2 +++ import.log 7 Jan 2005 08:31:35 -0000 1.3 @@ -1 +1,2 @@ rkhunter-1_1_8-0_fdr_1:HEAD:rkhunter-1.1.8-0.fdr.1.src.rpm:1099891072 +rkhunter-1_1_9-1:HEAD:rkhunter-1.1.9-1.src.rpm:1105086718 From fedora-extras-commits at redhat.com Fri Jan 7 08:31:37 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 7 Jan 2005 03:31:37 -0500 Subject: rpms/rkhunter/devel rkhunter-1.1.9-0.fdr.1.src.md5, NONE, 1.1 rkhunter-1.1.9-app_check_default.patch, NONE, 1.1 rkhunter-1.1.9-prelink_cleanup.patch, NONE, 1.1 rkhunter-1.1.9-shared_man_search.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 rkhunter.spec, 1.2, 1.3 sources, 1.2, 1.3 rkhunter-1.1.8-0.fdr.1.src.md5, 1.1, NONE rkhunter-1.1.8-app_check_default.patch, 1.1, NONE rkhunter-1.1.8-prelink_cleanup.patch, 1.1, NONE rkhunter-1.1.8-shared_man_search.patch, 1.1, NONE Message-ID: <200501070831.j078VbQx013267@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/rkhunter/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv13254/devel Modified Files: .cvsignore rkhunter.spec sources Added Files: rkhunter-1.1.9-0.fdr.1.src.md5 rkhunter-1.1.9-app_check_default.patch rkhunter-1.1.9-prelink_cleanup.patch rkhunter-1.1.9-shared_man_search.patch Removed Files: rkhunter-1.1.8-0.fdr.1.src.md5 rkhunter-1.1.8-app_check_default.patch rkhunter-1.1.8-prelink_cleanup.patch rkhunter-1.1.8-shared_man_search.patch Log Message: auto-import rkhunter-1.1.9-1 on branch devel from rkhunter-1.1.9-1.src.rpm --- NEW FILE rkhunter-1.1.9-0.fdr.1.src.md5 --- 2e24806cb1267124fba6132009e30f1b ../SOURCES/rkhunter-1.1.9.tar.gz 0728cef20dde6817c36ef5787286b6f6 ../SOURCES/rkhunter-scan_on_boot-rc.local.tar.gz 22ad8521939744a7889d4fd8e6dad619 ../SOURCES/rkhunter-1.1.9-shared_man_search.patch b1525a7b472b96c669d6b7cd9048d6ed ../SOURCES/rkhunter-1.1.8-showfiles.patch a76e5bcece252676355fd97b791f1000 ../SOURCES/rkhunter-1.1.8-whitelist_dir-conf.patch 7d2857462a1555dff41b467d6272b35d ../SOURCES/rkhunter-1.1.9-app_check_default.patch 2559461d3064ee82eda4d227c40a21d9 ../SOURCES/rkhunter-1.1.9-prelink_cleanup.patch rkhunter-1.1.9-app_check_default.patch: --- NEW FILE rkhunter-1.1.9-app_check_default.patch --- --- files/rkhunter.orig 2004-12-28 12:45:21.000000000 -0500 +++ files/rkhunter 2004-12-31 13:53:16.000000000 -0500 @@ -49,7 +49,7 @@ # Skip passwd/group check PASSWDCHECK_SKIP=0 # Application check -APPLICATION_CHECK=1 +APPLICATION_CHECK=0 USE_PATCHED_SOFTWARE=0 @@ -186,6 +186,9 @@ shift ROOTDIR=$1 ;; + --run-application-check | --runapplicationcheck | --run-applicationcheck) + APPLICATION_CHECK=1 + ;; --scan-knownbad-files) PERFORMKNOWNBAD=1 ;; @@ -4957,7 +4960,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* : 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.1.9-prelink_cleanup.patch: --- NEW FILE rkhunter-1.1.9-prelink_cleanup.patch --- --- files/rkhunter.orig 2004-12-28 12:45:21.000000000 -0500 +++ files/rkhunter 2004-12-31 13:38:30.000000000 -0500 @@ -2304,6 +2304,8 @@ lastfile="${file}" done + + [ -f ${TMPDIR}/prelink.tst ] && rm -f ${TMPDIR}/prelink.tst if [ ${WARNING} -eq 1 ]; then displaytext "--------------------------------------------------------------------------------" rkhunter-1.1.9-shared_man_search.patch: --- NEW FILE rkhunter-1.1.9-shared_man_search.patch --- --- files/rkhunter.orig 2004-12-28 12:45:21.000000000 -0500 +++ files/rkhunter 2004-12-31 13:25:53.000000000 -0500 @@ -4127,7 +4127,7 @@ displaytext -n " Scanning for hidden files..." - SEARCHINDIRS="/dev /bin /usr /usr/man /usr/man/man1 /usr/man/man8 /usr/bin /usr/sbin /sbin /etc" + SEARCHINDIRS="/dev /bin /usr /usr/share/man /usr/share/man/man1 /usr/share/man/man8 /usr/bin /usr/sbin /sbin /etc" # Only reset status once STATUS=0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rkhunter/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:17:52 -0000 1.2 +++ .cvsignore 7 Jan 2005 08:31:35 -0000 1.3 @@ -1,2 +1,2 @@ -rkhunter-1.1.8.tar.gz rkhunter-scan_on_boot-rc.local.tar.gz +rkhunter-1.1.9.tar.gz Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/devel/rkhunter.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rkhunter.spec 10 Dec 2004 22:03:10 -0000 1.2 +++ rkhunter.spec 7 Jan 2005 08:31:35 -0000 1.3 @@ -4,7 +4,7 @@ AutoReqProv: no Name: rkhunter -Version: 1.1.8 +Version: 1.1.9 Release: 1 Epoch: 0 Summary: Rootkit Hunter scans for rootkits, backdoors and local exploits. @@ -12,14 +12,14 @@ Group: Applications/System License: GPL URL: http://www.rootkit.nl/ -Source0: http://downloads.rootkit.nl/rkhunter-1.1.8.tar.gz +Source0: http://downloads.rootkit.nl/rkhunter-1.1.9.tar.gz Source1: rkhunter-scan_on_boot-rc.local.tar.gz -Source2: rkhunter-1.1.8-0.fdr.1.src.md5 +Source2: rkhunter-1.1.9-0.fdr.1.src.md5 Patch1: rkhunter-1.1.8-whitelist_dir-conf.patch Patch2: rkhunter-1.1.8-showfiles.patch -Patch3: rkhunter-1.1.8-shared_man_search.patch -Patch4: rkhunter-1.1.8-app_check_default.patch -Patch5: rkhunter-1.1.8-prelink_cleanup.patch +Patch3: rkhunter-1.1.9-shared_man_search.patch +Patch4: rkhunter-1.1.9-app_check_default.patch +Patch5: rkhunter-1.1.9-prelink_cleanup.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -59,18 +59,21 @@ %{__perl} -pi.orig -e ' s|\@RKLIB\@|%{_libdir}/%{name}|g; - s|\@RCDIR\@|%{_sysconfdir}/rc.d|g; s|\@LGDIR\@|%{_localstatedir}/log|g; - ' rkhunter-scan_on_boot - -%{__perl} -pi.orig -e ' s|\@RCDIR\@|%{_sysconfdir}/rc.d|g; s|\@ITDIR\@|%{_initrddir}|g; s|\@SCDIR\@|%{_sysconfdir}/sysconfig|g; s|\@RKEXE\@|%{_bindir}/%{name}|g; - ' rkhunter-scan_on_boot-rc.local + ' rkhunter-scan_on_boot \ + rkhunter-scan_on_boot-rc.local + +%{__perl} -pi.orig -e ' + s|^#$|INSTALLDIR=%{_prefix}|; + s|^#(TMPDIR=).+$|$1%{_var}/%{name}/tmp|; + s|^#(DBDIR=).+$|$1%{_var}/%{name}/db|; + ' files/%{name}.conf -%patch1 -b .orig +%patch1 -b .0001 %patch2 -b .orig %patch3 -b .orig %patch4 -b .0001 @@ -86,16 +89,6 @@ " EOF -%{__cat} <<'EOF' >%{name}.conf -## Next three lines installed automatically by RPM. Do not change -## unless you know what you're doing... -INSTALLDIR=%{_prefix} -DBDIR=%{_var}/%{name}/db -TMPDIR=%{_var}/%{name}/tmp - -EOF -%{__cat} files/%{name}.conf >> %{name}.conf - %{__cat} <<'EOF' >01-%{name} #!/bin/sh %{_bindir}/%{name} --cronjob | /bin/mail -s '%{name} Daily Run' root @@ -143,7 +136,7 @@ %{__install} -m750 -p files/showfiles.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ %{__install} -m750 -p 01-%{name} ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/ %{__install} -m750 -p rkhunter-scan_on_boot-rc.local ${RPM_BUILD_ROOT}%{_libdir}/%{name}/rc.d/rc.local -%{__install} -m640 -p %{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/ +%{__install} -m640 -p files/%{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/ %{__install} -m640 -p %{name}.sysconfig ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name} @@ -151,7 +144,7 @@ %{__rm} -rf $RPM_BUILD_ROOT # Autoclean for rpmbuild -bb #cd .. -#%{__rm} -rf %{name} +#[ ! -d %{name} ] || %{__rm} -rf %{name} %postun @@ -179,6 +172,14 @@ %changelog +* Sun Jan 2 2005 Greg Houlette - 0:1.1.9-1 +- New package version release +- Added the --run-application-check command line option + to listing in command help +- Replaced 'Here' Doc editing of rkhunter.conf file + with in-place Perl edit +- tweaked rpmbuild -bb Autoclean + * Fri Oct 15 2004 Greg Houlette - 0:1.1.8-0.fdr.1 (revisited) - Removed redundant buildrequires /bin/sh, coreutils and perl - Revise postun scriptlet Index: sources =================================================================== RCS file: /cvs/extras/rpms/rkhunter/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:17:52 -0000 1.2 +++ sources 7 Jan 2005 08:31:35 -0000 1.3 @@ -1,2 +1,2 @@ -91cae6f04582fb0b27c96784ffe5adae rkhunter-1.1.8.tar.gz 0728cef20dde6817c36ef5787286b6f6 rkhunter-scan_on_boot-rc.local.tar.gz +2e24806cb1267124fba6132009e30f1b rkhunter-1.1.9.tar.gz --- rkhunter-1.1.8-0.fdr.1.src.md5 DELETED --- --- rkhunter-1.1.8-app_check_default.patch DELETED --- --- rkhunter-1.1.8-prelink_cleanup.patch DELETED --- --- rkhunter-1.1.8-shared_man_search.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jan 7 19:55:22 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 7 Jan 2005 14:55:22 -0500 Subject: rpms/pcsc-lite - New directory Message-ID: <200501071955.j07JtMKG022852@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-lite In directory cvs.fedora.redhat.com:/tmp/cvs-serv22843/pcsc-lite Log Message: Directory /cvs/extras/rpms/pcsc-lite added to the repository From fedora-extras-commits at redhat.com Fri Jan 7 19:55:22 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 7 Jan 2005 14:55:22 -0500 Subject: rpms/pcsc-lite/devel - New directory Message-ID: <200501071955.j07JtMCi022855@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-lite/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22843/pcsc-lite/devel Log Message: Directory /cvs/extras/rpms/pcsc-lite/devel added to the repository From fedora-extras-commits at redhat.com Fri Jan 7 19:55:41 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 7 Jan 2005 14:55:41 -0500 Subject: rpms/pcsc-lite Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501071955.j07JtfTC022918@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-lite In directory cvs.fedora.redhat.com:/tmp/cvs-serv22907 Added Files: Makefile import.log Log Message: Setup of module pcsc-lite --- NEW FILE Makefile --- # Top level Makefile for module pcsc-lite all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Jan 7 19:55:41 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 7 Jan 2005 14:55:41 -0500 Subject: rpms/pcsc-lite/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501071955.j07Jtfg5022921@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-lite/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22907/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pcsc-lite --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jan 7 19:57:20 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 7 Jan 2005 14:57:20 -0500 Subject: rpms/pcsc-lite import.log,1.1,1.2 Message-ID: <200501071957.j07JvK0G023035@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-lite In directory cvs.fedora.redhat.com:/tmp/cvs-serv23026 Modified Files: import.log Log Message: auto-import pcsc-lite-1.2.0-10 on branch devel from pcsc-lite-1.2.0-10.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pcsc-lite/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 Jan 2005 19:55:39 -0000 1.1 +++ import.log 7 Jan 2005 19:57:18 -0000 1.2 @@ -0,0 +1 @@ +pcsc-lite-1_2_0-10:HEAD:pcsc-lite-1.2.0-10.src.rpm:1105127825 From fedora-extras-commits at redhat.com Fri Jan 7 19:57:20 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 7 Jan 2005 14:57:20 -0500 Subject: rpms/pcsc-lite/devel pcsc-lite-docinst.patch, NONE, 1.1 pcsc-lite-pcscd.init, NONE, 1.1 pcsc-lite-update-reader.conf, NONE, 1.1 pcsc-lite.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501071957.j07JvKsa023041@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-lite/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv23026/devel Modified Files: .cvsignore sources Added Files: pcsc-lite-docinst.patch pcsc-lite-pcscd.init pcsc-lite-update-reader.conf pcsc-lite.spec Log Message: auto-import pcsc-lite-1.2.0-10 on branch devel from pcsc-lite-1.2.0-10.src.rpm pcsc-lite-docinst.patch: --- NEW FILE pcsc-lite-docinst.patch --- --- doc/Makefile.in 2003-05-31 00:24:32.000000000 +0300 +++ doc/Makefile.in 2003-06-01 15:43:17.000000000 +0300 @@ -390,7 +390,7 @@ info-am: -install-data-am: install-dataDATA install-man +install-data-am: install-man install-exec-am: --- NEW FILE pcsc-lite-pcscd.init --- #!/bin/sh # # pcscd Starts the pcscd Daemon # # chkconfig: 2345 25 88 # description: The PC/SC smart card daemon is a resource manager for the \ # PC/SC lite and Musclecard frameworks. It coordinates \ # communications with smart card readers, smart cards, and \ # cryptographic tokens that are connected to the system. # # processname: pcscd # pidfile: __LOCALSTATEDIR__/run/pcscd.pid # config: __SYSCONFDIR__/reader.conf # # Note! pcscd should be started after pcmcia, and shut down before it # for smooth experience with PCMCIA readers. . __INITRDDIR__/functions umask 077 exec=__SBINDIR__/pcscd prog=$(basename $exec) lockfile=__LOCALSTATEDIR__/lock/subsys/$prog start() { echo -n $"Starting PC/SC smart card daemon ($prog): " __SBINDIR__/update-reader.conf && daemon $prog retval=$? echo [ $retval -eq 0 ] && touch $lockfile return $retval } stop() { echo -n $"Stopping PC/SC smart card daemon ($prog): " killproc $prog retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile return $retval } restart() { stop start } case "$1" in start|stop|restart) $1 ;; reload|force-reload) restart ;; status) status $prog ;; condrestart|try-restart) [ ! -f $lockfile ] || restart ;; *) echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}" exit 2 esac --- NEW FILE pcsc-lite-update-reader.conf --- #!/bin/sh # Merge all reader config file snippets for pcsc-lite from a reader.conf.d # directory into a reader.conf. CONF=__SYSCONFDIR__/reader.conf CONFDIR=__SYSCONFDIR__/reader.conf.d umask 0022 set -e trap cleanup EXIT cleanup() { test -z "$tmpfile" || rm -f "$tmpfile" } tmpfile=`mktemp /tmp/reader.conf.XXXXXX` cat > "$tmpfile" </dev/null` ; do echo "# $f" >> "$tmpfile" cat "$f" >> "$tmpfile" echo >> "$tmpfile" done echo "# End of file" >> "$tmpfile" cat "$tmpfile" > "$CONF" --- NEW FILE pcsc-lite.spec --- Name: pcsc-lite Version: 1.2.0 Release: 10 Epoch: 0 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/pcsc-lite-1.2.0.tar.gz Source1: %{name}-pcscd.init Source2: %{name}-update-reader.conf Patch0: %{name}-docinst.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{__perl}, flex, libusb-devel >= 0:0.1.6 Requires: chkconfig, pcsc-ifd-handler %description The purpose of PC/SC Lite is to provide a Windows(R) SCard interface in a very small form factor for communicating to smartcards and readers. PC/SC Lite uses the same winscard API as used under Windows(R). This package includes the PC/SC Lite daemon, a resource manager that coordinates communications with smart card readers and smart cards that are connected to the system, as well as other command line tools. %package libs Summary: PC/SC Lite libraries Group: System Environment/Libraries Provides: libpcsc-lite = %{epoch}:%{version}-%{release} Provides: libmusclecard = %{epoch}:%{version}-%{release} %description libs PC/SC Lite libraries. %package devel Summary: PC/SC Lite development files Group: Development/Libraries Requires: %{name}-libs = %{epoch}:%{version}-%{release}, pkgconfig Provides: libpcsc-lite-devel = %{epoch}:%{version}-%{release} Provides: libmusclecard-devel = %{epoch}:%{version}-%{release} %description devel PC/SC Lite development files. %prep %setup -q %patch0 -p0 %{__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 %build %configure \ --disable-dependency-tracking \ --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} %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 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}/ %clean rm -rf $RPM_BUILD_ROOT %post /sbin/chkconfig --add pcscd %preun if [ $1 -eq 0 ] ; then %{_initrddir}/pcscd stop >/dev/null || : /sbin/chkconfig --del pcscd fi %postun [ $1 -gt 0 ] && %{_initrddir}/pcscd try-restart >/dev/null || : %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog* COPYING DRIVERS HELP NEWS README SECURITY %dir %{_sysconfdir}/reader.conf.d %{_sysconfdir}/reader.conf.d/README %ghost %config %{_sysconfdir}/reader.conf %config %{_initrddir}/pcscd %{_bindir}/bundleTool %{_bindir}/formaticc %{_bindir}/installifd %exclude %{_bindir}/pcsc_demo %{_sbindir}/pcscd %{_sbindir}/update-reader.conf %{_libdir}/pcsc %{_mandir}/man[18]/*.[18]* %files libs %defattr(-,root,root,-) %{_libdir}/lib*.so.* %files devel %defattr(-,root,root,-) %doc doc/*.pdf doc/example/pcsc_demo.c %{_includedir}/*.h %{_libdir}/lib*.so %{_libdir}/lib*.a %exclude %{_libdir}/lib*.la %{_libdir}/pkgconfig/lib*.pc %changelog * Tue Aug 17 2004 Ville Skytt?? - 0:1.2.0-10 - Disable dependency tracking to speed up the build. - Drop reader.conf patch, it's not needed any more. - Rename update-reader-conf to update-reader.conf for consistency with Debian, and improve it a bit. * Sat Jul 31 2004 Ville Skytt?? - 0:1.2.0-0.fdr.9 - Add update-reader-conf, thanks to Fritz Elfert. * Thu Jul 1 2004 Ville Skytt?? - 0:1.2.0-0.fdr.8 - Own the %%{_libdir}/pcsc hierarchy. * Thu May 13 2004 Ville Skytt?? - 0:1.2.0-0.fdr.7 - Make main package require pcsc-ifd-handler (idea from Debian). * Wed May 12 2004 Ville Skytt?? - 0:1.2.0-0.fdr.6 - Improve package summary. - Improvements based on suggestions from Ludovic Rousseau: - Don't install pcsc_demo but do include its source in -devel. - Sync reader.conf with current upstream CVS HEAD (better docs, less intrusive in USB-only setups where it's not needed). * Fri Apr 16 2004 Ville Skytt?? - 0:1.2.0-0.fdr.5 - Move PDF API docs to -devel. - Improve main package and init script descriptions. * Thu Jan 29 2004 Ville Skytt?? - 0:1.2.0-0.fdr.4 - Init script fine tuning. * Fri Jan 9 2004 Ville Skytt?? - 0:1.2.0-0.fdr.3 - BuildRequires libusb-devel 0.1.6 or newer. * Thu Oct 30 2003 Ville Skytt?? - 0:1.2.0-0.fdr.2 - s/pkgconfi/pkgconfig/ in -devel requirements. * Tue Oct 28 2003 Ville Skytt?? - 0:1.2.0-0.fdr.1 - Update to 1.2.0. - Add libpcsc-lite and libmusclecard provides to -libs and -devel. * Thu Oct 16 2003 Ville Skytt?? - 0:1.2.0-0.fdr.0.2.rc3 - Update to 1.2.0-rc3. - Trivial init script improvements. - Enable %%{_smp_mflags}. - Don't bother trying to enable SCF. * Sun Sep 14 2003 Ville Skytt?? - 0:1.2.0-0.fdr.0.2.rc2 - Specfile cleanups. * Fri Sep 5 2003 Ville Skytt?? - 0:1.2.0-0.fdr.0.1.rc2 - Update to 1.2.0-rc2. * Wed Aug 27 2003 Ville Skytt?? - 0:1.2.0-0.fdr.0.1.rc1 - Update to 1.2.0-rc1. * Sun Jun 1 2003 Ville Skytt?? - 0:1.1.2-0.fdr.0.1.beta5 - Update to 1.1.2beta5. * Sat May 24 2003 Ville Skytt?? - 0:1.1.2-0.fdr.0.1.beta4 - First build, based on PLD's 1.1.1-2. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcsc-lite/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Jan 2005 19:55:39 -0000 1.1 +++ .cvsignore 7 Jan 2005 19:57:18 -0000 1.2 @@ -0,0 +1 @@ +pcsc-lite-1.2.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcsc-lite/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Jan 2005 19:55:39 -0000 1.1 +++ sources 7 Jan 2005 19:57:18 -0000 1.2 @@ -0,0 +1 @@ +98456d274b2f4bfe74c5ab59070f8d50 pcsc-lite-1.2.0.tar.gz From fedora-extras-commits at redhat.com Fri Jan 7 20:14:56 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 7 Jan 2005 15:14:56 -0500 Subject: rpms/pcsc-perl - New directory Message-ID: <200501072014.j07KEucY023786@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-perl In directory cvs.fedora.redhat.com:/tmp/cvs-serv23779/pcsc-perl Log Message: Directory /cvs/extras/rpms/pcsc-perl added to the repository From fedora-extras-commits at redhat.com Fri Jan 7 20:14:56 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 7 Jan 2005 15:14:56 -0500 Subject: rpms/pcsc-perl/devel - New directory Message-ID: <200501072014.j07KEuBu023789@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-perl/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv23779/pcsc-perl/devel Log Message: Directory /cvs/extras/rpms/pcsc-perl/devel added to the repository From fedora-extras-commits at redhat.com Fri Jan 7 20:15:14 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 7 Jan 2005 15:15:14 -0500 Subject: rpms/pcsc-perl Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501072015.j07KFEsp023848@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-perl In directory cvs.fedora.redhat.com:/tmp/cvs-serv23839 Added Files: Makefile import.log Log Message: Setup of module pcsc-perl --- NEW FILE Makefile --- # Top level Makefile for module pcsc-perl all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Jan 7 20:15:14 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 7 Jan 2005 15:15:14 -0500 Subject: rpms/pcsc-perl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501072015.j07KFEic023851@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-perl/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv23839/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pcsc-perl --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jan 7 20:15:48 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 7 Jan 2005 15:15:48 -0500 Subject: rpms/pcsc-perl import.log,1.1,1.2 Message-ID: <200501072015.j07KFmCN023944@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-perl In directory cvs.fedora.redhat.com:/tmp/cvs-serv23935 Modified Files: import.log Log Message: auto-import pcsc-perl-1.3.1-4 on branch devel from pcsc-perl-1.3.1-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pcsc-perl/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 Jan 2005 20:15:12 -0000 1.1 +++ import.log 7 Jan 2005 20:15:46 -0000 1.2 @@ -0,0 +1 @@ +pcsc-perl-1_3_1-4:HEAD:pcsc-perl-1.3.1-4.src.rpm:1105128940 From fedora-extras-commits at redhat.com Fri Jan 7 20:15:48 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 7 Jan 2005 15:15:48 -0500 Subject: rpms/pcsc-perl/devel pcsc-perl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501072015.j07KFmDP023948@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-perl/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv23935/devel Modified Files: .cvsignore sources Added Files: pcsc-perl.spec Log Message: auto-import pcsc-perl-1.3.1-4 on branch devel from pcsc-perl-1.3.1-4.src.rpm --- NEW FILE pcsc-perl.spec --- %define pcscver %(rpm -q --qf %%{epoch}:%%{version} pcsc-lite-libs) %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} Name: pcsc-perl Version: 1.3.1 Release: 4 Epoch: 0 Summary: Perl interface to the PC/SC smart card library Group: Development/Libraries License: GPL URL: http://ludovic.rousseau.free.fr/softwares/pcsc-perl/ Source0: http://ludovic.rousseau.free.fr/softwares/pcsc-perl/pcsc-perl-1.3.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl >= 1:5.6.1, pcsc-lite-devel Requires: pcsc-lite-libs = %{pcscver} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This package contains a Perl interface to the PC/SC smart card library. %prep %setup -q chmod 644 examples/* # avoid dependencies %build CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor INC= \ DEFINE=-Wall make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS" %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 || : # skipping tests %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changelog LICENCE README examples %{perl_vendorarch}/auto/Chipcard %{perl_vendorarch}/Chipcard %{_mandir}/man3/*.3* %changelog * Fri Jan 7 2005 Ville Skytt?? - 0:1.3.1-4 - Honor $RPM_OPT_FLAGS, remove (some) extra include dirs from build (#1281). - Improve summary and description. * Wed May 12 2004 Ville Skytt?? - 0:1.3.1-0.fdr.3 - BuildRequire perl >= 1:5.6.1 for vendor install dir support. - Use pure_install to avoid perllocal.pod workarounds. * Sun Apr 25 2004 Ville Skytt?? - 0:1.3.1-0.fdr.2 - Require perl(:MODULE_COMPAT_*). * Fri Apr 2 2004 Ville Skytt?? - 0:1.3.1-0.fdr.1 - Update to 1.3.1. * Sun Feb 8 2004 Ville Skytt?? - 0:1.3.0-0.fdr.2 - Reduce directory ownership bloat. * Wed Dec 17 2003 Ville Skytt?? - 0:1.3.0-0.fdr.1 - Update to 1.3.0. * Sun Sep 14 2003 Ville Skytt?? - 0:1.2.2-0.fdr.4 - More spec cleanups. * Wed Aug 27 2003 Ville Skytt?? - 0:1.2.2-0.fdr.3 - Spec cleanups, install into vendor dirs. * Fri Jul 4 2003 Ville Skytt?? - 0:1.2.2-0.fdr.2 - Fix dir ownerships, non-root strip during build. * Thu May 29 2003 Ville Skytt?? - 0:1.2.2-0.fdr.1 - Update to 1.2.2. - Drop patch and hacks, already applied/fixed upstream. * Sun May 25 2003 Ville Skytt?? - 0:1.2.1-0.fdr.1 - Update to 1.2.1. - Fix build and runtime dependencies. * Thu May 22 2003 Ville Skytt?? - 0:1.2.0-0.fdr.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcsc-perl/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Jan 2005 20:15:12 -0000 1.1 +++ .cvsignore 7 Jan 2005 20:15:46 -0000 1.2 @@ -0,0 +1 @@ +pcsc-perl-1.3.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcsc-perl/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Jan 2005 20:15:12 -0000 1.1 +++ sources 7 Jan 2005 20:15:46 -0000 1.2 @@ -0,0 +1 @@ +4c1869b5b726f7ab5b1bda88b390c821 pcsc-perl-1.3.1.tar.gz From fedora-extras-commits at redhat.com Fri Jan 7 22:06:38 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 7 Jan 2005 17:06:38 -0500 Subject: rpms/tpctl/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 tpctl.spec, 1.5, 1.6 tpctl-4.8-alt-cli.patch, 1.1, NONE Message-ID: <200501072206.j07M6ciF025441@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/tpctl/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25435 Modified Files: .cvsignore sources tpctl.spec Removed Files: tpctl-4.8-alt-cli.patch Log Message: Vanity update to 4.16. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tpctl/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Nov 2004 17:05:11 -0000 1.4 +++ .cvsignore 7 Jan 2005 22:06:36 -0000 1.5 @@ -1,2 +1 @@ -tpctl_4.14.tar.gz -tpctl_4.15.tar.gz +tpctl_4.16.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tpctl/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Nov 2004 17:05:11 -0000 1.4 +++ sources 7 Jan 2005 22:06:36 -0000 1.5 @@ -1 +1 @@ -d8d84c592dfae6f53cf43824c0c78506 tpctl_4.15.tar.gz +03afcfdd58a97693263ddcec80582fe0 tpctl_4.16.tar.gz Index: tpctl.spec =================================================================== RCS file: /cvs/extras/rpms/tpctl/devel/tpctl.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- tpctl.spec 27 Nov 2004 17:05:11 -0000 1.5 +++ tpctl.spec 7 Jan 2005 22:06:36 -0000 1.6 @@ -1,5 +1,5 @@ Name: tpctl -Version: 4.15 +Version: 4.16 Release: 1 Epoch: 0 Summary: IBM ThinkPad configuration tools @@ -7,11 +7,10 @@ Group: System Environment/Base License: GPL URL: http://tpctl.sourceforge.net/ -Source0: http://download.sourceforge.net/tpctl/tpctl_4.15.tar.gz +Source0: http://download.sourceforge.net/tpctl/tpctl_4.16.tar.gz Source1: %{name}.apmiser.init Patch0: %{name}-rpm.patch Patch1: %{name}-optflags.patch -Patch2: %{name}-4.8-alt-cli.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(id -u -n) BuildRequires: ncurses-devel, libtool @@ -36,7 +35,6 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 cp -p tpctlir/README README.tpctlir @@ -97,6 +95,9 @@ %changelog +* Fri Jan 7 2005 Ville Skytt?? - 0:4.16-1 +- Update to 4.16, tpctlir patch applied upstream. + * Sat Nov 27 2004 Ville Skytt?? - 0:4.15-1 - Vanity update to 4.15, only changelog changed. - Apply tpctlir patch from ALT Linux's tpctl-4.15-alt1, always build it --- tpctl-4.8-alt-cli.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jan 8 06:24:02 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 8 Jan 2005 01:24:02 -0500 Subject: rpms/TeXmacs import.log,1.4,1.5 Message-ID: <200501080624.j086O2Nu031576@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/TeXmacs In directory cvs.fedora.redhat.com:/tmp/cvs-serv31566 Modified Files: import.log Log Message: auto-import TeXmacs-1.0.4.4-1 on branch devel from TeXmacs-1.0.4.4-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 8 Nov 2004 03:59:46 -0000 1.4 +++ import.log 8 Jan 2005 06:24:00 -0000 1.5 @@ -1,3 +1,4 @@ TeXmacs-1_0_2_9-0_fdr_1_rh80:HEAD:TeXmacs-1.0.2.9-0.fdr.1.rh80.src.rpm:1099886373 TeXmacs-1_0_3_7-0_fdr_1_1:HEAD:TeXmacs-1.0.3.7-0.fdr.1.1.src.rpm:1099886379 TeXmacs-1_0_3_7-0_fdr_1_2:HEAD:TeXmacs-1.0.3.7-0.fdr.1.2.src.rpm:1099886386 +TeXmacs-1_0_4_4-1:HEAD:TeXmacs-1.0.4.4-1.src.rpm:1105165464 From fedora-extras-commits at redhat.com Sat Jan 8 06:24:02 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 8 Jan 2005 01:24:02 -0500 Subject: rpms/TeXmacs/devel .cvsignore, 1.3, 1.4 TeXmacs.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200501080624.j086O2ca031580@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/TeXmacs/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv31566/devel Modified Files: .cvsignore TeXmacs.spec sources Log Message: auto-import TeXmacs-1.0.4.4-1 on branch devel from TeXmacs-1.0.4.4-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 03:59:39 -0000 1.3 +++ .cvsignore 8 Jan 2005 06:24:00 -0000 1.4 @@ -1 +1 @@ -TeXmacs-1.0.3.7-src.tar.gz +TeXmacs-1.0.4.4-src.tar.gz Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- TeXmacs.spec 8 Nov 2004 03:59:46 -0000 1.3 +++ TeXmacs.spec 8 Jan 2005 06:24:00 -0000 1.4 @@ -1,16 +1,17 @@ Name: TeXmacs -Version: 1.0.3.7 -Release: 0.fdr.1.2 +Version: 1.0.4.4 +Release: 1 Epoch: 0 Summary: A structured wysiwyg scientific text editor Group: Applications/Editors License: GPL URL: http://www.texmacs.org -Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.3.7-src.tar.gz +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.4.4-src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tetex, tetex-fonts, ghostscript Buildrequires: guile-devel, desktop-file-utils, tetex, freetype-devel, XFree86-devel +Requires(post,postun): shared-mime-info, desktop-file-utils %description GNU TeXmacs is a free scientific text editor, which was both inspired @@ -46,7 +47,6 @@ cp -r -f $GUILE_LOAD_PATH $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs chmod -f 644 $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs/ice-9/* chmod -f 755 $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs/ice-9 -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications mkdir -p $RPM_BUILD_ROOT%{_datadir}/application-registry mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime-info mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps @@ -55,6 +55,19 @@ cp $RPM_BUILD_ROOT%{_datadir}/TeXmacs/misc/mime/texmacs.mime $RPM_BUILD_ROOT%{_datadir}/mime-info cp $RPM_BUILD_ROOT%{_datadir}/TeXmacs/misc/pixmaps/TeXmacs.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps rm -fr $RPM_BUILD_ROOT%{_datadir}/TeXmacs/misc/mime + +mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime/packages +cat > $RPM_BUILD_ROOT%{_datadir}/mime/packages/texmacs.xml < + + + TeXmacs document + + + + +EOF + cat > texmacs.desktop < /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 %defattr(-,root,root,-) %{_bindir}/* @@ -87,13 +114,34 @@ %{_datadir}/applications/* %{_datadir}/application-registry/* %{_datadir}/mime-info/* +%{_datadir}/mime/packages/* %{_datadir}/pixmaps/* +%{_datadir}/icons/gnome/48x48/mimetypes/gnome-mime-text-texmacs.xpm %doc LICENSE COPYING TeXmacs/README TeXmacs/TEX_FONTS %clean rm -rf $RPM_BUILD_ROOT %changelog +* Mon Nov 15 2004 Gerard Milmeister - 0:1.0.4.4-1 +- New Version 1.0.4.4 +- Added support for new mime system + +* Sun Oct 24 2004 Gerard Milmeister - 0:1.0.4.3-0.fdr.1 +- New Version 1.0.4.3 + +* Tue Aug 31 2004 Gerard Milmeister - 0:1.0.4.2-0.fdr.1 +- New Version 1.0.4.2 + +* Mon Aug 9 2004 Gerard Milmeister - 0:1.0.4.1-0.fdr.1 +- New Version 1.0.4.1 + +* Sat Jul 17 2004 Gerard Milmeister - 0:1.0.3.11-0.fdr.1 +- New Version 1.0.3.11 + +* Sun May 23 2004 Gerard Milmeister - 0:1.0.3.9-0.fdr.1 +- New Version 1.0.3.9 + * Sun Apr 4 2004 Gerard Milmeister - 0:1.0.3.6-0.fdr.1 - New Version 1.0.3.6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 03:59:39 -0000 1.3 +++ sources 8 Jan 2005 06:24:00 -0000 1.4 @@ -1 +1 @@ -130ad369d12c96b50235e28f375f6ec0 TeXmacs-1.0.3.7-src.tar.gz +5212c0850a8d6308e8629b75a1f954b5 TeXmacs-1.0.4.4-src.tar.gz From fedora-extras-commits at redhat.com Sat Jan 8 06:27:07 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 8 Jan 2005 01:27:07 -0500 Subject: rpms/xtide import.log,1.4,1.5 Message-ID: <200501080627.j086R7iP031711@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/xtide In directory cvs.fedora.redhat.com:/tmp/cvs-serv31702 Modified Files: import.log Log Message: auto-import xtide-2.8-1 on branch devel from xtide-2.8-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xtide/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 8 Nov 2004 05:36:44 -0000 1.4 +++ import.log 8 Jan 2005 06:27:05 -0000 1.5 @@ -1,3 +1,4 @@ xtide-2_6_4-0_fdr_4_rh90:HEAD:xtide-2.6.4-0.fdr.4.rh90.src.rpm:1099892179 xtide-2_6_4-0_fdr_4_1:HEAD:xtide-2.6.4-0.fdr.4.1.src.rpm:1099892198 xtide-2_6_4-0_fdr_4_2:HEAD:xtide-2.6.4-0.fdr.4.2.src.rpm:1099892204 +xtide-2_8-1:HEAD:xtide-2.8-1.src.rpm:1105165649 From fedora-extras-commits at redhat.com Sat Jan 8 06:27:07 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 8 Jan 2005 01:27:07 -0500 Subject: rpms/xtide/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xtide.spec, 1.4, 1.5 xtide-2.6.4.patch, 1.1, NONE Message-ID: <200501080627.j086R7ps031715@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/xtide/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv31702/devel Modified Files: .cvsignore sources xtide.spec Removed Files: xtide-2.6.4.patch Log Message: auto-import xtide-2.8-1 on branch devel from xtide-2.8-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xtide/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:36:19 -0000 1.2 +++ .cvsignore 8 Jan 2005 06:27:05 -0000 1.3 @@ -1,2 +1,2 @@ -harmonics.tcd.gz -xtide-2.6.4.tar.gz +harmonics-dwf-2004-12-10-v2.tcd.gz +xtide-2.8.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xtide/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:36:19 -0000 1.2 +++ sources 8 Jan 2005 06:27:05 -0000 1.3 @@ -1,2 +1,2 @@ -d632604083928ab97deacfab76c2d50e harmonics.tcd.gz -6b0d5f99586a6356dbfa498629d8f793 xtide-2.6.4.tar.gz +cc55cdf906c9cb5e7938731391f486e0 harmonics-dwf-2004-12-10-v2.tcd.gz +17e34e7d7fc1dcf7b564b2970f821d0e xtide-2.8.tar.gz Index: xtide.spec =================================================================== RCS file: /cvs/extras/rpms/xtide/devel/xtide.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xtide.spec 10 Dec 2004 22:03:13 -0000 1.4 +++ xtide.spec 8 Jan 2005 06:27:05 -0000 1.5 @@ -1,17 +1,16 @@ Summary: A program for calculating tide all over the world Name: xtide -Version: 2.6.4 -Release: 4 +Version: 2.8 +Release: 1 Epoch: 0 URL: http://www.flaterco.com/xtide/ Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.gz -Source1: ftp://harmonics.unh.edu/xtide/harmonics.tcd.gz +Source1: ftp://ftp.flaterco.com/xtide/harmonics-dwf-2004-12-10-v2.tcd.gz Source2: %{name}.desktop -Patch0: %{name}-%{version}.patch +#Patch0: %{name}-%{version}.patch License: GPL Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# BuildRequires: wget BuildRequires: libpng-devel BuildRequires: XFree86-devel BuildRequires: zlib-devel @@ -58,23 +57,19 @@ %prep %setup -q -T -b 0 -%patch -p1 -b .buildroot +#%patch -p1 -b .buildroot cp %{SOURCE1} ./ cp %{SOURCE2} ./ %build %configure -# Generates xml parsing routines. Requires bison and flex. -./do_xml.sh - make %{?_smp_mflags} -# # Get harmonics file -# wget ftp://anonymous:$USER%40$HOSTNAME at harmonics.unh.edu/xtide/harmonics.tcd.gz - # Unzip harmonics file -gunzip harmonics.tcd.gz +gunzip harmonics-dwf-2004-12-10-v2.tcd.gz + +echo "%{_datadir}/%{name}/harmonics-dwf-2004-12-10-v2.tcd" > %{name}.conf %install rm -rf $RPM_BUILD_ROOT @@ -83,11 +78,11 @@ # Install harmonics file. mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name} -cp harmonics.tcd ${RPM_BUILD_ROOT}%{_datadir}/%{name}/ +install -m 644 harmonics-dwf-2004-12-10-v2.tcd ${RPM_BUILD_ROOT}%{_datadir}/%{name}/ # Add configuration file mkdir ${RPM_BUILD_ROOT}%{_sysconfdir} -echo "%{_datadir}/%{name}/harmonics.tcd" > ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}.conf +install -m 644 %{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}.conf # Add desktop entry mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications @@ -112,7 +107,7 @@ %dir %{_datadir}/%{name} # TCD file -%config(missingok) %{_datadir}/%{name}/harmonics.tcd +%config(missingok) %{_datadir}/%{name}/harmonics-dwf-2004-12-10-v2.tcd # Config file %config(noreplace) %{_sysconfdir}/* @@ -125,6 +120,11 @@ %{_sbindir}/* %changelog +* Wed Dec 15 2004 David M. Kaplan 0:2.8-1 +- Updated to version 2.8 +- Cleaned up spec file because much of the tricks to get it to work + are no longer necessary. + * Mon Dec 8 2003 David M. Kaplan 0:2.6.4-0.fdr.4 - Removed 644 permissions. --- xtide-2.6.4.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jan 8 23:07:02 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 8 Jan 2005 18:07:02 -0500 Subject: rpms/xtide import.log,1.5,1.6 Message-ID: <200501082307.j08N727W017159@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/xtide In directory cvs.fedora.redhat.com:/tmp/cvs-serv17150 Modified Files: import.log Log Message: auto-import xtide-2.8-2 on branch devel from xtide-2.8-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xtide/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 8 Jan 2005 06:27:05 -0000 1.5 +++ import.log 8 Jan 2005 23:07:00 -0000 1.6 @@ -2,3 +2,4 @@ xtide-2_6_4-0_fdr_4_1:HEAD:xtide-2.6.4-0.fdr.4.1.src.rpm:1099892198 xtide-2_6_4-0_fdr_4_2:HEAD:xtide-2.6.4-0.fdr.4.2.src.rpm:1099892204 xtide-2_8-1:HEAD:xtide-2.8-1.src.rpm:1105165649 +xtide-2_8-2:HEAD:xtide-2.8-2.src.rpm:1105225646 From fedora-extras-commits at redhat.com Sat Jan 8 23:07:02 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 8 Jan 2005 18:07:02 -0500 Subject: rpms/xtide/devel xtide-2.8.for_x86_64.patch, NONE, 1.1 xtide.spec, 1.5, 1.6 Message-ID: <200501082307.j08N72jv017163@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/xtide/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17150/devel Modified Files: xtide.spec Added Files: xtide-2.8.for_x86_64.patch Log Message: auto-import xtide-2.8-2 on branch devel from xtide-2.8-2.src.rpm xtide-2.8.for_x86_64.patch: --- NEW FILE xtide-2.8.for_x86_64.patch --- diff -Naur xtide-2.8.orig/Makefile.in xtide-2.8/Makefile.in --- xtide-2.8.orig/Makefile.in 2004-12-17 18:21:28.000000000 -0800 +++ xtide-2.8/Makefile.in 2004-12-17 18:14:39.000000000 -0800 @@ -15,7 +15,7 @@ CXX = @CXX@ CC = @CC@ CXXFLAGS = @extracxxflags@ @DEFS@ -I at includedir@ -Ilibtcd -I$(XROOT)/include @normalcxxflags@ -c -LDFLAGS = @extraldflags@ -L at libdir@ -L$(XROOT)/lib @normalldflags@ -o +LDFLAGS = @extraldflags@ -L at libdir@ -L$(XROOT)/lib64 @normalldflags@ -o # Extra switches and libs determined by configure.in extraswitches=@extraswitches@ diff -Naur xtide-2.8.orig/configure xtide-2.8/configure --- xtide-2.8.orig/configure 2004-12-17 18:21:28.000000000 -0800 +++ xtide-2.8/configure 2004-12-17 18:23:57.000000000 -0800 @@ -2602,6 +2602,12 @@ break fi done +for dir in "/usr/X11R6" "/usr/openwin" "/usr/contrib/X11R6" "/usr"; do + if test -r "$dir/lib64/libXaw.so" -o -r "$dir/lib64/libXaw.a" -o -r "$dir/lib64/libXaw.dll.a"; then + xroot="$dir" + break + fi +done echo "$as_me:$LINENO: result: $xroot" >&5 echo "${ECHO_T}$xroot" >&6 if test "$xroot" = "NOT FOUND"; then diff -Naur xtide-2.8.orig/configure.in xtide-2.8/configure.in --- xtide-2.8.orig/configure.in 2004-12-17 18:21:28.000000000 -0800 +++ xtide-2.8/configure.in 2004-12-17 18:19:50.000000000 -0800 @@ -54,6 +54,12 @@ break fi done +for dir in "/usr/X11R6" "/usr/openwin" "/usr/contrib/X11R6" "/usr"; do + if test -r "$dir/lib64/libXaw.so" -o -r "$dir/lib64/libXaw.a" -o -r "$dir/lib64/libXaw.dll.a"; then + xroot="$dir" + break + fi +done AC_MSG_RESULT($xroot) if test "$xroot" = "NOT FOUND"; then AC_MSG_WARN(Type 'make tide' or 'make xttpd' to compile without X11.) Index: xtide.spec =================================================================== RCS file: /cvs/extras/rpms/xtide/devel/xtide.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xtide.spec 8 Jan 2005 06:27:05 -0000 1.5 +++ xtide.spec 8 Jan 2005 23:07:00 -0000 1.6 @@ -1,13 +1,13 @@ Summary: A program for calculating tide all over the world Name: xtide Version: 2.8 -Release: 1 +Release: 2 Epoch: 0 URL: http://www.flaterco.com/xtide/ Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.gz Source1: ftp://ftp.flaterco.com/xtide/harmonics-dwf-2004-12-10-v2.tcd.gz Source2: %{name}.desktop -#Patch0: %{name}-%{version}.patch +Patch0: %{name}-%{version}.for_x86_64.patch License: GPL Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -57,7 +57,11 @@ %prep %setup -q -T -b 0 -#%patch -p1 -b .buildroot + +%ifarch x86_64 +%patch0 -p1 -b .buildroot +%endif + cp %{SOURCE1} ./ cp %{SOURCE2} ./ @@ -120,6 +124,9 @@ %{_sbindir}/* %changelog +* Fri Dec 17 2004 David M. Kaplan 0:2.8-2 +- Made a small hack that should make it compile on x86_64 systems. + * Wed Dec 15 2004 David M. Kaplan 0:2.8-1 - Updated to version 2.8 - Cleaned up spec file because much of the tricks to get it to work From fedora-extras-commits at redhat.com Sun Jan 9 11:58:42 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 9 Jan 2005 06:58:42 -0500 Subject: rpms/perl-IO-Socket-SSL - New directory Message-ID: <200501091158.j09BwgJ8000958@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-IO-Socket-SSL In directory cvs.fedora.redhat.com:/tmp/cvs-serv951/perl-IO-Socket-SSL Log Message: Directory /cvs/extras/rpms/perl-IO-Socket-SSL added to the repository From fedora-extras-commits at redhat.com Sun Jan 9 11:58:42 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 9 Jan 2005 06:58:42 -0500 Subject: rpms/perl-IO-Socket-SSL/devel - New directory Message-ID: <200501091158.j09BwgS6000961@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-IO-Socket-SSL/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv951/perl-IO-Socket-SSL/devel Log Message: Directory /cvs/extras/rpms/perl-IO-Socket-SSL/devel added to the repository From fedora-extras-commits at redhat.com Sun Jan 9 11:59:00 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 9 Jan 2005 06:59:00 -0500 Subject: rpms/perl-IO-Socket-SSL Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501091159.j09Bx0D3001020@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-IO-Socket-SSL In directory cvs.fedora.redhat.com:/tmp/cvs-serv1011 Added Files: Makefile import.log Log Message: Setup of module perl-IO-Socket-SSL --- NEW FILE Makefile --- # Top level Makefile for module perl-IO-Socket-SSL all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 9 11:59:00 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 9 Jan 2005 06:59:00 -0500 Subject: rpms/perl-IO-Socket-SSL/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501091159.j09Bx0Sb001023@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-IO-Socket-SSL/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv1011/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-IO-Socket-SSL --- NEW 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 Jan 9 11:59:32 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 9 Jan 2005 06:59:32 -0500 Subject: rpms/perl-IO-Socket-SSL import.log,1.1,1.2 Message-ID: <200501091159.j09BxW71001116@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-IO-Socket-SSL In directory cvs.fedora.redhat.com:/tmp/cvs-serv1107 Modified Files: import.log Log Message: auto-import perl-IO-Socket-SSL-0.96-3 on branch devel from perl-IO-Socket-SSL-0.96-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 Jan 2005 11:58:58 -0000 1.1 +++ import.log 9 Jan 2005 11:59:30 -0000 1.2 @@ -0,0 +1 @@ +perl-IO-Socket-SSL-0_96-3:HEAD:perl-IO-Socket-SSL-0.96-3.src.rpm:1105271963 From fedora-extras-commits at redhat.com Sun Jan 9 11:59:32 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 9 Jan 2005 06:59:32 -0500 Subject: rpms/perl-IO-Socket-SSL/devel perl-IO-Socket-SSL.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501091159.j09BxWEd001121@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-IO-Socket-SSL/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv1107/devel Modified Files: .cvsignore sources Added Files: perl-IO-Socket-SSL.spec Log Message: auto-import perl-IO-Socket-SSL-0.96-3 on branch devel from perl-IO-Socket-SSL-0.96-3.src.rpm --- NEW FILE perl-IO-Socket-SSL.spec --- %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-IO-Socket-SSL Version: 0.96 Release: 3 Epoch: 0 Summary: Perl library for transparent SSL Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/IO-Socket-SSL/ Source0: http://www.cpan.org/authors/id/B/BE/BEHROOZI/IO-Socket-SSL-0.96.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1, perl(Net::SSLeay) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module is a true drop-in replacement for IO::Socket::INET that uses SSL to encrypt data before it is transferred to a remote server or client. IO::Socket::SSL supports all the extra features that one needs to write a full-featured SSL client or server application: multiple SSL contexts, cipher selection, certificate verification, and SSL version selection. As an extra bonus, it works perfectly with mod_perl. %prep %setup -q -n IO-Socket-SSL-%{version} # Avoid running the session tests (spawns servers, requires 3 free ports # and possibly manual configuration). mv t/sessions.t t/sessions.t.not %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check || : make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc BUGS Changes README certs docs example patches util %{perl_vendorlib}/IO %{_mandir}/man3/*.3* %changelog * Tue Oct 12 2004 Ville Skytt?? - 0:0.96-3 - Disable session test suite even if Net::SSLeay >= 1.26 is available. * Wed Jul 7 2004 Ville Skytt?? - 0:0.96-0.fdr.2 - Bring up to date with current fedora.us Perl spec template. - Include examples in docs. * Sat May 1 2004 Ville Skytt?? - 0:0.96-0.fdr.1 - Update to 0.96. - Reduce directory ownership bloat. - Require perl(:MODULE_COMPAT_*). * Fri Oct 17 2003 Ville Skytt?? - 0:0.95-0.fdr.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Jan 2005 11:58:58 -0000 1.1 +++ .cvsignore 9 Jan 2005 11:59:30 -0000 1.2 @@ -0,0 +1 @@ +IO-Socket-SSL-0.96.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Jan 2005 11:58:58 -0000 1.1 +++ sources 9 Jan 2005 11:59:30 -0000 1.2 @@ -0,0 +1 @@ +85f84c0810851eb4f540b118c9902b03 IO-Socket-SSL-0.96.tar.gz From fedora-extras-commits at redhat.com Sun Jan 9 12:06:16 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 9 Jan 2005 07:06:16 -0500 Subject: rpms/zope - New directory Message-ID: <200501091206.j09C6Gv1001836@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/zope In directory cvs.fedora.redhat.com:/tmp/cvs-serv1829/zope Log Message: Directory /cvs/extras/rpms/zope added to the repository From fedora-extras-commits at redhat.com Sun Jan 9 12:06:16 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 9 Jan 2005 07:06:16 -0500 Subject: rpms/zope/devel - New directory Message-ID: <200501091206.j09C6GZ9001839@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/zope/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv1829/zope/devel Log Message: Directory /cvs/extras/rpms/zope/devel added to the repository From fedora-extras-commits at redhat.com Sun Jan 9 12:06:34 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 9 Jan 2005 07:06:34 -0500 Subject: rpms/zope Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501091206.j09C6YER001898@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/zope In directory cvs.fedora.redhat.com:/tmp/cvs-serv1889 Added Files: Makefile import.log Log Message: Setup of module zope --- NEW FILE Makefile --- # Top level Makefile for module zope all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 9 12:06:35 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 9 Jan 2005 07:06:35 -0500 Subject: rpms/zope/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501091206.j09C6ZOR001901@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/zope/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv1889/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module zope --- NEW 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 Jan 9 12:09:26 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 9 Jan 2005 07:09:26 -0500 Subject: rpms/zope import.log,1.1,1.2 Message-ID: <200501091209.j09C9QI3002024@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/zope In directory cvs.fedora.redhat.com:/tmp/cvs-serv2015 Modified Files: import.log Log Message: auto-import zope-2.7.3-6 on branch devel from zope-2.7.3-6.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/zope/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 Jan 2005 12:06:32 -0000 1.1 +++ import.log 9 Jan 2005 12:09:24 -0000 1.2 @@ -0,0 +1 @@ +zope-2_7_3-6:HEAD:zope-2.7.3-6.src.rpm:1105272558 From fedora-extras-commits at redhat.com Sun Jan 9 12:09:26 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 9 Jan 2005 07:09:26 -0500 Subject: rpms/zope/devel zope-2.7.3-config.patch, NONE, 1.1 zope-README.Fedora, NONE, 1.1 zope.init.in, NONE, 1.1 zope.spec, NONE, 1.1 zope.sysconfig.in, NONE, 1.1 zope.zopectl.in, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501091209.j09C9QTs002028@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/zope/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv2015/devel Modified Files: .cvsignore sources Added Files: zope-2.7.3-config.patch zope-README.Fedora zope.init.in zope.spec zope.sysconfig.in zope.zopectl.in Log Message: auto-import zope-2.7.3-6 on branch devel from zope-2.7.3-6.src.rpm zope-2.7.3-config.patch: --- NEW FILE zope-2.7.3-config.patch --- --- ./skel/etc/zope.conf.in.config 2004-09-28 20:08:52.000000000 +0200 +++ ./skel/etc/zope.conf.in 2004-12-10 18:27:55.393492142 +0100 @@ -138,6 +138,7 @@ # # effective-user chrism +effective-user <> # Directive: enable-product-installation # @@ -295,6 +296,7 @@ # # mime-types $INSTANCE/etc/mime.types +mime-types /etc/mime.types # Directive: structured-text-header-level # @@ -491,7 +493,7 @@ # # Example: # -# security-policy-implementation python +security-policy-implementation python # Directive: skip-authentication-checking # --- NEW FILE zope-README.Fedora --- ==== Concerning the Fedora package ==== A default instance has been installed in <>/lib/zope. You can create additional instances using the mkzopeinstance.py script Add your instances to <>/sysconfig/zope to make the zopectl script aware of them. Every operation run by <>/zopectl will affect all your instances, you can control them independently using the zopectl script in the bin/ directory inside your instance. When you create a new instance, remember to change the default listening ports and to chown the directory to the zope user. --- NEW FILE zope.init.in --- #!/bin/sh # Startup script for Zope # # chkconfig: 345 80 20 # description: Zope, a web application server # # config: $instance/etc/zope.conf # Source function library. . /etc/init.d/functions RETVAL=0 zopectl="<>/zopectl" user="<>" prog="zope" start() { output=`$zopectl -u $user start` # the return status of zopectl is not reliable, we need to parse # its output via substring match if echo $output | grep -q "started"; then # success action $"Starting $prog: " /bin/true touch /var/lock/subsys/$prog RETVAL=0 else # failed action $"Starting $prog: " /bin/false RETVAL=1 fi return $RETVAL } stop() { output=`$zopectl -u $user stop` # the return status of zopectl is not reliable, we need to parse # its output via substring match if echo $output | grep -q "stopped"; then # success action $"Stopping $prog: " /bin/true rm -f /var/lock/subsys/$prog RETVAL=1 else # failed action $"Stopping $prog: " /bin/false RETVAL=0 fi return $RETVAL } restart() { stop start } case "$1" in start) start ;; stop) stop ;; status) $zopectl status ;; restart) restart ;; condrestart) [ -e /var/lock/subsys/$prog ] && restart ;; *) echo $"Usage: $0 {start|stop|status|restart|condrestart}" RETVAL=1 esac exit $REVAL --- NEW FILE zope.spec --- %define python_minver 2.3.3 %define zope_user zope %define zope_group %{zope_user} %define zope_home %{_libdir}/zope %define software_home %{zope_home}/lib/python %define instance_home %{_localstatedir}/lib/zope %define zopectl %{_bindir}/zopectl %define runzope %{_bindir}/runzope Name: zope Summary: Web application server for flexible content management applications Version: 2.7.3 Release: 6 License: ZPL Group: System Environment/Daemons URL: http://www.zope.org/ Source: http://zope.org/Products/Zope/2.7.3/Zope-2.7.3-0.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: zope.init.in #Source2: http://plope.com/software/zope-rpm/zope.logrotate.in Source2: zope.sysconfig.in Source3: zope.zopectl.in Source4: zope-README.Fedora Patch0: zope-2.7.3-config.patch BuildRequires: python-devel >= %{python_minver} BuildRequires: python >= %{python_minver} Requires: python >= %{python_minver} Requires(pre): /usr/sbin/useradd Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig, /sbin/service Requires(postun): /usr/sbin/userdel %description Zope is an application server framework that enables developers to quickly build web applications such as intranets, portals, and content management systems. %prep %setup -q -n Zope-%{version}-0 # Do not use -b option, or we'll install the backup too %patch0 -p1 -b .config rm -f skel/etc/zope.conf.in.config cp -p %{SOURCE4} README.Fedora %build ./configure \ --with-python=%{__python} \ --prefix=$RPM_BUILD_ROOT%{zope_home} \ --optimize # --no-compile make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT rm -f docs # Create all required additional directories for dir in %{zope_home} %{software_home} %{instance_home}/{Products,bin,var} \ %{_sysconfdir}/sysconfig %{_bindir}; do mkdir -p $RPM_BUILD_ROOT$dir done install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/zope install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/zope install -D -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/zopectl perl -pi -e 's,<>,%{_sysconfdir},g; s,<>,%{_bindir},g; s,<>,%{_localstatedir},g; s,<>,%{zope_user},g' \ $RPM_BUILD_ROOT%{_initrddir}/zope \ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/zope \ $RPM_BUILD_ROOT%{_bindir}/zopectl \ README.Fedora skel/etc/zope.conf.in # Install the skel, translating paths, into the build root %{__python} "utilities/copyzopeskel.py" \ --sourcedir="skel" \ --targetdir="$RPM_BUILD_ROOT%{_localstatedir}/lib/zope" \ --replace="INSTANCE_HOME:%{instance_home}" \ --replace="SOFTWARE_HOME:%{software_home}" \ --replace="ZOPE_HOME:%{zope_home}" \ --replace="PYTHON:%{__python}" \ # Actually copy all the other files over make install chmod 700 $RPM_BUILD_ROOT%{_localstatedir}/lib/zope # Symlink to include in the docs ln -sf %{zope_home}/doc docs # write version.txt echo "Zope %{version}-%{release}" > \ "$RPM_BUILD_ROOT%{zope_home}/lib/python/version.txt" # Compile .pyc %{__python} -c "import compileall; \ compileall.compile_dir(\"$RPM_BUILD_ROOT%{zope_home}\", \ ddir=\"%{zope_home}\", force=1)" %clean rm -rf $RPM_BUILD_ROOT %pre /usr/sbin/useradd -c "Zope user" -s /bin/false -r -d %{zope_home} \ %{zope_user} 2>/dev/null || : %post # add zope init to runlevels /sbin/chkconfig --add zope %preun if [ $1 -eq 0 ]; then /sbin/service zope stop >/dev/null 2>&1 /sbin/chkconfig --del zope fi %postun if [ $1 -eq 0 ]; then /usr/sbin/userdel %{zope_user} 2>/dev/null || : fi %files %defattr(-, root, root, -) %doc docs README.Fedora %config(noreplace) %{_sysconfdir}/sysconfig/zope %config %{_initrddir}/zope %attr(0755, root, root) %{_bindir}/zopectl %{zope_home} %attr(-, %{zope_user}, %{zope_group}) %verify(not md5 size mtime) %{instance_home} %changelog * Fri Dec 10 2004 Aurelien Bompard 2.7.3-6 - activate "security-policy-implementation python" in zope.conf * Sun Nov 21 2004 Aurelien Bompard 2.7.3-0.fdr.5 - revert to zope's default directory tree to allow multiple instances - make the zopectl script multiple-instaces-aware. - add README.Fedora * Fri Nov 12 2004 Aurelien Bompard 2.7.3-0.fdr.4 - compile scripts in %zope_home/bin too - keep skel dir in %zope_home to fix mkzopeinstance - BuildRequire python, since python-devel doesn't require it. * Fri Nov 12 2004 Aurelien Bompard 2.7.3-0.fdr.3 - compile .pyc instead of just touch-ing them * Thu Nov 11 2004 Aurelien Bompard 2.7.3-0.fdr.2 - deal with leftover .pyc files - minor spec cleanups * Thu Nov 11 2004 Aurelien Bompard 2.7.3-0.fdr.1 - fix scriptlets requirements - use standard buildroot - replace %%buildroot by RPM_BUILD_ROOT - update to 2.7.3 - drop Hotfix - drop patch 1, fixed upstream * Tue Aug 10 2004 Aurelien Bompard 2.7.2-0.fdr.3 - add hotfix from Zope.org: http://zope.org/Products/Zope/Hotfix-200400807/Hotfix-20040807-alert * Wed Aug 04 2004 Aurelien Bompard 2.7.2-0.fdr.2 - add patch to warn the user that the initial user cannot be added while Zope is running (from Chris McDonough) * Wed Aug 04 2004 Aurelien Bompard 2.7.2-0.fdr.1 - version 2.7.2 - remove leftover byte-compilation in %%post - Zope 2.7.x really requires python >= 2.3.3 * Wed Jul 14 2004 Rex Dieter 2.7.1-0.fdr.1 - 2.7.1 - move files created in %%post back into rpm. Unowned files are bad. - make (theoretically) buildable for all rh73-rh90,fc1/2,el3 NOTE: lowerred python_minver to 2.2.2 to test builds, though (most) docs claim 2.3.3 is required. (??) - don't use Requires(preun,postun) - use %%_smp_mflags * Tue Apr 28 2004 Chris McDonough 2.7.0-0.fdr.1 - Prep for submission to Fedora.us by revising work done by Matthias - Refer to source files by URL instead of by name - Write version.txt into software home in post - Don't ship byte-compiled files, instead compile them in post - Add patch for inverted P_WAIT/P_NOWAIT in zdctl (fixes startup) - Add patch for objectmanager bug that could effect sites that depend on userid/username separation - Improved init script (OK and FAILED now are printed at the appropriate times) - Remove runzope workaround by adding a stanza to the config file. - Start in runlevels 345. - Known issues: - zopectl is started and runs as the root user at boot time, (although Zope itself runs as the zope user) - no distro-specific docs telling people which port the software runs on or how to add a user via zopectl adduser. * Wed Feb 18 2004 Matthias Saou 2.7.0-0.6.fr - Initial RPM release. - The startup/stop needs to be modified further. - Currently "zopectl" returns an error although Zope does start... --- NEW FILE zope.sysconfig.in --- # List here the paths to your Zope instances, space separated. # # Example : ZOPE_INSTANCES="/var/lib/zope-test /var/lib/zope-prod" # # This file is used by the generic zopectl script. # ZOPE_INSTANCES="<>/lib/zope" --- NEW FILE zope.zopectl.in --- #!/bin/bash . <>/sysconfig/zope for instance in $ZOPE_INSTANCES; do $instance/bin/zopectl "$@" done Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/zope/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Jan 2005 12:06:32 -0000 1.1 +++ .cvsignore 9 Jan 2005 12:09:24 -0000 1.2 @@ -0,0 +1 @@ +Zope-2.7.3-0.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/zope/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Jan 2005 12:06:32 -0000 1.1 +++ sources 9 Jan 2005 12:09:24 -0000 1.2 @@ -0,0 +1 @@ +15001ab6d429dc80b1f49735e8d2ee10 Zope-2.7.3-0.tgz From fedora-extras-commits at redhat.com Sun Jan 9 16:24:33 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sun, 9 Jan 2005 11:24:33 -0500 Subject: rpms/ghex/devel sources,1.4,1.5 ghex.spec,1.5,1.6 Message-ID: <200501091624.j09GOXfM005110@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/ghex/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv5104 Modified Files: sources ghex.spec Log Message: Fix for #143876 from Thorsten. Index: sources =================================================================== RCS file: /cvs/extras/rpms/ghex/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Nov 2004 04:23:31 -0000 1.4 +++ sources 9 Jan 2005 16:24:30 -0000 1.5 @@ -1 +1 @@ -7f9b30d0a9e707d395509538f0019bbd ghex-2.8.0.tar.bz2 +ef17f945b9dc701193451f9b083e5116 ghex-2.8.1.tar.bz2 Index: ghex.spec =================================================================== RCS file: /cvs/extras/rpms/ghex/devel/ghex.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ghex.spec 21 Dec 2004 12:24:34 -0000 1.5 +++ ghex.spec 9 Jan 2005 16:24:30 -0000 1.6 @@ -1,12 +1,12 @@ Name: ghex -Version: 2.8.0 -Release: 3 +Version: 2.8.1 +Release: 2 Summary: A binary editor for GNOME Group: Applications/Editors License: GPL URL: http://www.gnome.org/softwaremap/projects/ghex -Source0: http://ftp.gnome.org/pub/GNOME/sources/ghex/2.8/ghex-2.8.0.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/ghex/2.8/ghex-2.8.1.tar.bz2 Patch: ghex-2.8.0-no-scrollkeeper.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -16,6 +16,7 @@ BuildRequires: gettext BuildRequires: desktop-file-utils BuildRequires: scrollkeeper +BuildRequires: libtool Requires(post): GConf2 Requires(post): scrollkeeper Requires(post): /sbin/ldconfig @@ -46,7 +47,7 @@ %build %configure -make %{?_smp_mflags} +make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool %install @@ -108,6 +109,14 @@ %changelog +* Sun Jan 09 2005 Thorsten Leemhuis - 2.8.1-2 +- Use make param LIBTOOL=/usr/bin/libtool insteat autoreconf -- fixes x86_64 + build + +* Mon Dec 27 2004 Thorsten Leemhuis - 2.8.1-1 +- Update to 2.8.1 +- recreate autoconf & co data during pre; fixes build issues on x86_64 + * Tue Dec 21 2004 Michael Schwendt - 2.8.0-3 - Ran into the incomplete-removal-of-epoch trap. Fixed that. From fedora-extras-commits at redhat.com Sun Jan 9 16:28:57 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sun, 9 Jan 2005 11:28:57 -0500 Subject: rpms/ghex/devel ghex.spec,1.6,1.7 Message-ID: <200501091628.j09GSvnq005148@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/ghex/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv5142 Modified Files: ghex.spec Log Message: Fix spelling in changelog entry. Index: ghex.spec =================================================================== RCS file: /cvs/extras/rpms/ghex/devel/ghex.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ghex.spec 9 Jan 2005 16:24:30 -0000 1.6 +++ ghex.spec 9 Jan 2005 16:28:55 -0000 1.7 @@ -110,7 +110,7 @@ %changelog * Sun Jan 09 2005 Thorsten Leemhuis - 2.8.1-2 -- Use make param LIBTOOL=/usr/bin/libtool insteat autoreconf -- fixes x86_64 +- Use make param LIBTOOL=/usr/bin/libtool instead autoreconf -- fixes x86_64 build * Mon Dec 27 2004 Thorsten Leemhuis - 2.8.1-1 From fedora-extras-commits at redhat.com Sun Jan 9 19:29:47 2005 From: fedora-extras-commits at redhat.com (Phillip Compton (pcompton)) Date: Sun, 9 Jan 2005 14:29:47 -0500 Subject: rpms/scribus/devel .cvsignore, 1.4, 1.5 scribus.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200501091929.j09JTlB2007288@cvs.fedora.redhat.com> Author: pcompton Update of /cvs/extras/rpms/scribus/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv7275 Modified Files: .cvsignore scribus.spec sources Log Message: scribus 1.2.1 update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scribus/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 Nov 2004 05:20:05 -0000 1.4 +++ .cvsignore 9 Jan 2005 19:29:45 -0000 1.5 @@ -1 +1 @@ -scribus-1.2.tar.bz2 +scribus-1.2.1.tar.bz2 Index: scribus.spec =================================================================== RCS file: /cvs/extras/rpms/scribus/devel/scribus.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- scribus.spec 10 Dec 2004 22:03:11 -0000 1.6 +++ scribus.spec 9 Jan 2005 19:29:45 -0000 1.7 @@ -1,14 +1,13 @@ Name: scribus -Version: 1.2 -Release: 3 +Version: 1.2.1 +Release: 1 Summary: DeskTop Publishing app in QT. Group: Applications/Productivity License: GPL URL: http://www.scribus.net/ -Source0: http://www.scribus.org.uk/downloads/1.2/scribus-1.2.tar.bz2 +Source0: http://www.scribus.org.uk/downloads/1.2.1/scribus-1.2.1.tar.bz2 Source1: scribus.xml -Source2: scribus.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cups-devel @@ -19,6 +18,7 @@ BuildRequires: libpng-devel BuildRequires: libtiff-devel BuildRequires: libtool +BuildRequires: libxml2-devel BuildRequires: openssl-devel BuildRequires: python-devel >= 2.2 BuildRequires: qt-devel >= 1:3.0.5 @@ -31,6 +31,8 @@ Requires(postun): shared-mime-info Requires(postun): desktop-file-utils +Obsoletes: scribus-i18n-en + %description Scribus is a Layout program for GNU/Linux??, similar to Adobe?? PageMaker???, @@ -71,10 +73,10 @@ install -p -D -m0644 scribus/icons/scribusdoc.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/x-scribus.png install -p -D -m0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/mime/packages/scribus.xml -desktop-file-install --vendor fedora \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - --add-category X-Fedora \ - %{SOURCE2} +desktop-file-install --vendor fedora \ + --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --add-category X-Fedora \ + scribus.desktop find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' @@ -102,6 +104,8 @@ %{_datadir}/pixmaps/* %{_datadir}/scribus/ %{_libdir}/scribus/ +%{_mandir}/man1/* +%{_mandir}/pl/man1/* %files devel %defattr(-,root,root,-) @@ -110,6 +114,12 @@ %changelog +* Sun Jan 09 2005 Phillip Compton - 1.2.1-1 +- 1.2.1. + +* Sat Dec 04 2004 Phillip Compton - 1.2.1-0.1.cvs20041118 +- cvs snapshot. + * Wed Nov 11 2004 Phillip Compton - 1.2-0.fdr.3 - Redirect output in post/postun, to avoid failure. Index: sources =================================================================== RCS file: /cvs/extras/rpms/scribus/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Nov 2004 05:20:05 -0000 1.4 +++ sources 9 Jan 2005 19:29:45 -0000 1.5 @@ -1 +1 @@ -7d2c2b228f9a6ff82c9401fd54bdbe16 scribus-1.2.tar.bz2 +002cb629e817722f4123df7a41fc824b scribus-1.2.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Jan 12 00:56:54 2005 From: fedora-extras-commits at redhat.com (Phillip Compton (pcompton)) Date: Tue, 11 Jan 2005 19:56:54 -0500 Subject: rpms/bluefish/devel .cvsignore, 1.3, 1.4 bluefish.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200501120056.j0C0usMX023068@cvs.fedora.redhat.com> Author: pcompton Update of /cvs/extras/rpms/bluefish/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv23060 Modified Files: .cvsignore bluefish.spec sources Log Message: bluefish 1.0 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bluefish/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:06:19 -0000 1.3 +++ .cvsignore 12 Jan 2005 00:56:52 -0000 1.4 @@ -1 +1 @@ -bluefish-0.13.tar.bz2 +bluefish-1.0.tar.bz2 Index: bluefish.spec =================================================================== RCS file: /cvs/extras/rpms/bluefish/devel/bluefish.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- bluefish.spec 10 Dec 2004 22:03:01 -0000 1.6 +++ bluefish.spec 12 Jan 2005 00:56:52 -0000 1.7 @@ -1,14 +1,13 @@ Name: bluefish -Version: 0.13 -Release: 4 +Version: 1.0 +Release: 1 Summary: A GTK2 web development application for experienced users. Group: Development/Tools License: GPL URL: http://bluefish.openoffice.nl/ -Source0: http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/bluefish-0.13.tar.bz2 -Source1: bluefish.desktop -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/bluefish-1.0.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: aspell-devel >= 0.5 BuildRequires: desktop-file-utils @@ -17,8 +16,9 @@ BuildRequires: gtk2-devel >= 2.0.6 BuildRequires: pcre-devel >= 3.9 Requires(post): desktop-file-utils +Requires(post): shared-mime-info Requires(postun): desktop-file-utils - +Requires(postun): shared-mime-info %description Bluefish is a powerful editor for experienced web designers and programmers. @@ -31,27 +31,20 @@ %build -%configure +%configure --disable-update-databases make %{?_smp_mflags} %install rm -rf ${RPM_BUILD_ROOT} mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications -%makeinstall \ - pkgdatadir=${RPM_BUILD_ROOT}%{_datadir}/%{name} \ - gnome2prefix=${RPM_BUILD_ROOT}%{_datadir}/applications \ - gnome2menupath=${RPM_BUILD_ROOT}%{_datadir}/applications \ - gnome1menupath=/_not_used_here_ \ - iconpath=${RPM_BUILD_ROOT}%{_datadir}/pixmaps +make install DESTDIR=${RPM_BUILD_ROOT} \ %find_lang %{name} - -install -p -D -m0644 inline_images/bluefish_icon1.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png -desktop-file-install --vendor fedora \ +desktop-file-install --vendor fedora --delete-original \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ - %{SOURCE1} + ${RPM_BUILD_ROOT}%{_datadir}/applications/bluefish.desktop %clean @@ -59,10 +52,12 @@ %post +update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %postun +update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : @@ -70,12 +65,21 @@ %defattr(-,root,root,-) %doc COPYING %{_bindir}/bluefish -%{_datadir}/bluefish %{_datadir}/applications/fedora-%{name}.desktop -%{_datadir}/pixmaps/%{name}.png +%{_datadir}/application-registry/* +%{_datadir}/bluefish +%{_datadir}/mime/packages/bluefish.xml +%{_datadir}/mime-info/* +%{_datadir}/pixmaps/* %changelog +* Tue Jan 11 2005 Phillip Compton 1.0-1 +- 1.0. + +* Sat Jan 01 2005 Phillip Compton 1.0-0.1.cvs20041231 +- cvs20041231 + * Fri Nov 12 2004 Phillip Compton 0.13-0.fdr.4 - Redirect output for post/postun. - More mime-types in desktop entry. Index: sources =================================================================== RCS file: /cvs/extras/rpms/bluefish/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:06:19 -0000 1.3 +++ sources 12 Jan 2005 00:56:52 -0000 1.4 @@ -1 +1 @@ -e5f1f5eff0933dc68a51adcdce352826 bluefish-0.13.tar.bz2 +3f92c1ca80da129c0eff0d2fbde69cb3 bluefish-1.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Jan 12 20:05:48 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 15:05:48 -0500 Subject: rpms/liferea import.log,1.6,1.7 Message-ID: <200501122005.j0CK5m4F014402@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/liferea In directory cvs.fedora.redhat.com:/tmp/cvs-serv14393 Modified Files: import.log Log Message: auto-import liferea-0.6.4-1.b on branch devel from liferea-0.6.4-1.b.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/liferea/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 8 Nov 2004 04:49:46 -0000 1.6 +++ import.log 12 Jan 2005 20:05:46 -0000 1.7 @@ -3,3 +3,4 @@ liferea-0_5_3-0_fdr_3_c_1:FC-1:liferea-0.5.3-0.fdr.3.c.1.src.rpm:1099889374 liferea-0_5_3-0_fdr_3_c_2:HEAD:liferea-0.5.3-0.fdr.3.c.2.src.rpm:1099889383 liferea-0_5_3-0_fdr_4_c_2:HEAD:liferea-0.5.3-0.fdr.4.c.2.src.rpm:1099889386 +liferea-0_6_4-1_b:HEAD:liferea-0.6.4-1.b.src.rpm:1105560383 From fedora-extras-commits at redhat.com Wed Jan 12 20:05:48 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 15:05:48 -0500 Subject: rpms/liferea/devel .cvsignore, 1.3, 1.4 liferea.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200501122005.j0CK5m3F014406@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/liferea/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv14393/devel Modified Files: .cvsignore liferea.spec sources Log Message: auto-import liferea-0.6.4-1.b on branch devel from liferea-0.6.4-1.b.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 25 Nov 2004 02:05:20 -0000 1.3 +++ .cvsignore 12 Jan 2005 20:05:46 -0000 1.4 @@ -1 +1 @@ -liferea-0.6.1.tar.gz +liferea-0.6.4b.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- liferea.spec 25 Nov 2004 02:05:20 -0000 1.5 +++ liferea.spec 12 Jan 2005 20:05:46 -0000 1.6 @@ -1,12 +1,13 @@ Name: liferea -Version: 0.6.1 -Release: 1 +Version: 0.6.4 +Release: 1.b +Epoch: 0 Summary: An RSS/RDF feed reader. Group: Applications/Internet License: GPL URL: http://liferea.sourceforge.net/ -Source0: http://download.sourceforge.net/liferea/liferea-0.6.1.tar.gz +Source0: http://download.sourceforge.net/liferea/liferea-0.6.4b.tar.gz Source2: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -30,7 +31,7 @@ %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{version}b %build @@ -82,7 +83,10 @@ %changelog -* Mon Nov 1 2004 Brian Pepple - 0.6.1-1 +* Wed Jan 12 2005 Brian Pepple - 0:0.6.4-1.b +- Updated to 0.6.4b. + +* Mon Nov 1 2004 Brian Pepple - 0:0.6.1-0.fdr.1 - Updated to 0.6.1. - Added %exclude *.la - Removed liferea-0.5.3c-fixes.patch, not needed anymore. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 25 Nov 2004 02:05:20 -0000 1.3 +++ sources 12 Jan 2005 20:05:46 -0000 1.4 @@ -1 +1 @@ -a9a03cdeeb2a57c96dd8e7718917e787 liferea-0.6.1.tar.gz +d45086ee3fc098cc9ca146bece0ddf9f liferea-0.6.4b.tar.gz From fedora-extras-commits at redhat.com Wed Jan 12 20:07:18 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 15:07:18 -0500 Subject: rpms/libkipi - New directory Message-ID: <200501122007.j0CK7INg014537@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libkipi In directory cvs.fedora.redhat.com:/tmp/cvs-serv14530/libkipi Log Message: Directory /cvs/extras/rpms/libkipi added to the repository From fedora-extras-commits at redhat.com Wed Jan 12 20:07:18 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 15:07:18 -0500 Subject: rpms/libkipi/devel - New directory Message-ID: <200501122007.j0CK7I34014540@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libkipi/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv14530/libkipi/devel Log Message: Directory /cvs/extras/rpms/libkipi/devel added to the repository From fedora-extras-commits at redhat.com Wed Jan 12 20:07:43 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 15:07:43 -0500 Subject: rpms/libkipi Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501122007.j0CK7hlg014605@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libkipi In directory cvs.fedora.redhat.com:/tmp/cvs-serv14594 Added Files: Makefile import.log Log Message: Setup of module libkipi --- NEW FILE Makefile --- # Top level Makefile for module libkipi all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 12 20:07:43 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 15:07:43 -0500 Subject: rpms/libkipi/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501122007.j0CK7hnd014608@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libkipi/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv14594/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libkipi --- NEW 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 Jan 12 20:09:36 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 15:09:36 -0500 Subject: rpms/libkipi import.log,1.1,1.2 Message-ID: <200501122009.j0CK9a87014729@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libkipi In directory cvs.fedora.redhat.com:/tmp/cvs-serv14720 Modified Files: import.log Log Message: auto-import libkipi-0.1-2 on branch devel from libkipi-0.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libkipi/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 12 Jan 2005 20:07:41 -0000 1.1 +++ import.log 12 Jan 2005 20:09:34 -0000 1.2 @@ -0,0 +1 @@ +libkipi-0_1-2:HEAD:libkipi-0.1-2.src.rpm:1105560609 From fedora-extras-commits at redhat.com Wed Jan 12 20:09:36 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 15:09:36 -0500 Subject: rpms/libkipi/devel libkipi.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501122009.j0CK9aJs014734@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libkipi/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv14720/devel Modified Files: .cvsignore sources Added Files: libkipi.spec Log Message: auto-import libkipi-0.1-2 on branch devel from libkipi-0.1-2.src.rpm --- NEW FILE libkipi.spec --- Name: libkipi Version: 0.1 Release: 2 Epoch: 0 Summary: Common plugin infrastructure for KDE image applications Group: System Environment/Libraries License: LGPL URL: http://extragear.kde.org/apps/kipi.php Source0: http://dl.sf.net/digikam/libkipi-0.1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel >= 6:3.0 BuildRequires: gettext %description Kipi (KDE Image Plugin Interface) is an effort to develop a common plugin structure for Digikam, KimDaBa, Showimg and Gwenview. Its aim is to share image plugins among graphic applications. %package devel Summary: Common plugin infrastructure for KDE image applications Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} Requires: kdelibs-devel %description devel Kipi (KDE Image Plugin Interface) is an effort to develop a common plugin structure for Digikam, KimDaBa, Showimg and Gwenview. Its aim is to share image plugins among graphic applications. This package contains the files needed to build applications with Kipi support %prep %setup -q %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh %configure --disable-rpath --disable-debug --enable-final make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} #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 -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README TODO %{_libdir}/*.so.* %{_datadir}/apps/kipi %{_datadir}/icons/hicolor/*/apps/kipi.png %{_datadir}/servicetypes/*.desktop %files devel %defattr(-,root,root,-) %{_libdir}/*.so %{_libdir}/*.la %{_libdir}/pkgconfig/*.pc %{_includedir}/libkipi %changelog * Wed Jan 05 2005 Aurelien Bompard 0:0.1-2 - Fix libkipi-devel requirements - Reduce hicolor icon directory ownership bloat - Switch group "System Environment/Libraries" * Mon Oct 25 2004 Aurelien Bompard 0:0.1-0.fdr.1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libkipi/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Jan 2005 20:07:41 -0000 1.1 +++ .cvsignore 12 Jan 2005 20:09:34 -0000 1.2 @@ -0,0 +1 @@ +libkipi-0.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libkipi/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Jan 2005 20:07:41 -0000 1.1 +++ sources 12 Jan 2005 20:09:34 -0000 1.2 @@ -0,0 +1 @@ +7268776060b348c21d9dd9936443dca2 libkipi-0.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Jan 12 20:11:02 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 15:11:02 -0500 Subject: rpms/libkexif - New directory Message-ID: <200501122011.j0CKB2pa014859@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libkexif In directory cvs.fedora.redhat.com:/tmp/cvs-serv14850/libkexif Log Message: Directory /cvs/extras/rpms/libkexif added to the repository From fedora-extras-commits at redhat.com Wed Jan 12 20:11:02 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 15:11:02 -0500 Subject: rpms/libkexif/devel - New directory Message-ID: <200501122011.j0CKB2eG014862@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libkexif/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv14850/libkexif/devel Log Message: Directory /cvs/extras/rpms/libkexif/devel added to the repository From fedora-extras-commits at redhat.com Wed Jan 12 20:11:24 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 15:11:24 -0500 Subject: rpms/libkexif Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501122011.j0CKBOtw014923@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libkexif In directory cvs.fedora.redhat.com:/tmp/cvs-serv14914 Added Files: Makefile import.log Log Message: Setup of module libkexif --- NEW FILE Makefile --- # Top level Makefile for module libkexif all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 12 20:11:24 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 15:11:24 -0500 Subject: rpms/libkexif/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501122011.j0CKBO4D014926@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libkexif/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv14914/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libkexif --- NEW 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 Jan 12 20:12:54 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 15:12:54 -0500 Subject: rpms/libkexif import.log,1.1,1.2 Message-ID: <200501122012.j0CKCsJ9015021@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libkexif In directory cvs.fedora.redhat.com:/tmp/cvs-serv15012 Modified Files: import.log Log Message: auto-import libkexif-0.1-2 on branch devel from libkexif-0.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libkexif/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 12 Jan 2005 20:11:22 -0000 1.1 +++ import.log 12 Jan 2005 20:12:52 -0000 1.2 @@ -0,0 +1 @@ +libkexif-0_1-2:HEAD:libkexif-0.1-2.src.rpm:1105560811 From fedora-extras-commits at redhat.com Wed Jan 12 20:12:54 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 15:12:54 -0500 Subject: rpms/libkexif/devel libkexif.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501122012.j0CKCsfj015027@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libkexif/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv15012/devel Modified Files: .cvsignore sources Added Files: libkexif.spec Log Message: auto-import libkexif-0.1-2 on branch devel from libkexif-0.1-2.src.rpm --- NEW FILE libkexif.spec --- Name: libkexif Version: 0.1 Release: 2 Epoch: 0 Summary: Allow Kipi plugins to extract EXIF information Group: System Environment/Libraries License: GPL URL: http://extragear.kde.org/apps/kipi.php Source0: http://dl.sf.net/digikam/libkexif-0.1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libexif-devel >= 0:0.5.7, kdelibs-devel >= 6:3.0 BuildRequires: gettext %description This library allows Kipi plugins to extract EXIF information from JPEG files. %package devel Summary: Allow Kipi plugins to extract EXIF information Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} Requires: kdelibs-devel %description devel libkexif allows Kipi plugins to extract EXIF information from JPEG files. This package contains the files needed to build applications with libkexif support. %prep %setup -q %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh %configure --disable-rpath --disable-debug --enable-final make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} #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 -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %{_libdir}/*.so %{_libdir}/*.la %{_libdir}/pkgconfig/*.pc %{_includedir}/libkexif %changelog * Wed Jan 05 2005 Aurelien Bompard 0:0.1-2 - Licence is GPL not LGPL - Fix -devel description and requirements - Switch group to "System Environment/Libraries" * Mon Oct 25 2004 Aurelien Bompard 0:0.1-0.fdr.1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libkexif/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Jan 2005 20:11:22 -0000 1.1 +++ .cvsignore 12 Jan 2005 20:12:52 -0000 1.2 @@ -0,0 +1 @@ +libkexif-0.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libkexif/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Jan 2005 20:11:22 -0000 1.1 +++ sources 12 Jan 2005 20:12:52 -0000 1.2 @@ -0,0 +1 @@ +2d1ed6285fd9490c72327ff6dacd9185 libkexif-0.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Jan 12 21:12:00 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 16:12:00 -0500 Subject: rpms/psi import.log,1.8,1.9 Message-ID: <200501122112.j0CLC0ID016330@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/psi In directory cvs.fedora.redhat.com:/tmp/cvs-serv16321 Modified Files: import.log Log Message: auto-import psi-0.9.3-1 on branch devel from psi-0.9.3-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/psi/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 8 Nov 2004 05:14:00 -0000 1.8 +++ import.log 12 Jan 2005 21:11:58 -0000 1.9 @@ -5,3 +5,4 @@ psi-0_9_2-0_fdr_2_rh90:RHL-9:psi-0.9.2-0.fdr.2.rh90.src.rpm:1099890821 psi-0_9_2-0_fdr_2_1:FC-1:psi-0.9.2-0.fdr.2.1.src.rpm:1099890830 psi-0_9_2-0_fdr_2_2:HEAD:psi-0.9.2-0.fdr.2.2.src.rpm:1099890840 +psi-0_9_3-1:HEAD:psi-0.9.3-1.src.rpm:1105564278 From fedora-extras-commits at redhat.com Wed Jan 12 21:12:00 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 12 Jan 2005 16:12:00 -0500 Subject: rpms/psi/devel crystal_roster.jisp, NONE, 1.1 crystal_system.jisp, NONE, 1.1 .cvsignore, 1.4, 1.5 psi.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200501122112.j0CLC07b016334@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/psi/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv16321/devel Modified Files: .cvsignore psi.spec sources Added Files: crystal_roster.jisp crystal_system.jisp Log Message: auto-import psi-0.9.3-1 on branch devel from psi-0.9.3-1.src.rpm --- NEW FILE crystal_roster.jisp --- PK  ?]??? ?"????)^x?]E???B?? ??RJ???@????ik????P?1&??D{v!V???|?|???= ?G(??x??9>.u&MhL?? ? juUkw?????Em.??g[)8p ???????K???a??UYk4?-?4e?lH?  ?I8DI????e(A?H?U?EZ? Z?(??jT- 2raFv??r?[?3N9???s?s?ia?h????????{??m &?w? p????~0???cEQ [F??2T???????`y??u"y?,@???1?4?@@?m?k8?????}k|U????'$?[M0  )%  $i$6 ?cv?I???d????]4d9x!???&?{? ?"bv??^Tl?n6?e??n *"Z??P???Jg?iY??????|?????m??? ]??F????0==??? ???  i??$4J?$??c?3???]DvH?????|??=:??? H)?%ala??GP(rXm"Jmh???a,?"?No??.????>&r?I??@3??Z??u??????eIfffXZZj?RJ???.?o4?Uap?Q??.9m????M;?k?D+p+4,???st???eW?c?vNa`?X?0Q1I,??d?z??U?a~?Y????c??9??7Q?????%NcdP^???C???U??E?pGVF?  -??E!H??`??]??????mC?8???Lf?a7????????_??|??P( ??k?Z????????1 ?J?B?? pe?????d???Z_?s?~??w?8??J|s?v?M??BJy?40T??x8?*?>?-?8?4D??QVVh?:E?XDy????<@4??????4:?O?i??6=:??n?.?4???]??Z?V???D??f??#j??{??GD?eb?.?6ckk?/??m??7?xq??&????n?1M????????t?h?S??? )? ?B ?.4??KHLH?nD ??@???d???;??O=P?????????? X4 ??lb??l????? -?[? ?80? v?9sN2??U??V???\a??u????3?4\cf8???k??q`????????"?_???nx.????z>??fqZ??Y  ???b??q????x?T?l4M?L????a?? ?g???[???B?=z#?C?z????qy`?f!?i?Nx|UV??=W????lz2?o??? ?)^?0???(?j???#???? ?j??va1?/???#??????|Ty??S????9!? ?d??@@ o?????R)??H)Q??????????;7.W>?+??[??^f??1??D???????j??m?3@?? ?f???N?l?`6?=???? 13#Wm???z?s???C???_TKyvD? kF.. G%?`/?\/ ??Y??Lk?d?M ry?C?X?sobr???'d?-?H?? ?`??? 3??b???h?z??n:~???|??[Ec??O??????}??L??????OV??#?R?V???i??? }4?????????k??}trt$g?-.???2?n?'?F,?O!)&N?(}?yne???????????s?? ?o>)?(?-?B?0?D?d at m?D???>?????(( ???(??!?4??dt{?`u??'?{??? j????O1; ^x?e????? h??q??M???r??????=2?????&??u?kd??$;P??P7??g???T?$?????????????KH?????:v?????ho????????D\??v???% ?$????Dg?A ?8?kV??>?N??)r??5O?}S?? ?? J##a????7?J???????Bq?FNK?]2?4?}B????U^??]??VI1x?X2?3?m??0Ug?n?_?{6f+N??D?0?9???7fw??& ?7???*NM]?[???lGJ"?s{??!??pg?-+?eH?/???(v?Uy?%??)??s????X?????? ??h?e9?ncf??????b=h^?4?@?|??Of?Ka??6P?K????+{??}???? q?8?? ???uL?I??k ?iX\???vT#\vUw??}"?l??|1??\?S??Z<*"???@?wU?H??paKLQY>+ddO@????????? v&?M???g?@??`??? ??k??x? ?u:8)???4?z?mI??M'?6???m????-ch??Run?)??d[h???m??? /?$??N???pl j???G????G???2W?????????W[ QP?4?????r??e?#q?Z??????!?hv????????g\???Ul?Z??a??@:?????q?W9$E? ?? P? ?4"?????^?4:????+(????s?'???x???J??s??-"?S(?6???i?? ?E?P??~u}?' K???`@[??~??K?R??}t?RE?EcS0??\?RPmE??/?Jq?.A?`BBXY????oJ?e?k?~???=J?"n8?w?$ ??~???????p??N?{5?7? ???C??t_m H??3?Z??? }?@???N????o????????????y?G?????]??B??,?Z?BK??H???? t!FZ??O#?PK ??&7???7\f?/??????LIpX?'q?7=0L??"^~?????Z??j????<x?tr ????Z`?=Q??iX`8w??)??@?r????9????{??98??~??\z}+f??????(??^??A???C?>?yG1n?&?z13Y?-R6??1????&??@??58??(?c????? S]]]?mK?3??8N?7vu????b:??k?x??=jtY`ss?s^4`)??,x?3??g?mP?T4_>???N?????"?v?]5?8g8 ? y3?|??'#%[?]?????}????jU?y*P?UsP??N9???1????:ZbI?L?\U?fu???V???:?????5\R?????? O???xY?-?\?3O???t?M??L??T?????????%v{?;G6a|^I5l??????_??oZm?p{?\???{?H?4:??\-U ??k)??@???zhc?.r?)x??>?;?N???q??u?????8? ?????>??D??=^=&9?\?$??,=???????????e\y|]\4g8?????+f??????????????u[4????????/:?;?M????y???HC8? c????????b2Y??$!?@??????V?p?P _??RsG{?????&?NU???????????G??????9????_I?%???2??PA?4??z?3?^M?MN??<<??P3"?Fi]`z?w4?<;?p??????????8*!dk?l7u????u??p??.????r????0$???k?a???>%????Zxz??|?#A???&j???????cC????8?*????t/5????o??' bz??`0?{??2-4???T:???^?K??}?X? ??bp???:?l?y?GS??9?]??TY8???'?k6w???Q A ?s? ?,??!?^?y??1%tP?{?O?? ?l???B????2?B??2~???O?>??!|9??4?e?n?a?C ????i??S?SE]?h???E?n?W????]?] Z???7??S???m dm ?C??G?RY$?{X????u?? ???=?t??/????G?? ?? ??zH?'\?wn???}?x?Q?f??FM?? ??M?????????????????? ?y?/0???M?5??{????? Y?Kt?G?r?:???8?3Z}?O?}????R?_??/??#6r??n"O???p&B???g\??A?{???8 ?N???`?XT????=???~??h?{*?????jN?????\??????f!?y1A?b'W???4???t?????js? ?????EAX???????^ ?P??w?&?P?????O)?[D? ZH]&???[??A??e)??!??$?????c8??n?$???qc?\????u???>V at W~2????W?????,l?3? ;???+Z?)0?`?????a3?<%????p??(|??P?CC>s?c???A?jW??? m:F?5v7?bJC2?Yb??e,?>?rt??U?47:??W???????????6;?w?????h=4??jt?y1{?V??????Zd1Xz#?E?$?{???"?|`?V???~?????V??? ?w?nry;??j{? _/GK??,?????????RY?R????f?f?????????X?vX??????"iQG C?o.??y?f??R?_?_?????????m?7? (fh?a?B=?5V?b????Ow????b??H??????.?[??^?|?bdie??0Y??xi??gm?b??~???.??K,????????rk^?x?,?z?"??U?@[bbr????K??|?kZBZB8;??R'%.q!???mj??kaa??i?_?????E??K?2P??k??xd?I~=???f??G?^??v?{$ ???P?P_???&~??lA9??t????U??[? ^!?9!? N???????7o????a??vg?O?,?|??MS????[9T ?JOO?????B?,???!???P[??|M????}?!v:%j%jo???$????D?&??}????8>k@?K??z*??%?Gz?6??????U"X??.1?^?bb5?>;?b3???????H?????8?c?[??l???T?????+?j7???9?\?P??21?P??C??W$??io??fI?o?L?9bv?}?nR?j??V5Jjx??d?u?? ????KBGe/GH[?J?'J????(@?$?xZ??+o4?M]??O??60??<,/????) + K??S-S-o?c ??Z??W ?`X???B=?'?S?????<\?C????"K?6'h?Q?6z?Ss 5??? "2??/?QA??Jx:?d???E?(?G???&k??H ?h&J????????H?#?f??i???m??Q at b???5????aa!?$? ?i??kF?????????W7???? U/?U????$ ? Ux?W{,???:??-s5?H?+???djs66??????????j???H?d?aN?N????:???n?.?~X?Yz?pB?????e?w?"? y??b??(:.???Db???^??=???????O(QSO?E??ia???p@???WiW?ai????X??&r???.?h7???&?????zb?(?KJ??a?>>??GI?I?E???X?Y???Z?-[SB??*??.,l???a`??w'???-fb`p???Y?K???????Z????????2?I???35^??IgI???Jc????q??%??$?,?jSx?2h?#?h?b?b??!+V+??e??LW?y?'Q??l4?c5?M]??C?K1?kW??OtlH?+g??????[??_?-U??%0m3n??????2??~3?i?)d? ??W??q? ?????-w??n?(r??y?\7Us5&l??s?E>K???>?f?B0}~?l?Y?c?????I7?'_?????t??????0[?@\;F?kx?}???aQ?u~)??,,tj??g^?&?8?R?M?;?;99?:???;N??|_&!}???????|&?B$????G?b??V??????W/^9?????s?????#??f~?8*? 1G?m_?? ??GF??s?s? ??3??l}?????^pq%??????2???u<4?T?1????z?NV????6?????{Ow?+Z&-????vpk??r?'?l?mo?????B[]i????Cn?{????w??}}???-??Ez????u???^0???y???????????ZQ\S??????u???J-???S?_?Qj?xy??#??q? ~x??1?Q~w5#L??v&???@?w?(?+?F7n??;?e6?(??e?????SM?p?D#A'Ba?'\1!g??kMW?F,r??8???(????i?+?g?-I??O??v}??M??Qn? c?????$5?&,\!i(????O?? 8?v???>?ah??????,b?a!?R(K??k?????W??? ???(U(U?\A??$P{Z| ??S???Z~?A????Xr??O???1V?Z?>hV?LRG?h?h??B?v???!O?? f6??Fg`o??? y?:WA&Mv??]????)?f????a?ai?&0???L??V??ZP???fF?Hnw??)?????( ????F?5?????@?}L??????X????cH???>??9n:?y??d??A???y????%, ??!?????k??r:U??????]y?? ?L&N?q?????EK?I?t?D????V.?a-??$????j mL?^??O?ul?\Ym?w???=?^?3!?+f?+??=Q???#c`?0>6??"?'??a?s??'??- at 9?',iY h??r?O?O?W[{??<?m/=W?5 X???0?70p????b???$z????_?Gy?J??A? ???3"E$??]?f_x-??&?&M?y?H?4~???I ???Y????????X??&?$Y2??s??e?X??????LC?@Vosu.??2???.Xe??????K???c??0Sv?y?x??-l????`?1?g?a?A_??r?????>?u???????zz???T???s??2??n?}???t??k?Rg[?X;?ej?6??I/1{xk??o$????|???#)>]@????i??E?Wd??????*?ST?dHd????)?ibU??< ?unpVa?@B??Z h ??????????N?gV???e?1?"B??bTN "16?ili?'??m ??????>?(???3*o{~?H7?UX4\?i) ?]W??W?R? QQ`?Q???????;??????????p??n????.r???a?J.??x????z.>??c?u???????u ??]%]%5??????Z?4??M ?,r???V|x??Q?q?z???6b?c?c???????on&/y?E?? ??j?Mt.????,????jx? ???? ???P2 ??L?i???'{b6<?)j?d????4??IX??$3??bSE????R?z?C???????N,?LKL??s??*oD3????r?^y?8A???0???l1em7z???????$ R??qS?>?+ ?,}'i??????3b??y?????Q???iQ??L/??ix?6Xm??U????u??f??????q??6?5SD??4??q????L4u0?HJm ?????V??I?6?????0Og????}Kvf)???:??[???k?O?c[?aB ??b?}????????s?G?##C?`{????7?n?g???rlo??R??QY????(?n5??v??P/C?&??????L??oJ??w)f????q??-??8???V2 ???B(??#? ???=W??2?Y???V?? ? ??YYYp??????????X??o?S???{?zm/ ?:9bi??Q?1?[jg| ??? ????W??????> ???????C?&?????D&Wb_3???????????,????Q?eH`???9m?IEv ???? N=?o????c???.??~?xS?|`/?A?jv> |&`9??myG=i`?W????-???es at l??? ?? v`?2????R??X?? w??a???????td?jG7??&1???OvY43?_??pp*??0????6^O?e ?"+.?h?????9?,.???d\?"$??`%?L8? ??eg???????gJ?fk?R??K? b[??""??ej*?V???^-Y?0???TV?6Y??&????????@??\ ??y??]51???j~?{??VI?.???M?n????tnIv?R?;?a ?:?`??.??qG?57?u??1???K?G?? ^nG+nR*WM?????? ??????E?????8}?}` (T ?o?=4??q?%???? ?Y??M??r;???#t;<*A??l?V???W???p????M?X?cc_??M???? ? `??@  ??????????f???V??,D?AJ?????t?Ff?V??n?57????=W?s?????s????=?s9??K??x????F??3?V??*??N???yi???????N9?8? @h ??????z=jqdo????mz??#?'o??sHg????0?K??-F$M?5?!??????mj????L0???9=/??=]????$jL?{???????L?edPR:????????Qw;???G?R???i?}I?=???F?ao?Sl??zc?>"?????E??Xr???w 4?p???Wp????_?z?"??:?sB????o?Ha4D??   ??? ???p??v????? ?gl?@ i?$v"??A5???????B??? ?.?}????@?&???iGI:Z?D??OK??????V???+????????R?W????????????t6??^???C5:f?&\i???&''[?o?    ????? .CYx??f????????? ?olj?[??aP?5f??d*???????? 2? =.+]Q&p????3?  ??V_Y???t???F?E ????d????????@'108???:?????7?@??  ?&JF????????GJ?n'+?p\?q?^j-???? ?.L&{?G?Tg?X?e?Qk:V ?r ?m??0?/5????C?4}}tJ/2????w????? U?+?*???Xh?}??k??C??#?7??s ???  ????1|??f7P?9p(@ ?L` ?v?????Hn?????S??????+?S]?,?D|6????M????8?i???8??1`l ??t/?I???Z?B??????%%M??????[?"???????"R r*b%l8*ej??(??!!)F?X?\?$ J 7?! ??H$?;q???Tlt%? %???5jt  ???h ????9???~?|?? ?p????? ????????|f`??FQ @X ???5????@?# ^?????????'T  c?0????Se2?Q?a??kd??|?J.??p?? n???_????? e?????'?y?B?o?w?? ???G??E0l???C?H9????KJJ????1??i?[+?0V???w??????]:fu?p??AL???$kr``j&+OX?1?=?? ??'Hm???,??8??b ?-??A???6t???^???X????z???A???????0?5 "{1?[?`y#tL?????????t??l?8We??[m??:?????]??@m???UN?/?5?iH?]?e???T?%?????y?J  4??Ci???#E'?`D @  ???k>?CH???K?"????cX {t>$8?)??2?? ?4???t?????K????t8?????9G?}f2?n?|?>?aDB???d????t:=??L??]????~? ^G,v?6???/I?b6?.55?X?m??? P?T ??pP???4b?X?R???2?\?bY??? ?????????M&JE???fhny?????? @????h4J#?1???t?T?-9? ?#@?O?j? zo??  ?`???O4J@^R?V(??"m?R?_?5?)h?? ns?w?? ?r? 1?Q? ??{_? d?:b ?%????"???V*?'???j?=g?_??X?FZ]????PR??a|??  ?R?????}$??L'?$?$wf?=.?4?Z?9??w??=??;?????H$O&?N?R???d?"?`??b??R?koL?a,.?RW???1$R???lv????p\??Rc??????????z?|???(?bz????$od????????[????????n?GG?eTU)??o??;????splq-??N&?t.??|?a?U?d,??C??-?u??e??dd2??]P  ????9??| ????7?????(?NO?8????&???zG????????xA??????|??jt??Q at u?\N????1?????????????p??iE???wp??psX???1???N Zz ?p?@??(?c(??r9V?* ?(?;???"???<(??_??(?@?q???I?d?M]%8??$?#???6???@??2? : ???.??^? C?D?1GD?0??41???VG?H???b`HQ:?g??b??9?*?o?1??@??[f??-}?(?M$??/+Eisd?t???KI} B?y???e??7?+?^???????,?q???7z?????]L5???0u??{????aJ??g?9|??????g???$8gv??x6???c(?]?  iW?|?????7???-?? 3^|????;ou???D!Rl?.?v?6X???E??????g??c???L????~?t?V?]????}?l~?2?_7r????h??????t????&??S???]??????`?^?&g???? ?gK????,z?'?? ??????????? M.??EEm`?A?? ?_>??g??????  &2??p ~??!??`??k?WPq??c??@?P ??o4a??[?A??2?`6??x?(w:}???e  ?l??R C???~?{V???5;??4i?P?q??7???? ?????m????/???? )?L?j???x???_??m?*  ??S!?f! ??m????i@????3?????J?E?GqE? ? ??N?=???8?q??N?f?]???A?{^Q????@???? ?\? ?ZhP??z=U??5@l5S?????'g??:??x???? [??h?f6??v??6???????,??eg?`???A??Z9???p'??n????Z?????? ;??????  ?*g??(?? r??<.?c?*?????$\??? )???&??LE????????^?#????-????S??O&?>?????^)??   ???u???? `466.???z????UHV?????_{???????????(((H? LH??????=???I@??????s????????????%Se????)????????S???{?????y??wK??a????????\??????7???????`@????t?? o|2s??????? ????3???kL???w?????? ^`?!n#!!?3&6??yp?O?????|?y??E&?uIL???_??????7o??????????>P?? nnn? M??g?????@??i?;qJc??  ???????( 3;;?????y!A?lZd2i??FP??A??Z??????????z ?s????2?]?U}??vS???U?$?wf??q@?,<_???y)????? ???<?~????p?e???????????s???????  ?????EKR'?S???fviQ?S` ? ??????O???i>?[?A??2?`6??x?(w:}???e   \`?V?x[????6XY%?lh?TiU+??eb?G??: ??0E?J???u at YE???S~$???@N???????? ????I?????}???s??????,M?KZ?{?~????EW?#??????y5u??K??????#????&??-`%?/??`?|????O??}????+?K??^??X?R????'??-]Xszp]:?ze??w?[?UG??G&'` ????????W=????C??=t???;j?2?!(?????t???5B??!????????z???"???vp?T??n??????[?FM]?!??{???:~h??W??%?.19?????[vm[???p0?]?????q????? ????!? IN? ?????^?[??-FH?6?? ????|???E?"????i??????~????????? ??C?u???g? !k?7?^onT ???! ? x{sc~?? ??]p????g?????K??;???[z??AoII???9v???? ?h ?B?????Q__?i]??^?????6??? `| ????#??????????//?4???f?????8>??c?9?6u?????y???q??D?Q???PMM 48.?7?#?? ?@!6*???hjjv1?z??0?r???>?=XT P p ???;?K?p~V eR????n?????I?? ???} ?~?u ?u??  ??`???3??!???iN??T???`pp})8?????z? ?2?N? T??R ?? ?;?d??? ?H?|?   ??K??m9???N??H??5?s)Y_?"??????Q???~??O?????f?#?????????U/??He?BX?fK?????????? ?Nn???'?7????IO?D?_?z?????~????????#?)A??z???)????m;?~?? ??=Z????{[?oQ'?n???+???}v?e7?}???.?@??>? ?fJtvR|????? ?9????1Q?u?.??????o??????l??o??? ?? ?S??&?????P??6j????Hzk~?3?q |L???<???Z?O??#L?????????\?G*D[? C1???mX2[?Z ?^?+*2??"??xg,@!w|$?????w?!L?3?ly5???W$#? `?}o? ?NHSRi?H?s$???Z|????????nN??q^?k? 4?K??{0???KI 3???t???,?a9?4??TU)m ? M*~?uE"(mJ ?K?k????&?????x????e?????????o^p pU??4????B h???'?fG??r???0,??TE?*`T?)?ciBH5??UI??|????5/>d???????O1?{??\p?Q`xi4??d0?B%?????&?0aU?J???~?oM?HO3?Rq?????9*??z_d??? 70????|?$?[3?AG?1~???Z -?? ?'?6????Hc=f?@?L??p&?+?7?{|>?+??Gr???? ?1???n"?I?? ?=`&F?u?K2f? ???? ???:????1;' ?T????$?? ?. \!????qO?1Y?9%`E??x ?j\BV'n??\@Aru?0 ?m?F,k??*8A s????An?\@???j|?L??L4??K?????XDu?????Bq???|???^ ? "???k??_??*9???-@,j??H?? ???f_?^??T?l?g??,T@o?p?_q?iG?8?-?? ??@M???kn???Y????$??????????/|??s??\>???????????????"8????z?_? ? $x????? ?Q???A83Z???R?X?????Lzq??????0??x????3w??9??$La??u[`??|??_|???;v?m????o????S?|?}??g?yf ?? ??? ???c?5????????t???$ ???3k?9????}?????N??????F=1jA@?u>=\?U]SI??C?????f?8??1?4 ??4??65??Z\s?7????@????}?kO?\????o?????? 4?X?Ff? ???????m?.[Hq42W??/;????O???? ??k?????[?5???^*??9?????[a?7??o??A?M7?t??-[A?g&?9???/??O[?? Hz???????? +? ?? , ?=?f??N??*?:< [ /RGtMv?u???rm_^??!-?P?9}??w??]Fdn??????#?K|?S?z????~??x1????&?9?? Qd[???n??n!bnc+????i83?? ;2??C?_??-+????|??bm??O=?????????? ?????7???:?>%?SN9??? ???????? ????E?&?Q ci??? ?D??P?9???N!S??xB? ???UL?y???Z????;?????y]???3??a?g?7 06??d?A?? ?GQ t7j?B?H$??????!=NWY?? ??'a9f?4.Fq&?HB?O??_???????w?[??^d?$Q^G"?J???N ????"?`?K??B?9O????F"???K^ ?L?j??*????:U????>?????O?8??K?=?r?E?`s??wl?6_~q ?N?j???9?Y????2?y?S???M??9?I?:O,?2?U?_??????>?`?Z3s??K?|~q??T.???=???? ?_~?}|??,?&v)???N????-????n?P??f?E???R.?`ma$???T:q?????6O?1[????+??[???"c??Kc??.???;Q???9?????0??[?r??N???@oL? ???9???)i??Y???bs?w??? R?"??J?`????Rz?Ld,?r?????G`?\???( R`???^rX5?#?f????95 qqq???????J?r?|oR??u>???????}y?\?t08C\?????ZV??DF? {}~L?A!????k?s?f_C???????%&&??? ?x??a??L??N?I.?CJlm9^v8??????y??Z%??BH?>@?(??"?b?+? ?B?7???v??? ?q6}r?uZ??Jg?h ????,?F?z??]xrr?>??x?>???G?V???2 \9?+?? ?1?hr?Wuw????b???N???s_W?????????5p.Jc?'?+?&????????px?#?6??0t?>A0Y???m?wb???? ?? ? 2u;M?zL??([?-????L?=B?e??????f88??%??)?)?K?b ?????????Z??a???)??x???R/???(????u?'??F??6X??H???~V?? 5?2O  X.@???_c??1C?e?Z?_ ?z??{?eI?J|&`???I:????_r%I.???"d#S =c*??n??A ????????A-?G5X?z?as?V?S??&?t??IP4?3?A??}Z? h1:??bt ?vdS?U??#S???N?)?#?]???a]cj??y?+6|??A?h?l?????H??;?7????? ?2"?!?? b? 6????,?v?????q??C?*??WC???/V?_?? ?&-G??IQ?T?!}?  ,??"?l! K???? ??4?0?D?DA+??1?L??QI??q)qM?R??A?1&? 5????(?8?sm|???????o9?|?"B??4?l? ??v?6d j?? ??????????????I????G?? ?W{?*n0A??raN< KJ?7?I??M??tj??v'??(???!?}D??? +>?A?4??yDZ"w?5:=????????hO8c???9%=%I(?RA???]T G??mx???C??k???v???95 ??p8?.?r?/?oQ????????A}&F? ??s?g???kF$?y?Q?a????????\????????0?Ob??D?Mt?@?? ???CE???@?M???????N<!???/??c??+??W??? ??\ g?Z?S?-LB??9 ???PS???m?r_e6F?5????5P?U\ z????h?L??6 ??.C?r???{?H??9???*.?M{?a4 u?Td??qf??bY? ???$:a?  3d*U?c:8 ?5R@?`In!$?u??:??s????? @t??^??#9???????{?}IJ???R????3?U?q)?x?KS#;;?O?Pg?`???KI`$.-CuO?? ,!3$ ! ?u??v???x????_s???]?vI??y?;v?n8R7??????Y?Z??H??? ?c???q6!??= ??H?$??99H5?H ??1????B???n?RH@??????? ??90i???B`?)?$??20M??53? @ K??2Q??x?z??F??DY??~?????? '??R?3?:????qH? (?z?????(???ge???H??Fi??????p_3wN @????a??iT???XJ???7???M#rrH???:D"LF`??N:?L^? `??+????/?? ?42q:=2????h?????D? W???I?fd(?)SX?????`:G?!?W4_x???w? ?.???(? C&?@?@??]??g{??`G 1??????  "??iF???WDPc?P???????H??  @?i???ry?t??N?8_!?A` ???????1shh?????.*K?T??ELc?Fe ?T?%?A???t??|?8x?d??7?????@ZOg? ??????l?? dH?????6@?y ?: M?{?U??q`?f?? ~?F_u?  ??w?????~??? A~?d?????W/8?E?a????@  Q????#????????? @C?\?{ f` ?S??e8?????_F?` ?r ????????~??? (?? 4 M????;???? ?^?%"d mi? ????? ???}gxv? ???>?zv?T@?Ar  O80???? h??? ????? ? @??????????_???7778????l (I?????????3??????  HB!H$j???LF2:???? ??????v?#e?? ?Q'?15e?bp?$}}??0v??MR?&?????u`?|^????,??4 P&??Sj??m??L?V? ?W? ?E???*??wff?<v???!?:??c? ????5?Z?c?=?????a???????i?~!TrMWN?:^???????,d4tz??x?????J??h_g?=?{E??S!?_ 1?R??G???\?c??[ ??29v???X?:?`???O??B?X@SJ uz?>G??zh????|?;? ???J7????A&? 1;??&?????Pj??*??????LNL??????ek???L?k9MM5??m?D??w???o]??L??   ?u?? Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/psi/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 Nov 2004 05:14:00 -0000 1.4 +++ .cvsignore 12 Jan 2005 21:11:58 -0000 1.5 @@ -1,15 +1,19 @@ -psi-0.9.2.tar.bz2 -psi-icons.tar.bz2 psi_ca.qm.bz2 psi_cs.qm.bz2 -psi_de.qm.bz2 psi_el.qm.bz2 psi_es.qm.bz2 -psi_fr.qm.bz2 psi_it.qm.bz2 psi_mk.qm.bz2 +psi_se.qm.bz2 +psi-0.9.3.tar.bz2 +psi_de.qm.bz2 +psi_ee.qm.bz2 +psi_et.qm.bz2 +psi_fi.qm.bz2 +psi_fr.qm.bz2 psi_nl.qm.bz2 psi_pl.qm.bz2 -psi_se.qm.bz2 +psi_ru.qm.bz2 psi_sk.qm.bz2 +psi_sw.qm.bz2 psi_zh.qm.bz2 Index: psi.spec =================================================================== RCS file: /cvs/extras/rpms/psi/devel/psi.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- psi.spec 10 Nov 2004 02:05:46 -0000 1.6 +++ psi.spec 12 Jan 2005 21:11:58 -0000 1.7 @@ -1,33 +1,32 @@ # Psi has no KDE-specific feature yet, but it's in the TODO list %{!?_without_kde:%define with_kde 1} -Name: psi -Version: 0.9.2 -Release: 4 -Summary: Jabber client using Qt 3 +Name: psi +Version: 0.9.3 +Release: 1 +Summary: Jabber client using QT3 Epoch: 0 -License: GPL -Group: Applications/Internet -URL: http://psi.affinix.com/ -Source0: http://dl.sf.net/psi/psi-0.9.2.tar.bz2 -Source1: %name-icons.tar.bz2 +License: GPL +Group: Applications/Internet +URL: http://psi.affinix.com/ +Source0: http://dl.sf.net/psi/psi-0.9.3.tar.bz2 Source2: psi-uicwrapper.sh Patch1: psi-0.9.2-strip.patch Patch2: psi-0.9.2-mach-build.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel >= 1:3.1.1 -#BuildRequires: qt-designer >= 1:3.1.1 BuildRequires: XFree86-devel BuildRequires: zlib-devel BuildRequires: desktop-file-utils +BuildRequires: qca-devel %if 0%{?with_kde} BuildRequires: kdelibs-devel %endif -Requires: sox +Requires: sox Requires: gnupg -Requires: qca-tls # Language packs Source50: psi_pl.qm.bz2 @@ -35,9 +34,9 @@ Source52: psi_fr.qm.bz2 #Source53: psi_eo.qm.bz2 #Source54: psi_sr at Latn.qm.bz2 -#Source55: psi_fi.qm.bz2 +Source55: psi_fi.qm.bz2 Source56: psi_cs.qm.bz2 -#Source57: psi_ru.qm.bz2 +Source57: psi_ru.qm.bz2 Source58: psi_de.qm.bz2 Source59: psi_es.qm.bz2 Source60: psi_mk.qm.bz2 @@ -48,7 +47,9 @@ Source65: psi_se.qm.bz2 Source66: psi_ca.qm.bz2 Source67: psi_zh.qm.bz2 - +Source68: psi_sw.qm.bz2 +Source69: psi_ee.qm.bz2 +Source70: psi_et.qm.bz2 # Emoticonsets Source100: Chibi.jisp @@ -63,12 +64,14 @@ Source109: Ninja.jisp Source110: webmessenger.jisp - # Rostericonsets Source130: weather.jisp Source131: icqG.jisp Source132: gaduGaduG.jisp -#Source133: neos.jisp +Source133: http://www.cs.kuleuven.ac.be/~remko/psi/crystal/crystal_roster.jisp + +# System iconsets +Source160: http://www.cs.kuleuven.ac.be/~remko/psi/crystal/crystal_system.jisp %description @@ -86,23 +89,9 @@ %description -n %name-i18n This package adds internationalization to Psi. -Supported languages are: -- Polish (pl) -- French (fr) -- Spanish (es) -- Macedonian (mk) -- Dutch (nl) -- Slovak (sk) -- Cesky (cs) -- Catalan (ca) -- German (de) -- Simplified Chinese (zh) -- Italiano (it) -- Greek (el) -- Svenska (se) If you want to add a translation from http://psi.affinix.com, just put the .qm file in %_datadir/%name (you'll have to do -this as root) +this as root), and restart psi. %package -n %name-icons Summary: Additional icons for Psi @@ -119,23 +108,22 @@ %prep -%setup -q -a 1 +%setup -q # (ugly) hack to enable debuginfo subrpm %patch1 -p1 -b .strip # needed to build with mach %patch2 -p1 -b .mach-build %build -unset QTDIR -. %{_sysconfdir}/profile.d/qt.sh +[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh %if 0%{?with_kde} export KDEDIR=%(kde-config --prefix) %endif ./configure \ - --prefix=%{_prefix} \ - --bindir=%{_bindir} \ + --prefix=%{_prefix} \ + --bindir=%{_bindir} \ --libdir=%{_datadir}/%name \ --qtdir=$QTDIR @@ -151,8 +139,6 @@ %install rm -rf $RPM_BUILD_ROOT -unset QTDIR -. %{_sysconfdir}/profile.d/qt.sh export INSTALL_ROOT=$RPM_BUILD_ROOT make install #rm -f $RPM_BUILD_ROOT%{_datadir}/%name/{README,COPYING} @@ -164,9 +150,9 @@ %__bzip2 -dck %{SOURCE52} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_fr.qm #%__bzip2 -dck %{SOURCE53} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_eo.qm #%__bzip2 -dck %{SOURCE54} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_sr at Latn.qm -#%__bzip2 -dck %{SOURCE55} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_fi.qm +%__bzip2 -dck %{SOURCE55} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_fi.qm %__bzip2 -dck %{SOURCE56} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_cs.qm -#%__bzip2 -dck %{SOURCE57} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_ru.qm +%__bzip2 -dck %{SOURCE57} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_ru.qm %__bzip2 -dck %{SOURCE58} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_de.qm %__bzip2 -dck %{SOURCE59} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_es.qm %__bzip2 -dck %{SOURCE60} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_mk.qm @@ -177,6 +163,9 @@ %__bzip2 -dck %{SOURCE65} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_se.qm %__bzip2 -dck %{SOURCE66} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_ca.qm %__bzip2 -dck %{SOURCE67} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_zh.qm +%__bzip2 -dck %{SOURCE68} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_sw.qm +%__bzip2 -dck %{SOURCE69} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_ee.qm +%__bzip2 -dck %{SOURCE69} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_et.qm ## Install iconsets install -p %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/ @@ -194,7 +183,9 @@ install -p %{SOURCE130} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/ install -p %{SOURCE131} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/ install -p %{SOURCE132} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/ -#install -p %{SOURCE133} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/ +install -p %{SOURCE133} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/ + +install -p %{SOURCE160} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/system/ # Menu perl -pi -e 's/Icon=psi/Icon=psi.png/' $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/%{name}.desktop @@ -207,11 +198,8 @@ $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/%{name}.desktop # icon -install -p -D -m 644 %{name}48.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%name.png -install -p -D -m 644 %{name}32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%name.png -install -p -D -m 644 %{name}16.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%name.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -ln -s ../icons/hicolor/48x48/apps/%name.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%name.png +ln -s ../icons/hicolor/48x48/apps/psi.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%name.png %clean @@ -239,9 +227,25 @@ %changelog -* Wed Nov 10 2004 Michael Schwendt - 0:0.9.2-4 -- Fix build for FC3 (define QTDIR in install section). -- Bump package release. +* Sun Jan 09 2005 Aurelien Bompard 0:0.9.3-1 +- version 0.9.3 final + +* Mon Jan 03 2005 Aurelien Bompard 0:0.9.3-0.fdr.0.3.test2 +- version 0.9.3-test2 + +* Thu Nov 25 2004 Aurelien Bompard 0:0.9.3-0.fdr.0.2.test1 +- Drop hardcoded requirement on qca-tls, it should be a plugin + +* Mon Nov 22 2004 Aurelien Bompard 0:0.9.3-0.fdr.0.1.test1 +- update to 0.9.3test1 +- use the provided icon in the menu and drop Source1. +- add crystal iconset +- added Russian and Eesti translations + +* Sat Sep 18 2004 Aurelien Bompard 0:0.9.2-0.fdr.3 +- add patch for typing notification +- add crystal iconset +- update translations (adding kiswahili and Eesti) * Fri Jun 11 2004 Aurelien Bompard 0:0.9.2-0.fdr.2 - split qca-tls out of this package and require it Index: sources =================================================================== RCS file: /cvs/extras/rpms/psi/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Nov 2004 05:14:00 -0000 1.4 +++ sources 12 Jan 2005 21:11:58 -0000 1.5 @@ -1,15 +1,19 @@ -e29f90aea7d839f2a70e4a6e77e95a70 psi-0.9.2.tar.bz2 -d8d5faecb51ea9b7e814e75b3cfa15f2 psi-icons.tar.bz2 1689645b1e2bf181c6fc2d68f070cf0d psi_ca.qm.bz2 69f88fc4768d963bed4cd3ebfbb75a28 psi_cs.qm.bz2 -8cf8142dc0f00b3169d9ba8fdd4793a5 psi_de.qm.bz2 da61ff1ec70cf90357d78f6c81d0ad86 psi_el.qm.bz2 c831c0924c363e8bac42aab577f6982d psi_es.qm.bz2 -8b525df4dce83f5115d92bca5526ca26 psi_fr.qm.bz2 022996fd1f35f26a777f07d667071421 psi_it.qm.bz2 3e1ac01eaf5451f1b1d0968b2f911983 psi_mk.qm.bz2 -084cf4d01df12cd44a3b02e58f75c30a psi_nl.qm.bz2 -02f712f564a07b8fbd3beae0107cc19f psi_pl.qm.bz2 8cc619e6752d6c4db5093eca5d458f0a psi_se.qm.bz2 -e0c9220a54d2622478599cb94c1c38b8 psi_sk.qm.bz2 -5399ddcc710b216c2b816162b7c2f0ba psi_zh.qm.bz2 +d20f3bb530235a246bc2d92308089744 psi-0.9.3.tar.bz2 +52611e036dd0b7cb2ecadcf16eeb9632 psi_de.qm.bz2 +2e19193ebcfd59f80badf011714a2c82 psi_ee.qm.bz2 +2e19193ebcfd59f80badf011714a2c82 psi_et.qm.bz2 +74053f86b57bd74be4b2866dd02b730d psi_fi.qm.bz2 +dd8f83f3c3fc1c20d094f6570acaad4b psi_fr.qm.bz2 +a0cc2e82074a2be17c5ad0004747ac43 psi_nl.qm.bz2 +d3418d4383e47f37f7fedbbc9591db6c psi_pl.qm.bz2 +5e701ee8f56b01c65f3097f5ba13f63c psi_ru.qm.bz2 +784e291e51e4746b602e182ab9ec3ac2 psi_sk.qm.bz2 +a5570c823cfbe33ee602110b89cf4e16 psi_sw.qm.bz2 +38629928c813dc54fc04b38de5e6dcee psi_zh.qm.bz2 From fedora at wir-sind-cool.org Wed Jan 12 21:30:51 2005 From: fedora at wir-sind-cool.org (Michael Schwendt) Date: Wed, 12 Jan 2005 22:30:51 +0100 Subject: rpms/psi/devel crystal_roster.jisp, NONE, 1.1 crystal_system.jisp, NONE, 1.1 .cvsignore, 1.4, 1.5 psi.spec, 1.6, 1.7 sources, 1.4, 1.5 In-Reply-To: <200501122112.j0CLC07b016334@cvs.fedora.redhat.com> References: <200501122112.j0CLC07b016334@cvs.fedora.redhat.com> Message-ID: <20050112223051.4fbc086f.fedora@wir-sind-cool.org> On Wed, 12 Jan 2005 16:12:00 -0500, Michael Schwendt (mschwendt) wrote: > Author: mschwendt > > Update of /cvs/extras/rpms/psi/devel > In directory cvs.fedora.redhat.com:/tmp/cvs-serv16321/devel > > Modified Files: > .cvsignore psi.spec sources > Added Files: > crystal_roster.jisp crystal_system.jisp > Log Message: > auto-import psi-0.9.3-1 on branch devel from psi-0.9.3-1.src.rpm > > > --- NEW FILE crystal_roster.jisp --- > PK > > Here's room for improvement in a future package revision. Probably, wrapping up all the .jisp files (~500K in total!) into a tgz or zip, so they are uploaded into the lookaside cache automatically. Alternatively, adding .jisp to the recognized file extensions. From gafton at redhat.com Wed Jan 12 21:50:05 2005 From: gafton at redhat.com (Cristian Gafton) Date: Wed, 12 Jan 2005 16:50:05 -0500 (EST) Subject: rpms/psi/devel crystal_roster.jisp, NONE, 1.1 crystal_system.jisp, NONE, 1.1 .cvsignore, 1.4, 1.5 psi.spec, 1.6, 1.7 sources, 1.4, 1.5 In-Reply-To: <20050112223051.4fbc086f.fedora@wir-sind-cool.org> References: <200501122112.j0CLC07b016334@cvs.fedora.redhat.com> <20050112223051.4fbc086f.fedora@wir-sind-cool.org> Message-ID: On Wed, 12 Jan 2005, Michael Schwendt wrote: > On Wed, 12 Jan 2005 16:12:00 -0500, Michael Schwendt (mschwendt) wrote: > >> Author: mschwendt >> >> Update of /cvs/extras/rpms/psi/devel >> In directory cvs.fedora.redhat.com:/tmp/cvs-serv16321/devel >> >> Modified Files: >> .cvsignore psi.spec sources >> Added Files: >> crystal_roster.jisp crystal_system.jisp >> Log Message: >> auto-import psi-0.9.3-1 on branch devel from psi-0.9.3-1.src.rpm >> >> >> --- NEW FILE crystal_roster.jisp --- >> PK What the hell is a .jisp? > Here's room for improvement in a future package revision. Probably, > wrapping up all the .jisp files (~500K in total!) into a tgz or zip, so > they are uploaded into the lookaside cache automatically. Alternatively, > adding .jisp to the recognized file extensions. I'd strongly recommend putting all the unkonwn binary files into such an archive - one can take a look at the cvs-import.sh script to figure out how certain file extensions end up in the lookaside cache instead of being checked into CVS... Cristian -- ---------------------------------------------------------------------- Cristian Gafton -- gafton at redhat.com -- Red Hat, Inc. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ "Linux is a leprosy; and is having a deleterious effect on the U.S. IT industry because it is steadily depreciating the value of the software industry sector." -- Kenneth Brown, President, Alexis de Tocqueville Institution From fedora at wir-sind-cool.org Wed Jan 12 21:58:45 2005 From: fedora at wir-sind-cool.org (Michael Schwendt) Date: Wed, 12 Jan 2005 22:58:45 +0100 Subject: rpms/psi/devel crystal_roster.jisp, NONE, 1.1 crystal_system.jisp, NONE, 1.1 .cvsignore, 1.4, 1.5 psi.spec, 1.6, 1.7 sources, 1.4, 1.5 In-Reply-To: References: <200501122112.j0CLC07b016334@cvs.fedora.redhat.com> <20050112223051.4fbc086f.fedora@wir-sind-cool.org> Message-ID: <20050112225845.68798802.fedora@wir-sind-cool.org> On Wed, 12 Jan 2005 16:50:05 -0500 (EST), Cristian Gafton wrote: > >> --- NEW FILE crystal_roster.jisp --- > >> PK > > What the hell is a .jisp? application/vnd.jisp -- Jabber icon style packages (ZIPped) > > Here's room for improvement in a future package revision. Probably, > > wrapping up all the .jisp files (~500K in total!) into a tgz or zip, so > > they are uploaded into the lookaside cache automatically. Alternatively, > > adding .jisp to the recognized file extensions. > > I'd strongly recommend putting all the unkonwn binary files into such an > archive - one can take a look at the cvs-import.sh script to figure out > how certain file extensions end up in the lookaside cache instead of being > checked into CVS... Yes, but too late for the auto-imported old packages (rh9-fc2). From gafton at redhat.com Wed Jan 12 22:38:36 2005 From: gafton at redhat.com (Cristian Gafton) Date: Wed, 12 Jan 2005 17:38:36 -0500 (EST) Subject: rpms/psi/devel crystal_roster.jisp, NONE, 1.1 crystal_system.jisp, NONE, 1.1 .cvsignore, 1.4, 1.5 psi.spec, 1.6, 1.7 sources, 1.4, 1.5 In-Reply-To: <20050112225845.68798802.fedora@wir-sind-cool.org> References: <200501122112.j0CLC07b016334@cvs.fedora.redhat.com> <20050112223051.4fbc086f.fedora@wir-sind-cool.org> <20050112225845.68798802.fedora@wir-sind-cool.org> Message-ID: On Wed, 12 Jan 2005, Michael Schwendt wrote: >>> Here's room for improvement in a future package revision. Probably, >>> wrapping up all the .jisp files (~500K in total!) into a tgz or zip, so >>> they are uploaded into the lookaside cache automatically. Alternatively, >>> adding .jisp to the recognized file extensions. >> >> I'd strongly recommend putting all the unkonwn binary files into such an >> archive - one can take a look at the cvs-import.sh script to figure out >> how certain file extensions end up in the lookaside cache instead of being >> checked into CVS... > > Yes, but too late for the auto-imported old packages (rh9-fc2). Nah, you can move that shite into the lookaside cache. make upload FILES=.... cvs remove .... cvs commit Cristian -- ---------------------------------------------------------------------- Cristian Gafton -- gafton at redhat.com -- Red Hat, Inc. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ "Linux is a leprosy; and is having a deleterious effect on the U.S. IT industry because it is steadily depreciating the value of the software industry sector." -- Kenneth Brown, President, Alexis de Tocqueville Institution From fedora-extras-commits at redhat.com Thu Jan 13 05:21:52 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 00:21:52 -0500 Subject: rpms/psi/RHL-9 apple_ichat-1.0.jisp, 1.1, NONE Chibi.jisp, 1.1, NONE gaduGaduG.jisp, 1.1, NONE icqG.jisp, 1.1, NONE KMess-Cartoon-1.0.jisp, 1.1, NONE kreativ_squareheads.jisp, 1.1, NONE Ninja.jisp, 1.1, NONE shinyicons.jisp, 1.1, NONE tlen.pl-3.73.jisp, 1.1, NONE trill-extra-smileys.jisp, 1.1, NONE trill-extra-symbols.jisp, 1.1, NONE weather.jisp, 1.1, NONE webmessenger.jisp, 1.1, NONE yahoo_messenger.jisp, 1.1, NONE Message-ID: <200501130521.j0D5LqNb025104@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/psi/RHL-9 In directory cvs.fedora.redhat.com:/tmp/cvs-serv25098 Removed Files: apple_ichat-1.0.jisp Chibi.jisp gaduGaduG.jisp icqG.jisp KMess-Cartoon-1.0.jisp kreativ_squareheads.jisp Ninja.jisp shinyicons.jisp tlen.pl-3.73.jisp trill-extra-smileys.jisp trill-extra-symbols.jisp weather.jisp webmessenger.jisp yahoo_messenger.jisp Log Message: Move Jabber icon style packages into lookaside cache manually. --- apple_ichat-1.0.jisp DELETED --- --- Chibi.jisp DELETED --- --- gaduGaduG.jisp DELETED --- --- icqG.jisp DELETED --- --- KMess-Cartoon-1.0.jisp DELETED --- --- kreativ_squareheads.jisp DELETED --- --- Ninja.jisp DELETED --- --- shinyicons.jisp DELETED --- --- tlen.pl-3.73.jisp DELETED --- --- trill-extra-smileys.jisp DELETED --- --- trill-extra-symbols.jisp DELETED --- --- weather.jisp DELETED --- --- webmessenger.jisp DELETED --- --- yahoo_messenger.jisp DELETED --- From fedora-extras-commits at redhat.com Thu Jan 13 05:24:52 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 00:24:52 -0500 Subject: rpms/psi/FC-1 sources, 1.4, 1.5 apple_ichat-1.0.jisp, 1.1, NONE Chibi.jisp, 1.1, NONE gaduGaduG.jisp, 1.1, NONE icqG.jisp, 1.1, NONE KMess-Cartoon-1.0.jisp, 1.1, NONE kreativ_squareheads.jisp, 1.1, NONE Ninja.jisp, 1.1, NONE shinyicons.jisp, 1.1, NONE tlen.pl-3.73.jisp, 1.1, NONE trill-extra-smileys.jisp, 1.1, NONE trill-extra-symbols.jisp, 1.1, NONE weather.jisp, 1.1, NONE webmessenger.jisp, 1.1, NONE yahoo_messenger.jisp, 1.1, NONE Message-ID: <200501130524.j0D5OqrN025175@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/psi/FC-1 In directory cvs.fedora.redhat.com:/tmp/cvs-serv25166/d Modified Files: sources Removed Files: apple_ichat-1.0.jisp Chibi.jisp gaduGaduG.jisp icqG.jisp KMess-Cartoon-1.0.jisp kreativ_squareheads.jisp Ninja.jisp shinyicons.jisp tlen.pl-3.73.jisp trill-extra-smileys.jisp trill-extra-symbols.jisp weather.jisp webmessenger.jisp yahoo_messenger.jisp Log Message: Move Jabber icon style packages into lookaside cache manually. Index: sources =================================================================== RCS file: /cvs/extras/rpms/psi/FC-1/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Nov 2004 05:13:50 -0000 1.4 +++ sources 13 Jan 2005 05:24:50 -0000 1.5 @@ -13,3 +13,17 @@ 8cc619e6752d6c4db5093eca5d458f0a psi_se.qm.bz2 e0c9220a54d2622478599cb94c1c38b8 psi_sk.qm.bz2 5399ddcc710b216c2b816162b7c2f0ba psi_zh.qm.bz2 +259f0351152852d8091b092440557bab apple_ichat-1.0.jisp +6d98db4a5fab3c5909a422d983ed336f Chibi.jisp +a4aada51bbf57c17c2bfda5ba52717ec gaduGaduG.jisp +9d8b4be36909c235657d61698846aee1 icqG.jisp +459d5feae7cf05210f10ffd8df9ac93f KMess-Cartoon-1.0.jisp +f1760382d3aea32199aeb7303493a9ea kreativ_squareheads.jisp +cbe6f581bf32a2cb56e8bf5871db639d Ninja.jisp +9ec2c600f390dc725e4793383ff50ec2 shinyicons.jisp +099c70f9ca25623c89e3ba5b44af2e6d tlen.pl-3.73.jisp +6a3065d33b072e15decbfb3673028df6 trill-extra-smileys.jisp +b743f3f65dfe526b6d730044031d5c78 trill-extra-symbols.jisp +be98902383c572fd3cd6876a6940a73e weather.jisp +0a2ce25ab4506d563bf65da372c9f8f4 webmessenger.jisp +747a785fdaae8dc5a5ee78a3253035ab yahoo_messenger.jisp --- apple_ichat-1.0.jisp DELETED --- --- Chibi.jisp DELETED --- --- gaduGaduG.jisp DELETED --- --- icqG.jisp DELETED --- --- KMess-Cartoon-1.0.jisp DELETED --- --- kreativ_squareheads.jisp DELETED --- --- Ninja.jisp DELETED --- --- shinyicons.jisp DELETED --- --- tlen.pl-3.73.jisp DELETED --- --- trill-extra-smileys.jisp DELETED --- --- trill-extra-symbols.jisp DELETED --- --- weather.jisp DELETED --- --- webmessenger.jisp DELETED --- --- yahoo_messenger.jisp DELETED --- From fedora-extras-commits at redhat.com Thu Jan 13 05:24:52 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 00:24:52 -0500 Subject: rpms/psi/RHL-9 sources,1.4,1.5 Message-ID: <200501130524.j0D5Oqkt025179@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/psi/RHL-9 In directory cvs.fedora.redhat.com:/tmp/cvs-serv25166/RHL-9 Modified Files: sources Log Message: Move Jabber icon style packages into lookaside cache manually. Index: sources =================================================================== RCS file: /cvs/extras/rpms/psi/RHL-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Nov 2004 05:13:41 -0000 1.4 +++ sources 13 Jan 2005 05:24:50 -0000 1.5 @@ -13,3 +13,17 @@ 8cc619e6752d6c4db5093eca5d458f0a psi_se.qm.bz2 e0c9220a54d2622478599cb94c1c38b8 psi_sk.qm.bz2 5399ddcc710b216c2b816162b7c2f0ba psi_zh.qm.bz2 +259f0351152852d8091b092440557bab apple_ichat-1.0.jisp +6d98db4a5fab3c5909a422d983ed336f Chibi.jisp +a4aada51bbf57c17c2bfda5ba52717ec gaduGaduG.jisp +9d8b4be36909c235657d61698846aee1 icqG.jisp +459d5feae7cf05210f10ffd8df9ac93f KMess-Cartoon-1.0.jisp +f1760382d3aea32199aeb7303493a9ea kreativ_squareheads.jisp +cbe6f581bf32a2cb56e8bf5871db639d Ninja.jisp +9ec2c600f390dc725e4793383ff50ec2 shinyicons.jisp +099c70f9ca25623c89e3ba5b44af2e6d tlen.pl-3.73.jisp +6a3065d33b072e15decbfb3673028df6 trill-extra-smileys.jisp +b743f3f65dfe526b6d730044031d5c78 trill-extra-symbols.jisp +be98902383c572fd3cd6876a6940a73e weather.jisp +0a2ce25ab4506d563bf65da372c9f8f4 webmessenger.jisp +747a785fdaae8dc5a5ee78a3253035ab yahoo_messenger.jisp From fedora-extras-commits at redhat.com Thu Jan 13 05:27:25 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 00:27:25 -0500 Subject: rpms/psi/devel sources, 1.5, 1.6 apple_ichat-1.0.jisp, 1.1, NONE Chibi.jisp, 1.1, NONE crystal_roster.jisp, 1.1, NONE crystal_system.jisp, 1.1, NONE gaduGaduG.jisp, 1.1, NONE icqG.jisp, 1.1, NONE KMess-Cartoon-1.0.jisp, 1.1, NONE kreativ_squareheads.jisp, 1.1, NONE Ninja.jisp, 1.1, NONE shinyicons.jisp, 1.1, NONE tlen.pl-3.73.jisp, 1.1, NONE trill-extra-smileys.jisp, 1.1, NONE trill-extra-symbols.jisp, 1.1, NONE weather.jisp, 1.1, NONE webmessenger.jisp, 1.1, NONE yahoo_messenger.jisp, 1.1, NONE Message-ID: <200501130527.j0D5RPgA025265@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/psi/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25259 Modified Files: sources Removed Files: apple_ichat-1.0.jisp Chibi.jisp crystal_roster.jisp crystal_system.jisp gaduGaduG.jisp icqG.jisp KMess-Cartoon-1.0.jisp kreativ_squareheads.jisp Ninja.jisp shinyicons.jisp tlen.pl-3.73.jisp trill-extra-smileys.jisp trill-extra-symbols.jisp weather.jisp webmessenger.jisp yahoo_messenger.jisp Log Message: Move Jabber icon style packages into lookaside cache manually. Index: sources =================================================================== RCS file: /cvs/extras/rpms/psi/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 12 Jan 2005 21:11:58 -0000 1.5 +++ sources 13 Jan 2005 05:27:23 -0000 1.6 @@ -17,3 +17,19 @@ 784e291e51e4746b602e182ab9ec3ac2 psi_sk.qm.bz2 a5570c823cfbe33ee602110b89cf4e16 psi_sw.qm.bz2 38629928c813dc54fc04b38de5e6dcee psi_zh.qm.bz2 +259f0351152852d8091b092440557bab apple_ichat-1.0.jisp +6d98db4a5fab3c5909a422d983ed336f Chibi.jisp +14f8bdbea1873b2972d56726c4c011cf crystal_roster.jisp +ee56b25a85ec3ddef64339e177f7028d crystal_system.jisp +a4aada51bbf57c17c2bfda5ba52717ec gaduGaduG.jisp +9d8b4be36909c235657d61698846aee1 icqG.jisp +459d5feae7cf05210f10ffd8df9ac93f KMess-Cartoon-1.0.jisp +f1760382d3aea32199aeb7303493a9ea kreativ_squareheads.jisp +cbe6f581bf32a2cb56e8bf5871db639d Ninja.jisp +9ec2c600f390dc725e4793383ff50ec2 shinyicons.jisp +099c70f9ca25623c89e3ba5b44af2e6d tlen.pl-3.73.jisp +6a3065d33b072e15decbfb3673028df6 trill-extra-smileys.jisp +b743f3f65dfe526b6d730044031d5c78 trill-extra-symbols.jisp +be98902383c572fd3cd6876a6940a73e weather.jisp +0a2ce25ab4506d563bf65da372c9f8f4 webmessenger.jisp +747a785fdaae8dc5a5ee78a3253035ab yahoo_messenger.jisp --- apple_ichat-1.0.jisp DELETED --- --- Chibi.jisp DELETED --- --- crystal_roster.jisp DELETED --- --- crystal_system.jisp DELETED --- --- gaduGaduG.jisp DELETED --- --- icqG.jisp DELETED --- --- KMess-Cartoon-1.0.jisp DELETED --- --- kreativ_squareheads.jisp DELETED --- --- Ninja.jisp DELETED --- --- shinyicons.jisp DELETED --- --- tlen.pl-3.73.jisp DELETED --- --- trill-extra-smileys.jisp DELETED --- --- trill-extra-symbols.jisp DELETED --- --- weather.jisp DELETED --- --- webmessenger.jisp DELETED --- --- yahoo_messenger.jisp DELETED --- From wtogami at redhat.com Thu Jan 13 06:11:28 2005 From: wtogami at redhat.com (Warren Togami) Date: Wed, 12 Jan 2005 20:11:28 -1000 Subject: rpms/psi/devel crystal_roster.jisp, NONE, 1.1 crystal_system.jisp, NONE, 1.1 .cvsignore, 1.4, 1.5 psi.spec, 1.6, 1.7 sources, 1.4, 1.5 In-Reply-To: References: <200501122112.j0CLC07b016334@cvs.fedora.redhat.com> <20050112223051.4fbc086f.fedora@wir-sind-cool.org> Message-ID: <41E61110.60100@redhat.com> Cristian Gafton wrote: > > I'd strongly recommend putting all the unkonwn binary files into such an > archive - one can take a look at the cvs-import.sh script to figure out > how certain file extensions end up in the lookaside cache instead of > being checked into CVS... > > Cristian If and when you do create archives, please use unique version numbers on that file name. Warren From fedora-extras-commits at redhat.com Thu Jan 13 06:26:08 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 13 Jan 2005 01:26:08 -0500 Subject: rpms/anthy - New directory Message-ID: <200501130626.j0D6Q8HO026171@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/anthy In directory cvs.fedora.redhat.com:/tmp/cvs-serv26158/anthy Log Message: Directory /cvs/extras/rpms/anthy added to the repository From fedora-extras-commits at redhat.com Thu Jan 13 06:26:08 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 13 Jan 2005 01:26:08 -0500 Subject: rpms/anthy/devel - New directory Message-ID: <200501130626.j0D6Q8hs026174@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/anthy/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv26158/anthy/devel Log Message: Directory /cvs/extras/rpms/anthy/devel added to the repository From fedora-extras-commits at redhat.com Thu Jan 13 06:26:40 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 13 Jan 2005 01:26:40 -0500 Subject: rpms/anthy Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501130626.j0D6Qevg026254@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/anthy In directory cvs.fedora.redhat.com:/tmp/cvs-serv26239 Added Files: Makefile import.log Log Message: Setup of module anthy --- NEW FILE Makefile --- # Top level Makefile for module anthy all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 13 06:26:40 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 13 Jan 2005 01:26:40 -0500 Subject: rpms/anthy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501130626.j0D6Qeur026257@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/anthy/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv26239/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module anthy --- NEW 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 Jan 13 06:27:50 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 13 Jan 2005 01:27:50 -0500 Subject: rpms/anthy import.log,1.1,1.2 Message-ID: <200501130627.j0D6RoVG026403@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/anthy In directory cvs.fedora.redhat.com:/tmp/cvs-serv26388 Modified Files: import.log Log Message: auto-import anthy-6024-1 on branch devel from anthy-6024-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/anthy/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Jan 2005 06:26:38 -0000 1.1 +++ import.log 13 Jan 2005 06:27:48 -0000 1.2 @@ -0,0 +1 @@ +anthy-6024-1:HEAD:anthy-6024-1.src.rpm:1105597663 From fedora-extras-commits at redhat.com Thu Jan 13 06:27:50 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 13 Jan 2005 01:27:50 -0500 Subject: rpms/anthy/devel anthy-init.el, NONE, 1.1 anthy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501130627.j0D6RoR1026407@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/anthy/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv26388/devel Modified Files: .cvsignore sources Added Files: anthy-init.el anthy.spec Log Message: auto-import anthy-6024-1 on branch devel from anthy-6024-1.src.rpm --- NEW FILE anthy-init.el --- ;; anthy-init.el ;; (if (featurep 'xemacs) (setq load-path (cons "/usr/share/xemacs/xemacs-packages/lisp/anthy" load-path)) (setq load-path (cons "/usr/share/emacs/site-lisp/anthy" load-path))) (autoload 'anthy-leim-activate "anthy" nil t) (register-input-method "japanese-anthy" "Japanese" 'anthy-leim-activate "[anthy]" "Anthy Kana Kanji conversion system") --- NEW FILE anthy.spec --- %define version 6024 Name: anthy Version: %{version} Release: 1 License: GPL Group: System Environment/Libraries URL: http://sourceforge.jp/projects/anthy/ Buildroot: %{_tmppath}/%{name}-%{version}-buildroot BuildRequires: emacs xemacs Source0: http://prdownloads.sourceforge.jp/anthy/9723/anthy-%{version}.tar.gz Source1: anthy-init.el Summary: A Japanese character set input library %description Anthy provides the library to input Japanese on the applications, such as X applications and emacs. and the user dictionaries and the users information which is used for the conversion, is stored into their own home directory. So Anthy is secure than other conversion server. %package libs Summary: Runtime library for Anthy Group: System Environment/Libraries %description libs The anthy-libs package contains the runtime library to get working the programs which uses Anthy, Japanese character set input library. %package devel Summary: Header files and library for developing programs which uses Anthy Group: Development/Libraries Requires: anthy-libs = %{version}-%{release} %description devel The anthy-devel package contains the development files which is needed to build the programs which uses Anthy. %package el Summary: Emacs Lisp files to use Anthy on Emacs Group: System Environment/Libraries Requires: emacs Requires: anthy = %{version}-%{release} %description el The anthy-el package contains the emacs lisp to be able to input Japanese character set on Emacs. %package el-xemacs Summary: Emacs Lisp files to use Anthy on XEmacs Group: System Environment/Libraries Requires: xemacs Requires: anthy = %{version}-%{release} %description el-xemacs The anthy-el-xemacs package contains the emacs lisp to be able to input Japanese character set on XEmacs. %prep %setup -q %build %configure make %install rm -rf $RPM_BUILD_ROOT %makeinstall ## for anthy-el %__mkdir_p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d ## for anthy-el-xemacs %__mkdir_p $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d pushd $RPM_BUILD_DIR/%{name}-%{version}/src-util make clean make EMACS=xemacs lispdir="\${datadir}/xemacs/xemacs-packages/lisp/anthy" make install-lispLISP DESTDIR=$RPM_BUILD_ROOT EMACS=xemacs lispdir="\${datadir}/xemacs/xemacs-packages/lisp/anthy" popd %clean rm -rf $RPM_BUILD_ROOT %files %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog DIARY NEWS README doc %{_bindir}/* %{_sysconfdir}/* %{_datadir}/anthy/* %files libs %defattr (-, root, root) %{_libdir}/lib*.so.* %files devel %defattr (-, root, root) %{_includedir}/* %{_libdir}/lib*.so %{_libdir}/lib*.a %{_libdir}/lib*.la %{_libdir}/pkgconfig %files el %defattr (-, root, root) %{_datadir}/emacs/site-lisp/anthy/* %{_datadir}/emacs/site-lisp/site-start.d/anthy-init.el %files el-xemacs %defattr (-, root, root) %{_datadir}/xemacs/xemacs-packages/lisp/anthy/* %{_datadir}/xemacs/site-packages/lisp/site-start.d/anthy-init.el %changelog * Wed Jan 12 2005 Akira TAGOH - 6024-1 - New upstream release. * Wed Sep 08 2004 Akira TAGOH 5704-1 - New upstream release. * Mon Jul 05 2004 Akira TAGOH 5500-1 - New upstream release. * Wed Jun 23 2004 Akira TAGOH 5414-1 - New upstream release. * Tue Jun 08 2004 Akira TAGOH 5406-1 - New upstream release. * Fri Jun 04 2004 Warren Togami 5330-3 - some spec cleanups * Tue Jun 01 2004 Akira TAGOH 5330-2 - anthy-init.el: add some elisp to configure anthy. * Tue Jun 01 2004 Akira TAGOH 5330-1 - Initial package. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/anthy/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Jan 2005 06:26:38 -0000 1.1 +++ .cvsignore 13 Jan 2005 06:27:48 -0000 1.2 @@ -0,0 +1 @@ +anthy-6024.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/anthy/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Jan 2005 06:26:38 -0000 1.1 +++ sources 13 Jan 2005 06:27:48 -0000 1.2 @@ -0,0 +1 @@ +9cdedd9d4f384131c09a5b3fc5c097e6 anthy-6024.tar.gz From fedora-extras-commits at redhat.com Thu Jan 13 06:29:45 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 13 Jan 2005 01:29:45 -0500 Subject: rpms/uim - New directory Message-ID: <200501130629.j0D6TjMv026569@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/uim In directory cvs.fedora.redhat.com:/tmp/cvs-serv26556/uim Log Message: Directory /cvs/extras/rpms/uim added to the repository From fedora-extras-commits at redhat.com Thu Jan 13 06:29:45 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 13 Jan 2005 01:29:45 -0500 Subject: rpms/uim/devel - New directory Message-ID: <200501130629.j0D6Tj3h026572@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/uim/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv26556/uim/devel Log Message: Directory /cvs/extras/rpms/uim/devel added to the repository From fedora-extras-commits at redhat.com Thu Jan 13 06:30:02 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 13 Jan 2005 01:30:02 -0500 Subject: rpms/uim Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501130630.j0D6U2TN026651@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/uim In directory cvs.fedora.redhat.com:/tmp/cvs-serv26636 Added Files: Makefile import.log Log Message: Setup of module uim --- NEW FILE Makefile --- # Top level Makefile for module uim all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 13 06:30:02 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 13 Jan 2005 01:30:02 -0500 Subject: rpms/uim/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501130630.j0D6U2nw026654@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/uim/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv26636/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module uim --- NEW 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 Jan 13 06:30:57 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 13 Jan 2005 01:30:57 -0500 Subject: rpms/uim import.log,1.1,1.2 Message-ID: <200501130630.j0D6Uvfb026783@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/uim In directory cvs.fedora.redhat.com:/tmp/cvs-serv26768 Modified Files: import.log Log Message: auto-import uim-0.4.5-1 on branch devel from uim-0.4.5-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/uim/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Jan 2005 06:30:00 -0000 1.1 +++ import.log 13 Jan 2005 06:30:55 -0000 1.2 @@ -0,0 +1 @@ +uim-0_4_5-1:HEAD:uim-0.4.5-1.src.rpm:1105597849 From fedora-extras-commits at redhat.com Thu Jan 13 06:30:57 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 13 Jan 2005 01:30:57 -0500 Subject: rpms/uim/devel uim.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501130630.j0D6UvMn026787@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/uim/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv26768/devel Modified Files: .cvsignore sources Added Files: uim.spec Log Message: auto-import uim-0.4.5-1 on branch devel from uim-0.4.5-1.src.rpm --- NEW FILE uim.spec --- Summary: A multilingual input method library Name: uim Version: 0.4.5 Release: 1 License: GPL/BSD Group: System Environment/Libraries URL: http://freedesktop.org/Software/uim Source0: http://freedesktop.org/Software/UimDownload/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gtk2-devel BuildRequires: gnome-panel-devel %package devel Summary: Development files for the Uim library Group: Development/Libraries Requires: uim = %{version}-%{release} %package gtk2 Summary: GTK+2 support for Uim Group: User Interface/Desktops Requires: uim = %{version}-%{release} Requires(post,postun): gtk2 %package gnome Summary: GNOME Applet for Uim Group: User Interface/Desktops Requires: uim = %{version}-%{release} Requires(post,postun): %{_sbindir}/bonobo-activation-sysconf %package anthy Summary: Anthy support for Uim Group: System Environment/Libraries Requires: anthy Requires: uim = %{version}-%{release} Requires(post,postun): gtk2 %package canna Summary: Canna support for Uim Group: System Environment/Libraries Requires: Canna Canna-devel Requires: uim = %{version}-%{release} Requires(post,postun): gtk2 %package skk Summary: SKK support for Uim Group: System Environment/Libraries Requires: skkdic Requires: uim = %{version}-%{release} Requires(post,postun): gtk2 %description Uim is a multilingual input method library. Uim aims to provide secure and useful input methods for all languages. Currently, it can input to applications which support Gtk+'s immodule or XIM. This package provides the input method library, the XIM bridge and most of the input methods. For the Japanese input methods you need to install - uim-anthy for Anthy - uim-canna for Canna - uim-skk for SKK. %description devel Uim is a multilingual input method library. Uim aims to provide secure and useful input methods for all languages. Currently, it can input to applications which support Gtk+'s immodule or XIM. This package contains the header files and the libraries which is needed for developing Uim applications. %description gtk2 Uim is a multilingual input method library. Uim aims to provide secure and useful input methods for all languages. Currently, it can input to applications which support Gtk+'s immodule or XIM. This package provides the Gtk IM module and helper program. %description gnome Uim is a multilingual input method library. Uim aims to provide secure and useful input methods for all languages. Currently, it can input to applications which support Gtk+'s immodule or XIM. This package provides the GNOME panel applet. %description anthy This package provides support for Anthy, a Japanese input method. %description canna This package provides support for Canna, a Japanese input method. %description skk This package provides support for SKK, a Japanese input method. %define gtk_im_update ( [ -x "%{_bindir}/update-gtk-immodules" ] && %{_bindir}/update-gtk-immodules %{_arch}-%{_host_vendor}-%{_host_os} ) || ( [ -x "%{_bindir}/gtk-query-immodules-2.0" ] && %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules ) %prep %setup -q %build %configure make %install rm -rf $RPM_BUILD_ROOT %makeinstall %find_lang %{name} find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "(anthy|canna|skk|uim-sh)" > scm.list cat scm.list | sed -e s,$RPM_BUILD_ROOT,,g >> %{name}.lang # compress large doc bzip2 ChangeLog %clean rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig %postun /sbin/ldconfig %post gtk2 umask 022 %{gtk_im_update} %postun gtk2 umask 022 if [ $1 = 0 ]; then %{gtk_im_update} fi %post gnome bonobo-activation-sysconf --add-directory=%{_libdir}/bonobo/servers > /dev/null %postun gnome bonobo-activation-sysconf --remove-directory=%{_libdir}/bonobo/servers %post anthy umask 022 %{gtk_im_update} %postun anthy umask 022 if [ $1 = 0 ]; then %{gtk_im_update} fi %post canna umask 022 %{gtk_im_update} %postun canna umask 022 if [ $1 = 0 ]; then %{gtk_im_update} fi %post skk umask 022 %{gtk_im_update} %postun skk umask 022 if [ $1 = 0 ]; then %{gtk_im_update} fi %files -f %{name}.lang %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog* NEWS README %lang(ja) %doc README.ja %{_bindir}/uim-fep* %{_bindir}/uim-helper-server %{_bindir}/uim-xim %{_libdir}/lib*.so.* %dir %{_datadir}/uim %{_datadir}/uim/tables %files devel %defattr (-, root, root) %dir %{_datadir}/uim %{_bindir}/uim-sh %{_includedir}/uim/* %{_libdir}/gtk-2.0/2.*/immodules/im-uim.*a %{_libdir}/lib*.a %{_libdir}/lib*.la %{_libdir}/lib*.so %{_libdir}/pkgconfig/* %{_datadir}/uim/uim-sh.scm %files gtk2 %defattr (-, root, root) %{_bindir}/uim-candwin-gtk %{_bindir}/uim-im-switcher %{_bindir}/uim-input-pad-ja %{_bindir}/uim-toolbar-gtk %{_bindir}/uim-toolbar-gtk-systray %{_libdir}/gtk-2.0/2.*/immodules %exclude %{_libdir}/gtk-2.0/2.*/immodules/im-uim.*a %dir %{_datadir}/uim %{_datadir}/uim/icons %files gnome %defattr (-, root, root) %{_libexecdir}/uim-toolbar-applet %{_libdir}/bonobo/servers/GNOME_UimApplet.server %files anthy %defattr (-, root, root) %dir %{_datadir}/uim %{_datadir}/uim/anthy.scm %files canna %defattr (-, root, root) %dir %{_datadir}/uim %{_datadir}/uim/canna.scm %files skk %defattr (-, root, root) %dir %{_datadir}/uim %{_datadir}/uim/skk*.scm %changelog * Wed Jan 12 2005 Akira TAGOH 0.4.5-1 - New upstream release. * Wed Sep 08 2004 Akira TAGOH 0.4.3-1 - New upstream release. - moved out gtk2 related files to uim-gtk2 package. * Mon Jul 12 2004 Jens Petersen - 0.4.0-1 - no longer need to remove screen files - include console fep programs * Fri Jul 2 2004 Jens Petersen - 0.3.9-3 - support both update-gtk-immodules of newer gtk2 and older gtk-query-immodules-2.0 with new %%gtk_im_update added * Wed Jun 30 2004 Jens Petersen - 0.3.9-2 - add uim-applet-category-cjk.patch to put applet in right submenu - improve the summaries and descriptions - make the Requires(postun) be Requires(post,postun) - file ownership and other minor cleanup * Wed Jun 23 2004 Akira TAGOH 0.3.9-1 - New upstream release. * Fri Jun 04 2004 Akira TAGOH 0.3.8-4 - wrote the descriptions. - uim-skk: fixed the dependency. * Fri Jun 04 2004 Nils Philippsen 0.3.8-3 - more spec cleanups * Fri Jun 04 2004 Warren Togami 0.3.8-2 - many spec cleanups * Thu Jun 03 2004 Akira TAGOH 0.3.8-1 - Initial package. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/uim/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Jan 2005 06:30:00 -0000 1.1 +++ .cvsignore 13 Jan 2005 06:30:55 -0000 1.2 @@ -0,0 +1 @@ +uim-0.4.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/uim/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Jan 2005 06:30:00 -0000 1.1 +++ sources 13 Jan 2005 06:30:55 -0000 1.2 @@ -0,0 +1 @@ +3979e20d8375fcd1691d74949e5b626c uim-0.4.5.tar.gz From wtogami at redhat.com Thu Jan 13 07:10:09 2005 From: wtogami at redhat.com (Warren Togami) Date: Wed, 12 Jan 2005 21:10:09 -1000 Subject: APPROVED: uim and anthy Message-ID: <41E61ED1.3070304@redhat.com> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 anthy-6024-1 uim-0.4.5-1 These two packages pass my inspection (I actually helped to clean them up a few months ago.) tagoh at redhat.com will be maintaining them in Extras. PUBLISH APPROVED by wtogami at redhat.com on Wed Jan 12th, 2004 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) iD8DBQFB5h6ea93+jlSirPERAokIAJ4g/oMjvLGX7GSvj9Dp8M/UbYIw8ACeIzyB i7iSHB54TLdcumqOyLFE800= =h8k4 -----END PGP SIGNATURE----- From fedora-extras-commits at redhat.com Thu Jan 13 11:14:38 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 06:14:38 -0500 Subject: rpms/gl-117 import.log,1.2,1.3 Message-ID: <200501131114.j0DBEc03000808@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gl-117 In directory cvs.fedora.redhat.com:/tmp/cvs-serv798 Modified Files: import.log Log Message: auto-import gl-117-1.3.1-1 on branch devel from gl-117-1.3.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gl-117/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 8 Nov 2004 04:25:52 -0000 1.2 +++ import.log 13 Jan 2005 11:14:36 -0000 1.3 @@ -1 +1,2 @@ gl-117-1_3-0_fdr_1_2:HEAD:gl-117-1.3-0.fdr.1.2.src.rpm:1099887952 +gl-117-1_3_1-1:HEAD:gl-117-1.3.1-1.src.rpm:1105614917 From fedora-extras-commits at redhat.com Thu Jan 13 11:14:38 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 06:14:38 -0500 Subject: rpms/gl-117/devel .cvsignore, 1.2, 1.3 gl-117.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200501131114.j0DBEceE000811@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gl-117/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv798/devel Modified Files: .cvsignore gl-117.spec sources Log Message: auto-import gl-117-1.3.1-1 on branch devel from gl-117-1.3.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gl-117/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:25:52 -0000 1.2 +++ .cvsignore 13 Jan 2005 11:14:36 -0000 1.3 @@ -1 +1 @@ -gl-117-1.3-src.tar.bz2 +gl-117-1.3.1-src.tar.bz2 Index: gl-117.spec =================================================================== RCS file: /cvs/extras/rpms/gl-117/devel/gl-117.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gl-117.spec 10 Dec 2004 22:03:02 -0000 1.2 +++ gl-117.spec 13 Jan 2005 11:14:36 -0000 1.3 @@ -1,13 +1,13 @@ Name: gl-117 -Version: 1.3 +Version: 1.3.1 Release: 1 Epoch: 0 -Summary: GL-117 is an action flight simulator. +Summary: An action flight simulator Group: Amusements/Games License: GPL -URL: http://home.t-online.de/home/Primetime./gl-117/gl-117.html -Source0: http://dl.sf.net/sourceforge/gl-117/gl-117-1.3-src.tar.bz2 +URL: http://www.heptargon.de/ +Source0: http://dl.sf.net/sourceforge/gl-117/gl-117-%{version}-src.tar.bz2 Source1: gl-117.desktop Source2: gl-117.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -27,7 +27,7 @@ %setup -q -n %{name}-%{version}-src %build -%configure +%configure LDFLAGS="-L/usr/X11R6/%{_lib} -lX11 -lXi -lXmu" make %{?_smp_mflags} %install @@ -55,5 +55,20 @@ %{_mandir}/man6/* %changelog -* Fri Jul 09 2004 Panu Matilainen 0:1.3-0.fdr.1 -- initial packaging +* Tue Dec 21 2004 Panu Matilainen 0:1.3.1-1 +- update to 1.3.1 + +* Sat Jun 19 2004 Panu Matilainen 0:1.3-0.lvn.1 +- update to 1.3 + +* Fri May 21 2004 Panu Matilainen 0:1.2-0.lvn.1 +- update to 1.2 +- dont include document sources +- put manpage where it belongs + +* Thu Nov 27 2003 Panu Matilainen 0:1.0.1-0.lvn.2.2 +- remove ldflags patch (it would've required autoconf), pass LDFLAGS on + configure line instead + +* Thu Nov 27 2003 Panu Matilainen 0:1.0.1-0.lvn.1.2 +- Initial packaging. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gl-117/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:25:52 -0000 1.2 +++ sources 13 Jan 2005 11:14:36 -0000 1.3 @@ -1 +1 @@ -38740f8d354416d3ae30f1b0e1c203c7 gl-117-1.3-src.tar.bz2 +c9bf8573ebb60fd77dc18de7eda006ec gl-117-1.3.1-src.tar.bz2 From fedora-extras-commits at redhat.com Thu Jan 13 13:30:47 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 08:30:47 -0500 Subject: rpms/supertux import.log,1.3,1.4 Message-ID: <200501131330.j0DDUlLZ003020@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/supertux In directory cvs.fedora.redhat.com:/tmp/cvs-serv3011 Modified Files: import.log Log Message: auto-import supertux-0.1.2-1 on branch devel from supertux-0.1.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/supertux/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 8 Nov 2004 05:24:05 -0000 1.3 +++ import.log 13 Jan 2005 13:30:45 -0000 1.4 @@ -1,2 +1,3 @@ supertux-0_1_1-0_fdr_1_1:HEAD:supertux-0.1.1-0.fdr.1.1.src.rpm:1099891439 supertux-0_1_1-0_fdr_1_2:HEAD:supertux-0.1.1-0.fdr.1.2.src.rpm:1099891445 +supertux-0_1_2-1:HEAD:supertux-0.1.2-1.src.rpm:1105623086 From fedora-extras-commits at redhat.com Thu Jan 13 13:30:47 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 08:30:47 -0500 Subject: rpms/supertux/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 supertux.spec, 1.3, 1.4 supertux-0.1.1-nonefix.patch, 1.1, NONE Message-ID: <200501131330.j0DDUlbv003024@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/supertux/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv3011/devel Modified Files: .cvsignore sources supertux.spec Removed Files: supertux-0.1.1-nonefix.patch Log Message: auto-import supertux-0.1.2-1 on branch devel from supertux-0.1.2-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/supertux/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:23:59 -0000 1.2 +++ .cvsignore 13 Jan 2005 13:30:45 -0000 1.3 @@ -1 +1 @@ -supertux-0.1.1.tar.bz2 +supertux-0.1.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/supertux/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:23:59 -0000 1.2 +++ sources 13 Jan 2005 13:30:45 -0000 1.3 @@ -1 +1 @@ -5a6fdf8e0aa4e5b4adbd573a11576f9c supertux-0.1.1.tar.bz2 +7c10acf574f09ae5cb9eb2a4b9bf93ff supertux-0.1.2.tar.bz2 Index: supertux.spec =================================================================== RCS file: /cvs/extras/rpms/supertux/devel/supertux.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- supertux.spec 10 Dec 2004 22:03:11 -0000 1.3 +++ supertux.spec 13 Jan 2005 13:30:45 -0000 1.4 @@ -1,15 +1,14 @@ Name: supertux -Version: 0.1.1 +Version: 0.1.2 Release: 1 Epoch: 0 -Summary: SuperTux is a jump'n run like game similar to Mario Bros. +Summary: A jump'n run like game similar to Mario Bros Group: Amusements/Games License: GPL URL: http://super-tux.sourceforge.net/ -Source0: http://dl.sf.net/super-tux/supertux-0.1.1.tar.bz2 +Source0: http://dl.sf.net/super-tux/supertux-0.1.2.tar.bz2 Source1: %{name}.desktop -Patch0: %{name}-0.1.1-nonefix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel >= 0:1.2.4, SDL_image-devel, SDL_mixer-devel @@ -25,7 +24,6 @@ %prep %setup -q -%patch0 -p1 %build @@ -58,5 +56,11 @@ %{_datadir}/pixmaps/* %changelog +* Sun Oct 03 2004 Panu Matilainen 0:0.1.2-1 +- update to 0.1.2 + +* Sat May 15 2004 Panu Matilainen 0:0.1.1-0.fdr.2 +- add buildrequires libtiff-devel + * Thu May 13 2004 Panu Matilainen 0:0.1.1-0.fdr.1 - Initial RPM release. --- supertux-0.1.1-nonefix.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jan 13 13:37:38 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 08:37:38 -0500 Subject: rpms/epydoc/devel epydocgui.desktop,NONE,1.1 epydoc.spec,1.2,1.3 Message-ID: <200501131337.j0DDbcT8003154@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/epydoc/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv3144 Modified Files: epydoc.spec Added Files: epydocgui.desktop Log Message: Improvements from Ville. --- NEW FILE epydocgui.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Epydoc Comment=Python API documentation generator Exec=epydocgui Type=Application Terminal=false Categories=Application;Development; Index: epydoc.spec =================================================================== RCS file: /cvs/extras/rpms/epydoc/devel/epydoc.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- epydoc.spec 16 Nov 2004 17:37:28 -0000 1.2 +++ epydoc.spec 13 Jan 2005 13:37:36 -0000 1.3 @@ -1,15 +1,19 @@ -# $Id$ +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Summary: Edward Loper's Python API documentation generation tool Name: epydoc Version: 2.1 -Release: 2 +Release: 3 Group: Development/Tools License: MIT URL: http://epydoc.sourceforge.net/ -Source: http://dl.sf.net/epydoc/epydoc-%{version}.tar.gz +Source0: http://dl.sf.net/epydoc/epydoc-%{version}.tar.gz +Source1: epydocgui.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: python +Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") +Requires: tkinter +BuildRequires: python desktop-file-utils +BuildArch: noarch %description Epydoc is a tool for generating API documentation for Python modules, @@ -31,11 +35,18 @@ %install %{__rm} -rf %{buildroot} -%{__python} setup.py install --root=%{buildroot} +%{__python} setup.py install -O1 --skip-build --root=%{buildroot} + +desktop-file-install \ + --vendor=fedora \ + --dir=%{buildroot}%{_datadir}/applications \ + --mode=644 \ + --add-category=X-Fedora \ + %{SOURCE1} # Also install the man pages -%{__install} -D man/epydoc.1 %{buildroot}%{_mandir}/man1/epydoc.1 -%{__install} -D man/epydocgui.1 %{buildroot}%{_mandir}/man1/epydocgui.1 +%{__install} -Dpm 644 man/epydoc.1 %{buildroot}%{_mandir}/man1/epydoc.1 +%{__install} -Dpm 644 man/epydocgui.1 %{buildroot}%{_mandir}/man1/epydocgui.1 %clean @@ -47,12 +58,32 @@ %doc LICENSE.TXT README.TXT doc/ %{_bindir}/epydoc %{_bindir}/epydocgui -%{_libdir}/python?.?/site-packages/epydoc/ +%dir %{python_sitelib}/epydoc +%{python_sitelib}/epydoc/*.py +%{python_sitelib}/epydoc/*.pyc +%ghost %{python_sitelib}/epydoc/*.pyo +%dir %{python_sitelib}/epydoc/markup +%{python_sitelib}/epydoc/markup/*.py +%{python_sitelib}/epydoc/markup/*.pyc +%ghost %{python_sitelib}/epydoc/markup/*.pyo +%dir %{python_sitelib}/epydoc/test +%{python_sitelib}/epydoc/test/*.py +%{python_sitelib}/epydoc/test/*.pyc +%ghost %{python_sitelib}/epydoc/test/*.pyo +%{_datadir}/applications/*epydocgui.desktop %{_mandir}/man1/epydoc.1* %{_mandir}/man1/epydocgui.1* %changelog +* Mon Dec 20 2004 Ville Skytt?? - 2.1-3 +- Change to noarch. +- Get Python site-packages dir from distutils, should fix x86_64 build. +- Require python-abi and tkinter. +- %%ghost'ify *.pyo. +- Fix man page permissions. +- Add menu entry for epydocgui. + * Tue Nov 16 2004 Matthias Saou 2.1-2 - Bump release to provide Extras upgrade path. From fedora-extras-commits at redhat.com Thu Jan 13 14:39:56 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 09:39:56 -0500 Subject: rpms/advancecomp/devel .cvsignore, 1.2, 1.3 advancecomp.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200501131439.j0DEduAq004086@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/advancecomp/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv4080 Modified Files: .cvsignore advancecomp.spec sources Log Message: Update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/advancecomp/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:00:49 -0000 1.2 +++ .cvsignore 13 Jan 2005 14:39:54 -0000 1.3 @@ -1 +1 @@ -advancecomp-1.11.tar.gz +advancecomp-1.13.tar.gz Index: advancecomp.spec =================================================================== RCS file: /cvs/extras/rpms/advancecomp/devel/advancecomp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- advancecomp.spec 11 Nov 2004 19:21:36 -0000 1.2 +++ advancecomp.spec 13 Jan 2005 14:39:54 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Recompression utilities for .PNG, .MNG and .ZIP files Name: advancecomp -Version: 1.11 -Release: 2 +Version: 1.13 +Release: 1 License: GPL Group: Applications/Emulators URL: http://advancemame.sourceforge.net/ @@ -42,8 +42,11 @@ %changelog -* Wed Nov 10 2004 Matthias Saou 1.11-2 -- Bump release to provide Extras upgrade path. +* Mon Nov 29 2004 Matthias Saou 1.13-1 +- Update to 1.13. + +* Tue Nov 2 2004 Matthias Saou 1.12-1 +- Update to 1.12. * Tue Aug 24 2004 Matthias Saou 1.11-1 - Update to 1.11. Index: sources =================================================================== RCS file: /cvs/extras/rpms/advancecomp/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:00:49 -0000 1.2 +++ sources 13 Jan 2005 14:39:54 -0000 1.3 @@ -1 +1 @@ -e400c79e88d5d30af2017b95e2115bb1 advancecomp-1.11.tar.gz +14f9e37e25aec35133e886caaf746226 advancecomp-1.13.tar.gz From fedora-extras-commits at redhat.com Thu Jan 13 14:52:57 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 09:52:57 -0500 Subject: rpms/synergy/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 synergy.spec, 1.3, 1.4 Message-ID: <200501131452.j0DEqvco004255@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/synergy/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv4244 Modified Files: .cvsignore sources synergy.spec Log Message: Update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/synergy/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Nov 2004 02:50:29 -0000 1.2 +++ .cvsignore 13 Jan 2005 14:52:55 -0000 1.3 @@ -1 +1 @@ -synergy-1.0.14.tar.gz +synergy-1.2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/synergy/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Nov 2004 02:50:29 -0000 1.2 +++ sources 13 Jan 2005 14:52:55 -0000 1.3 @@ -1 +1 @@ -c9cc67852f4287b184578faa150acd4c synergy-1.0.14.tar.gz +6f004011141ccd3292798ec2a3aef2c2 synergy-1.2.1.tar.gz Index: synergy.spec =================================================================== RCS file: /cvs/extras/rpms/synergy/devel/synergy.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- synergy.spec 16 Nov 2004 18:35:33 -0000 1.3 +++ synergy.spec 13 Jan 2005 14:52:55 -0000 1.4 @@ -1,9 +1,7 @@ -# $Id$ - Summary: Mouse and keyboard sharing utility Name: synergy -Version: 1.0.14 -Release: 2 +Version: 1.2.1 +Release: 1 License: GPL Group: System Environment/Daemons URL: http://synergy2.sourceforge.net/ @@ -39,14 +37,18 @@ %files %defattr(-, root, root, 0755) -%doc AUTHORS BUGS COPYING ChangeLog FAQ HISTORY NEWS README TODO +%doc AUTHORS ChangeLog COPYING NEWS README doc/PORTING +%doc doc/*.html doc/*.css %doc examples/synergy.conf %{_bindir}/* %changelog -* Tue Nov 16 2004 Matthias Saou 1.0.14-3 -- Bump release to provide Extras upgrade path. +* Thu Jan 13 2005 Matthias Saou 1.2.1-1 +- Update to 1.2.1. + +* Mon Jan 3 2005 Matthias Saou 1.2.0-1 +- Update to 1.2.0. * Wed May 19 2004 Matthias Saou 1.0.14-2 - Rebuilt for Fedora Core 2. From fedora-extras-commits at redhat.com Thu Jan 13 15:32:51 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 10:32:51 -0500 Subject: rpms/kile import.log,1.4,1.5 Message-ID: <200501131532.j0DFWpuC005311@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/kile In directory cvs.fedora.redhat.com:/tmp/cvs-serv5302 Modified Files: import.log Log Message: auto-import kile-1.7.1-3 on branch devel from kile-1.7.1-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kile/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 8 Nov 2004 04:39:27 -0000 1.4 +++ import.log 13 Jan 2005 15:32:49 -0000 1.5 @@ -1,3 +1,4 @@ kile-1_6_3-0_fdr_1_rh90:HEAD:kile-1.6.3-0.fdr.1.rh90.src.rpm:1099888755 kile-1_6_3-0_fdr_1_1:HEAD:kile-1.6.3-0.fdr.1.1.src.rpm:1099888761 kile-1_6_3-0_fdr_1_2:HEAD:kile-1.6.3-0.fdr.1.2.src.rpm:1099888767 +kile-1_7_1-3:HEAD:kile-1.7.1-3.src.rpm:1105630409 From fedora-extras-commits at redhat.com Thu Jan 13 15:32:52 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 10:32:52 -0500 Subject: rpms/kile/devel kile-1.7-dt.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kile.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200501131532.j0DFWq8o005315@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/kile/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv5302/devel Modified Files: .cvsignore kile.spec sources Added Files: kile-1.7-dt.patch Log Message: auto-import kile-1.7.1-3 on branch devel from kile-1.7.1-3.src.rpm kile-1.7-dt.patch: --- NEW FILE kile-1.7-dt.patch --- --- kile-1.7/kile/kile.desktop.dt 2004-05-27 01:56:00.000000000 -0500 +++ kile-1.7/kile/kile.desktop 2004-10-18 08:09:27.000000000 -0500 @@ -51,4 +51,4 @@ GenericName[xx]=xxLaTeX Frontendxx GenericName[zh_CN]=LaTeX ?????? MimeType=text/x-tex;text/x-kilepr -Categories=Qt;KDE;Office +Categories=Qt;KDE;Office; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kile/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:39:15 -0000 1.2 +++ .cvsignore 13 Jan 2005 15:32:49 -0000 1.3 @@ -1 +1 @@ -kile-1.6.3.tar.bz2 +kile-1.7.1.tar.bz2 Index: kile.spec =================================================================== RCS file: /cvs/extras/rpms/kile/devel/kile.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kile.spec 10 Dec 2004 22:03:04 -0000 1.4 +++ kile.spec 13 Jan 2005 15:32:49 -0000 1.5 @@ -1,48 +1,62 @@ -# $Id$ +#$Id$ + +# for optionally using destkop-file-install (for fc2 mostly) +%define desktop_file 1 Name: kile -Summary: LaTeX source editor and TeX shell +Summary: (La)TeX source editor and TeX shell Epoch: 0 -Version: 1.6.3 -Release: 1%{?dist_tag} +Version: 1.7.1 +Release: 3%{?dist_tag} Group: Applications/Publishing URL: http://kile.sourceforge.net/ -Source: http://dl.sourceforge.net/sourceforge/kile/kile-1.6.3.tar.bz2 +Source: http://dl.sourceforge.net/sourceforge/kile/kile-1.7.1.tar.bz2 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +# Append ; to .desktop Categories +Patch1: kile-1.7-dt.patch + BuildRequires: gettext +BuildRequires: libtool +%{?desktop_file:BuildRequires: desktop-file-utils} -# workarounds for missing Requires in redhat's qt-devel, kdelibs-devel -# and to make fedora's buildsystem happy -BuildRequires: XFree86-devel libtool +# workarounds for missing Requires in fc1's qt-devel, kdelibs-devel +# and to make fedora.us's buildsystem happy +BuildRequires: XFree86-devel BuildRequires: libpng-devel zlib-devel libjpeg-devel BuildRequires: arts-devel libart_lgpl-devel fam-devel Requires: tetex-latex +## Optional, but recommended +#Requires: gnuplot +#Requires: xfig -BuildRequires: qt-devel >= 1:3.1 -%define qt_ver %(rpm -q --qf '%%{version}' qt-devel | cut -d. -f1,2) +BuildRequires: qt-devel >= 1:3.3 +%define qt_ver %(rpm -q --qf '%%{version}' qt-devel | cut -d. -f-2) Requires: qt >= 1:%{qt_ver} -BuildRequires: kdelibs-devel >= 6:3.1 -%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel | cut -d. -f1,2 ) +BuildRequires: kdelibs-devel >= 6:3.2 +%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel | cut -d. -f-2 ) Requires: kdelibs >= 6:%{kdelibs_ver} -%if "%{kdelibs_ver}" < "3.2" -%define desktop_file 1 -%endif - %description -Kile is a LaTeX source editor, TeX shell and GnuPlot frontend that -simplifies the creation of LaTeX documents. +Kile is a user friendly (La)TeX editor. The main features are: + * Compile, convert and view your document with one click. + * Auto-completion of (La)TeX commands + * Templates and wizards makes starting a new document very little work. + * Easy insertion of many standard tags and symbols and the option to define (an arbitrary number of) user defined tags. + * Inverse and forward search: click in the DVI viewer and jump to the corresponding LaTeX line in the editor, or jump from the editor to the corresponding page in the viewer. + * Finding chapter or sections is very easy, Kile constructs a list of all the chapter etc. in your document. You can use the list to jump to the corresponding section. + * Collect documents that belong together into a project. + * Easy insertion of citations and references when using projects. + * Advanced editing commands. %prep %setup -q -# append ; to desktop_file Categories -perl -pi -e 's at Categories(.*)Office$@Categories${1}Office\;@' */*.desktop */*/*.desktop +%{?desktop_file:%patch1 -p1 -b .dt} %build @@ -52,9 +66,9 @@ --program-prefix="%{?_program_prefix}" \ --disable-rpath \ %{?debug: --enable-debug --enable-warnings } \ - %{!?debug: --disable-dependency-tracking --disable-debug --disable-warnings --enable-final } + %{!?debug: --disable-debug --disable-warnings --enable-final } -make %{?_smp_mflags} +make %{?_smp_mflags} %install @@ -76,11 +90,6 @@ popd %if "%{?desktop_file}" == "1" -# Put desktop/applnk file back -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applnk/Office -mv $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop \ - $RPM_BUILD_ROOT%{_datadir}/applnk/Office/ - mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --delete-original --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -89,29 +98,20 @@ $RPM_BUILD_ROOT%{_datadir}/app*/*/kile.desktop %endif -## Locale stuff -# find_lang -%find_lang %{name} -# HTML stuff -for lang_dir in $RPM_BUILD_ROOT%{_docdir}/HTML/* ; do - lang=$(basename $lang_dir) - echo "%lang($lang) %doc %{_docdir}/HTML/${lang}/*" >> %{name}.lang -done +## Unpackaged/conflicting files +rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/katepart - -%files -f %{name}.lang +%files %defattr(-,root,root,-) %doc AUTHORS ChangeLog README TODO +%lang(en) %doc %{_datadir}/doc/HTML/en/* %{_bindir}/* %{_datadir}/apps/kile -%{_datadir}/apps/katepart/syntax/*.xml +%{_datadir}/apps/kconf_update/kile* +%config %{_datadir}/config.kcfg/kile.kcfg %{_datadir}/icons/*/*/*/*.png -%if "%{?desktop_file}" == "1" -%{_datadir}/applications/*.desktop -%else -%{_datadir}/applications/kde/*.desktop -%endif +%{_datadir}/applications%{!?desktop_file:/kde}/*.desktop %{_datadir}/mimelnk/*/*.desktop @@ -120,6 +120,19 @@ %changelog +* Wed Jan 12 2005 Rex Dieter 0:1.7.1-3 +- fix (katepart) conflicts with kde >= 3.2 +- update %%description + +* Mon Oct 18 2004 Rex Dieter 0:1.7.1-0.fdr.2 +- -katepart: fix conflicts with kde >= 3.3 (optional) + +* Mon Oct 18 2004 Rex Dieter 0:1.7.1-0.fdr.1 +- 1.7.1 + +* Tue Sep 28 2004 Rex Dieter 0:1.6.3-0.fdr.2 +- respin (against kde-3.3) + * Fri May 14 2004 Rex Dieter 0:1.6.3-0.fdr.1 - 1.6.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kile/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:39:15 -0000 1.2 +++ sources 13 Jan 2005 15:32:49 -0000 1.3 @@ -1 +1 @@ -6bf238c7a80fa647d8fd4ca89c0774ef kile-1.6.3.tar.bz2 +940fba9dc62e2687856885dffccf6e80 kile-1.7.1.tar.bz2 From fedora-extras-commits at redhat.com Thu Jan 13 15:34:39 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 10:34:39 -0500 Subject: rpms/kile-i18n - New directory Message-ID: <200501131534.j0DFYdqj005435@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/kile-i18n In directory cvs.fedora.redhat.com:/tmp/cvs-serv5427/kile-i18n Log Message: Directory /cvs/extras/rpms/kile-i18n added to the repository From fedora-extras-commits at redhat.com Thu Jan 13 15:34:39 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 10:34:39 -0500 Subject: rpms/kile-i18n/devel - New directory Message-ID: <200501131534.j0DFYdJh005438@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/kile-i18n/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv5427/kile-i18n/devel Log Message: Directory /cvs/extras/rpms/kile-i18n/devel added to the repository From fedora-extras-commits at redhat.com Thu Jan 13 15:35:02 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 10:35:02 -0500 Subject: rpms/kile-i18n Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501131535.j0DFZ2Om005497@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/kile-i18n In directory cvs.fedora.redhat.com:/tmp/cvs-serv5488 Added Files: Makefile import.log Log Message: Setup of module kile-i18n --- NEW FILE Makefile --- # Top level Makefile for module kile-i18n all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 13 15:35:02 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 10:35:02 -0500 Subject: rpms/kile-i18n/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501131535.j0DFZ2E9005500@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/kile-i18n/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv5488/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module kile-i18n --- NEW 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 Jan 13 15:39:03 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 10:39:03 -0500 Subject: rpms/kile-i18n import.log,1.1,1.2 Message-ID: <200501131539.j0DFd3fR005613@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/kile-i18n In directory cvs.fedora.redhat.com:/tmp/cvs-serv5602 Modified Files: import.log Log Message: auto-import kile-i18n-1.7-3 on branch devel from kile-i18n-1.7-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kile-i18n/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Jan 2005 15:35:00 -0000 1.1 +++ import.log 13 Jan 2005 15:39:01 -0000 1.2 @@ -0,0 +1 @@ +kile-i18n-1_7-3:HEAD:kile-i18n-1.7-3.src.rpm:1105630781 From fedora-extras-commits at redhat.com Thu Jan 13 15:39:03 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 10:39:03 -0500 Subject: rpms/kile-i18n/devel kile-i18n.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501131539.j0DFd3E1005617@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/kile-i18n/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv5602/devel Modified Files: .cvsignore sources Added Files: kile-i18n.spec Log Message: auto-import kile-i18n-1.7-3 on branch devel from kile-i18n-1.7-3.src.rpm --- NEW FILE kile-i18n.spec --- # $Id: koffice-i18n.spec,v 1.17 2004/10/01 20:28:01 rexdieter Exp $ Summary: i18n support for Kile Name: kile-i18n Group: Applications/Office Version: 1.7 Release: 3 Source: http://dl.sourceforge.net/sourceforge/kile/kile-i18n-1.7.tar.bz2 URL: http://kile.sourceforge.net/ License: GPL # Should be noarch, but doesn't currently work -- Rex #BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool BuildRequires: kdelibs-devel >= 6:3.2 BuildRequires: gettext Requires: kile >= 0:1.7 %description i18n support for Kile %prep %setup -q %build unset QTDIR || : ; . /etc/profile.d/qt.sh %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # Replace absolute symlinks with relative ones pushd $RPM_BUILD_ROOT%{_docdir}/HTML for lang in *; do if [ -d $lang ]; then pushd $lang for i in *; do [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common done popd fi done popd ## File lists # locale's %find_lang kile # HTML for lang_dir in $RPM_BUILD_ROOT%{_docdir}/HTML/* ; do lang=$(basename $lang_dir) echo "%lang($lang) %doc %{_docdir}/HTML/$lang/*" >> kile.lang done %files -f kile.lang %defattr(-,root,root) %clean rm -rf $RPM_BUILD_ROOT %changelog * Wed Nov 21 2004 Rex Dieter 1.7-3 - BR: gettext * Tue Nov 20 2004 Rex Dieter 1.7-0.fdr.2 - cleanup file lists * Mon Oct 18 2004 Rex Dieter 1.7-0.fdr.1 - 1.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kile-i18n/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Jan 2005 15:35:00 -0000 1.1 +++ .cvsignore 13 Jan 2005 15:39:01 -0000 1.2 @@ -0,0 +1 @@ +kile-i18n-1.7.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kile-i18n/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Jan 2005 15:35:00 -0000 1.1 +++ sources 13 Jan 2005 15:39:01 -0000 1.2 @@ -0,0 +1 @@ +6c8d6f9c20c4f67c825951a224fa641f kile-i18n-1.7.tar.bz2 From fedora-extras-commits at redhat.com Thu Jan 13 17:41:35 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 12:41:35 -0500 Subject: rpms/openoffice-extras/devel openoffice-extras.spec,1.2,1.3 Message-ID: <200501131741.j0DHfZ1h007905@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/openoffice-extras/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv7899 Modified Files: openoffice-extras.spec Log Message: Disabling build, see %prep. Index: openoffice-extras.spec =================================================================== RCS file: /cvs/extras/rpms/openoffice-extras/devel/openoffice-extras.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- openoffice-extras.spec 10 Dec 2004 22:03:07 -0000 1.2 +++ openoffice-extras.spec 13 Jan 2005 17:41:33 -0000 1.3 @@ -1,7 +1,7 @@ Summary: SOT Office presentation templates repackaged for OpenOffice.org Name: openoffice-extras Version: 1.0.2 -Release: 3 +Release: 2.fdr.2 Epoch: 0 License: GPL Group: Applications/Productivity @@ -19,6 +19,13 @@ # ----------------------------------------------------------------------------- %prep +echo " +-------------------------------------------------------------- +Package hasn't been updated or rebuilt since Red Hat Linux 9 +and probably is obsolete. => https://bugzilla.redhat.com/144736 +--------------------------------------------------------------" > /dev/null +exit 1 + %setup -q -c # ----------------------------------------------------------------------------- From fedora-extras-commits at redhat.com Thu Jan 13 18:06:32 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:06:32 -0500 Subject: rpms/kannel/devel .cvsignore, 1.2, 1.3 kannel.spec, 1.2, 1.3 sources, 1.2, 1.3 mblox_optionals_0.1.diff, 1.1, NONE Message-ID: <200501131806.j0DI6W6p008749@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/kannel/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv8742 Modified Files: .cvsignore kannel.spec sources Removed Files: mblox_optionals_0.1.diff Log Message: Update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kannel/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Nov 2004 02:47:27 -0000 1.2 +++ .cvsignore 13 Jan 2005 18:06:30 -0000 1.3 @@ -1 +1 @@ -gateway-1.3.2.tar.bz2 +gateway-1.4.0.tar.bz2 Index: kannel.spec =================================================================== RCS file: /cvs/extras/rpms/kannel/devel/kannel.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kannel.spec 9 Nov 2004 02:47:33 -0000 1.2 +++ kannel.spec 13 Jan 2005 18:06:30 -0000 1.3 @@ -1,21 +1,18 @@ -# $Id$ -# Authority: matthias - -%{?dist: %{expand: %%define %dist 1}} - -%{?rh7:%define _without_newsslcheck 1} - Summary: WAP and SMS gateway Name: kannel -Version: 1.3.2 -Release: 3.1.fc2.fr +Version: 1.4.0 +Release: 1 License: Kannel Group: System Environment/Daemons URL: http://www.kannel.org/ Source: http://www.kannel.org/download/%{version}/gateway-%{version}.tar.bz2 -Patch: mblox_optionals_0.1.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRequires: bison, byacc, flex, ImageMagick BuildRequires: libxml2-devel, openssl-devel, zlib-devel +# DB backends +BuildRequires: sqlite-devel +# For the docs... I think we need transfig too, so disable for now. +#BuildRequires: jadetex, tetex-dvips, docbook-dtds, docbook-style-dsssl %description The Kannel Open Source WAP and SMS gateway works as both an SMS gateway, for @@ -45,14 +42,12 @@ %prep %setup -n gateway-%{version} -%patch -p1 -b .mblox %build -# Fix for the openssl THREADS check, which should be OPENSSL_THREADS -%{!?_without_newsslcheck: %{__perl} -pi.orig -e 's|(defined\()THREADS\)|$1OPENSSL_THREADS)|g' configure} %configure \ - --enable-start-stop-daemon + --enable-start-stop-daemon \ + --with-sqlite %{__make} %{?_smp_mflags} @@ -98,8 +93,8 @@ %changelog -* Mon Sep 20 2004 Matthias Saou 1.3.2-3 -- Added mblox_optionals_0.1.diff patch. +* Fri Dec 10 2004 Matthias Saou 1.4.0-1 +- Update to 1.4.0. * Tue Aug 24 2004 Matthias Saou 1.3.2-2 - Really comment out all scriplets, they're not yet used. Index: sources =================================================================== RCS file: /cvs/extras/rpms/kannel/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Nov 2004 02:47:27 -0000 1.2 +++ sources 13 Jan 2005 18:06:30 -0000 1.3 @@ -1 +1 @@ -00a1fa5c7ed2fc755d14abc2b6f5ce52 gateway-1.3.2.tar.bz2 +2ef0544002be48669d7f0f29f9f470de gateway-1.4.0.tar.bz2 --- mblox_optionals_0.1.diff DELETED --- From fedora-extras-commits at redhat.com Thu Jan 13 18:08:55 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:08:55 -0500 Subject: rpms/hercules/devel hercules.spec,1.3,1.4 Message-ID: <200501131808.j0DI8tQD008817@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/hercules/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv8811 Modified Files: hercules.spec Log Message: Clean up some more. Index: hercules.spec =================================================================== RCS file: /cvs/extras/rpms/hercules/devel/hercules.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- hercules.spec 24 Dec 2004 15:23:07 -0000 1.3 +++ hercules.spec 13 Jan 2005 18:08:53 -0000 1.4 @@ -1,15 +1,9 @@ -# $Id$ -# Authority: dag -# Upstream: Jay Maynard -# Upstream: -# Distcc: 0 - %define date 20041025 Summary: Hercules S/370, ESA/390, and z/Architecture emulator Name: hercules Version: 3.02 -Release: %{?date:0.%{date}.}1.2 +Release: %{?date:0.%{date}.}1 License: QPL Group: Applications/Emulators URL: http://www.conmicro.cx/hercules/ From fedora-extras-commits at redhat.com Thu Jan 13 18:13:22 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:13:22 -0500 Subject: rpms/ucarp/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 ucarp.spec, 1.2, 1.3 Message-ID: <200501131813.j0DIDMlg008893@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/ucarp/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv8887 Modified Files: .cvsignore sources ucarp.spec Log Message: Update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ucarp/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Nov 2004 02:50:47 -0000 1.2 +++ .cvsignore 13 Jan 2005 18:13:20 -0000 1.3 @@ -1 +1 @@ -ucarp-1.0.tar.bz2 +ucarp-1.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ucarp/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Nov 2004 02:50:47 -0000 1.2 +++ sources 13 Jan 2005 18:13:20 -0000 1.3 @@ -1 +1 @@ -f40451c2d614e00121cbae0b0cbdb832 ucarp-1.0.tar.bz2 +f907752bd1654a6e8aa42e717aee9774 ucarp-1.1.tar.bz2 Index: ucarp.spec =================================================================== RCS file: /cvs/extras/rpms/ucarp/devel/ucarp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ucarp.spec 9 Nov 2004 02:50:54 -0000 1.2 +++ ucarp.spec 13 Jan 2005 18:13:20 -0000 1.3 @@ -1,13 +1,11 @@ -# $Id$ - Summary: Common Address Redundancy Protocol (CARP) for Unix Name: ucarp -Version: 1.0 -Release: 1.1.fc2.fr +Version: 1.1 +Release: 1 License: BSD Group: System Environment/Daemons URL: http://www.ucarp.org/ -Source: http://www.pureftpd.org/ucarp/ucarp-%{version}.tar.bz2 +Source0: ftp://ftp.ucarp.org/pub/ucarp/ucarp-%{version}.tar.bz2 Source1: carp.init Source2: vip-001.conf.example BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -16,7 +14,6 @@ Requires(postun): /sbin/service BuildRequires: libpcap, gettext - %description UCARP allows a couple of hosts to share common virtual IP addresses in order to provide automatic failover. It is a portable userland implementation of the @@ -98,6 +95,10 @@ %changelog +* Thu Jan 13 2005 Matthias Saou 1.1-1 +- Update to 1.1. +- Update source location. + * Fri Jul 9 2004 Matthias Saou 1.0-1 - Initial RPM release. From fedora-extras-commits at redhat.com Thu Jan 13 18:17:31 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:17:31 -0500 Subject: rpms/xmms-lirc/devel xmms-lirc.spec,1.4,1.5 Message-ID: <200501131817.j0DIHVtQ008989@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/xmms-lirc/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv8978 Modified Files: xmms-lirc.spec Log Message: Clean up, bump release. Index: xmms-lirc.spec =================================================================== RCS file: /cvs/extras/rpms/xmms-lirc/devel/xmms-lirc.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xmms-lirc.spec 9 Nov 2004 02:51:36 -0000 1.4 +++ xmms-lirc.spec 13 Jan 2005 18:17:29 -0000 1.5 @@ -1,13 +1,10 @@ -# $Id$ -# Authority: matthias - %define xmms_generaldir %(xmms-config --general-plugin-dir) %define real_name lirc-xmms-plugin -Summary: Plugin to use LIRC supported infrared devices in XMMS +Summary: X MultiMedia System control plugin to use infrared devices Name: xmms-lirc Version: 1.4 -Release: 3.1.fc2.fr +Release: 4 License: GPL Group: Applications/Multimedia URL: http://www.lirc.org/ @@ -47,6 +44,9 @@ %changelog +* Thu Jan 13 2005 Matthias Saou 1.4-4 +- Bump release for upgrade path. + * Wed May 19 2004 Matthias Saou 1.4-3 - Rebuilt for Fedora Core 2. From fedora-extras-commits at redhat.com Thu Jan 13 18:19:12 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:19:12 -0500 Subject: rpms/php-mmcache/devel php-mmcache.spec,1.3,1.4 Message-ID: <200501131819.j0DIJC22009023@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-mmcache/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv9017/devel Modified Files: php-mmcache.spec Log Message: Clean up. Index: php-mmcache.spec =================================================================== RCS file: /cvs/extras/rpms/php-mmcache/devel/php-mmcache.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- php-mmcache.spec 9 Nov 2004 02:49:10 -0000 1.3 +++ php-mmcache.spec 13 Jan 2005 18:19:10 -0000 1.4 @@ -1,5 +1,3 @@ -# $Id$ - %define php_extdir %(php-config --extension-dir || echo /usr/lib/php4) %{!?php_version:%define php_version %(php-config --version || echo bad)} @@ -8,7 +6,7 @@ Summary: PHP accelerator, optimizer, encoder and dynamic content cacher Name: php-mmcache Version: %{php_version}_%{module_version} -Release: 4.1.fc2.fr +Release: 5 License: GPL Group: Development/Languages URL: http://turck-mmcache.sourceforge.net/ @@ -83,6 +81,9 @@ %changelog +* Thu Jan 13 2005 Matthias Saou 4.x.x_2.4.6-4 +- Bump release. + * Fri May 21 2004 Matthias Saou 4.x.x_2.4.6-1 - Change the version to be phpversion_mmcacheversion since each build is tightly tied to a version, and to have an easy upgrade path. From fedora-extras-commits at redhat.com Thu Jan 13 18:21:25 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:21:25 -0500 Subject: rpms/php-pecl-mailparse/devel php-pecl-mailparse.spec,1.2,1.3 Message-ID: <200501131821.j0DILPDl009053@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-pecl-mailparse/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv9047/devel Modified Files: php-pecl-mailparse.spec Log Message: Clean up. Index: php-pecl-mailparse.spec =================================================================== RCS file: /cvs/extras/rpms/php-pecl-mailparse/devel/php-pecl-mailparse.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- php-pecl-mailparse.spec 9 Nov 2004 02:49:13 -0000 1.2 +++ php-pecl-mailparse.spec 13 Jan 2005 18:21:23 -0000 1.3 @@ -1,11 +1,9 @@ -# $Id$ - -%define php_extdir %(php-config --extension-dir) +%define php_extdir %(php-config --extension-dir || echo /usr/lib/php4) Summary: PECL package for parsing and working with email messages Name: php-pecl-mailparse Version: 2.0b -Release: 4.1.fc2.fr +Release: 5 License: PHP Group: Development/Languages URL: http://pecl.php.net/package/mailparse @@ -61,6 +59,9 @@ %changelog +* Thu Jan 13 2005 Matthias Saou 2.0b-5 +- Bump release. + * Tue Jul 27 2004 Matthias Saou 2.0b-4 - Update included mbfl source to 4.3.8 as the current 4.3.4 doesn't work anymore. From fedora-extras-commits at redhat.com Thu Jan 13 18:22:25 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:22:25 -0500 Subject: rpms/php-pecl-sqlite/devel php-pecl-sqlite.spec,1.1,1.2 Message-ID: <200501131822.j0DIMPmw009101@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-pecl-sqlite/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv9089/devel Modified Files: php-pecl-sqlite.spec Log Message: Clean up. Index: php-pecl-sqlite.spec =================================================================== RCS file: /cvs/extras/rpms/php-pecl-sqlite/devel/php-pecl-sqlite.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- php-pecl-sqlite.spec 9 Nov 2004 02:49:22 -0000 1.1 +++ php-pecl-sqlite.spec 13 Jan 2005 18:22:23 -0000 1.2 @@ -1,11 +1,9 @@ -# $Id$ - -%define php_extdir %(php-config --extension-dir) +%define php_extdir %(php-config --extension-dir || echo /usr/lib/php4) Summary: PECL package for accessing SQLite databases Name: php-pecl-sqlite Version: 1.0.2 -Release: 1.1.fc2.fr +Release: 2 License: PHP Group: Development/Languages URL: http://pecl.php.net/package/SQLite @@ -57,6 +55,9 @@ %changelog +* Thu Jan 13 2005 Matthias Saou 1.0.2-2 +- Bump release. + * Thu Jun 3 2004 Matthias Saou 1.0.2-1 - Initial RPM release. From fedora-extras-commits at redhat.com Thu Jan 13 18:23:08 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 13:23:08 -0500 Subject: rpms/qca - New directory Message-ID: <200501131823.j0DIN8Hk009163@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/qca In directory cvs.fedora.redhat.com:/tmp/cvs-serv9154/qca Log Message: Directory /cvs/extras/rpms/qca added to the repository From fedora-extras-commits at redhat.com Thu Jan 13 18:23:08 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 13:23:08 -0500 Subject: rpms/qca/devel - New directory Message-ID: <200501131823.j0DIN8ux009166@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/qca/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv9154/qca/devel Log Message: Directory /cvs/extras/rpms/qca/devel added to the repository From fedora-extras-commits at redhat.com Thu Jan 13 18:23:30 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 13:23:30 -0500 Subject: rpms/qca Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501131823.j0DINU56009228@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/qca In directory cvs.fedora.redhat.com:/tmp/cvs-serv9219 Added Files: Makefile import.log Log Message: Setup of module qca --- NEW FILE Makefile --- # Top level Makefile for module qca all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 13 18:23:30 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 13:23:30 -0500 Subject: rpms/qca/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501131823.j0DINUJl009231@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/qca/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv9219/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module qca --- NEW 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 Jan 13 18:24:03 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:24:03 -0500 Subject: rpms/python-twisted/devel python-twisted.spec,1.1,1.2 Message-ID: <200501131824.j0DIO3IV009318@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/python-twisted/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv9305 Modified Files: python-twisted.spec Log Message: Clean up. Index: python-twisted.spec =================================================================== RCS file: /cvs/extras/rpms/python-twisted/devel/python-twisted.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-twisted.spec 9 Nov 2004 02:50:01 -0000 1.1 +++ python-twisted.spec 13 Jan 2005 18:24:00 -0000 1.2 @@ -1,9 +1,7 @@ -# $Id$ - Summary: Event-driven networking framework written in Python Name: python-twisted Version: 1.3.0 -Release: 1.1.fc2.fr +Release: 2 License: LGPL Group: Applications/Internet URL: http://www.twistedmatrix.com/ From fedora-extras-commits at redhat.com Thu Jan 13 18:24:23 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 13:24:23 -0500 Subject: rpms/qca import.log,1.1,1.2 Message-ID: <200501131824.j0DIONd0009370@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/qca In directory cvs.fedora.redhat.com:/tmp/cvs-serv9361 Modified Files: import.log Log Message: auto-import qca-1.0-3 on branch devel from qca-1.0-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/qca/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Jan 2005 18:23:28 -0000 1.1 +++ import.log 13 Jan 2005 18:24:21 -0000 1.2 @@ -0,0 +1 @@ +qca-1_0-3:HEAD:qca-1.0-3.src.rpm:1105640702 From fedora-extras-commits at redhat.com Thu Jan 13 18:24:23 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 13 Jan 2005 13:24:23 -0500 Subject: rpms/qca/devel qca-1.0-mach.patch, NONE, 1.1 qca.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501131824.j0DION7I009374@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/qca/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv9361/devel Modified Files: .cvsignore sources Added Files: qca-1.0-mach.patch qca.spec Log Message: auto-import qca-1.0-3 on branch devel from qca-1.0-3.src.rpm qca-1.0-mach.patch: --- NEW FILE qca-1.0-mach.patch --- --- ./qca.pro.mach 2004-11-22 11:15:24.061984966 +0100 +++ ./qca.pro 2004-11-22 11:15:31.483010203 +0100 @@ -2,6 +2,7 @@ TEMPLATE = lib CONFIG += qt thread release +CONFIG += no_fixpath TARGET = qca MOC_DIR = .moc --- NEW FILE qca.spec --- Name: qca Version: 1.0 Release: 3 Epoch: 0 Summary: Qt Cryptographic Architecture Group: System Environment/Libraries License: LGPL URL: http://delta.affinix.com/qca Source0: http://delta.affinix.com/qca/qca-1.0.tar.bz2 Patch0: qca-1.0-mach.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel %description Taking a hint from the similarly-named Java Cryptography Architecture, QCA aims to provide a straightforward and cross-platform crypto API, using Qt datatypes and conventions. QCA separates the API from the implementation, using plugins known as Providers. The advantage of this model is to allow applications to avoid linking to or explicitly depending on any particular cryptographic library. This allows one to easily change or upgrade crypto implementations without even needing to recompile the application! %package devel Summary: Qt Cryptographic Architecture - development files Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} %description devel This packages contains the development files for QCA %prep %setup -q %patch0 -p0 -b .mach perl -pi -e 's,target\.path=\$PREFIX/lib,target.path=\$PREFIX/%{_lib},g' qcextra %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh ./configure --prefix=%{_prefix} --qtdir=$QTDIR make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install INSTALL_ROOT=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING README TODO %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %{_includedir}/*.h %{_libdir}/*.so %changelog * Thu Jan 13 2005 Aurelien Bompard 0:1.0-3 - fix Category - fix build on x86_64 * Thu Jan 13 2005 Aurelien Bompard 0:1.0-0.fdr.2 - clean up comments to fix %%postun scriptlet. * Mon Nov 22 2004 Aurelien Bompard 0:1.0-0.fdr.1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qca/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Jan 2005 18:23:28 -0000 1.1 +++ .cvsignore 13 Jan 2005 18:24:21 -0000 1.2 @@ -0,0 +1 @@ +qca-1.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qca/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Jan 2005 18:23:28 -0000 1.1 +++ sources 13 Jan 2005 18:24:21 -0000 1.2 @@ -0,0 +1 @@ +ee44022eb0e5b8b5df64c62630f6e6b6 qca-1.0.tar.bz2 From fedora-extras-commits at redhat.com Thu Jan 13 18:27:49 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:27:49 -0500 Subject: rpms/rrdtool/devel rrdtool.spec,1.4,1.5 Message-ID: <200501131827.j0DIRnbc009493@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/rrdtool/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv9485 Modified Files: rrdtool.spec Log Message: Clean up. Index: rrdtool.spec =================================================================== RCS file: /cvs/extras/rpms/rrdtool/devel/rrdtool.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rrdtool.spec 9 Nov 2004 02:50:32 -0000 1.4 +++ rrdtool.spec 13 Jan 2005 18:27:47 -0000 1.5 @@ -1,25 +1,17 @@ -# $Id$ -# Authority: matthias -# Upstream: Tobi Oetiker - -%define phpextdir %(php-config --extension-dir) +%define php_extdir %(php-config --extension-dir || echo /usr/lib/php4) Summary: Round Robin Database Tool to store and display time-series data Name: rrdtool Version: 1.0.49 -Release: 1.1.fc2.fr +Release: 2 License: GPL Group: Applications/Databases URL: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/ - Source: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-%{version}.tar.gz Patch: rrdtool-1.0.48-php_config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root - -BuildRequires: gcc-c++, perl, php-devel >= 4.0, openssl-devel +BuildRequires: gcc-c++, php-devel >= 4.0, openssl-devel BuildRequires: libpng-devel, zlib-devel -Requires: perl >= %(rpm -q --qf '%%{epoch}:%%{version}' perl) -Requires: libpng, zlib %description RRD is the Acronym for Round Robin Database. RRD is a system to store and @@ -56,8 +48,10 @@ %setup %patch -b .phpfix -### FIXME: Fixes to /usr/lib(64) for x86_64 -%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' configure contrib/php4/configure Makefile.in +# Fixes to /usr/lib(64) for x86_64 +%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' \ + configure contrib/php4/configure Makefile.in + %build %configure \ @@ -91,7 +85,7 @@ # Install the php4 module %{__install} -D -m0755 contrib/php4/modules/rrdtool.so \ - %{buildroot}%{phpextdir}/rrdtool.so + %{buildroot}%{php_extdir}/rrdtool.so # Clean up the examples for inclusion as docs %{__rm} -rf contrib/php4/examples/CVS # Put the php config bit into place @@ -115,10 +109,6 @@ # This is so rpm doesn't pick up perl module dependencies automatically find examples/ contrib/ -type f -exec chmod 0644 {} \; -# Put man pages back into place... -#%{__mkdir_p} %{buildroot}%{_mandir}/ -#%{__mv} %{buildroot}%{_prefix}/man/* %{buildroot}%{_mandir}/ - # Clean up the buildroot %{__rm} -rf %{buildroot}%{_prefix}/{contrib,doc,examples,html}/ @@ -153,10 +143,13 @@ %defattr(-, root, root) %doc contrib/php4/examples contrib/php4/README %config(noreplace) %{_sysconfdir}/php.d/rrdtool.ini -%{phpextdir}/rrdtool.so +%{php_extdir}/rrdtool.so %changelog +* Thu Jan 13 2005 Matthias Saou 1.0.49-2 +- Minor cleanups. + * Thu Aug 25 2004 Dag Wieers - 1.0.49-1 - Updated to release 1.0.49. From fedora-extras-commits at redhat.com Thu Jan 13 18:33:29 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:33:29 -0500 Subject: rpms/torcs-data/devel - New directory Message-ID: <200501131833.j0DIXTtO009650@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/torcs-data/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv9640/torcs-data/devel Log Message: Directory /cvs/extras/rpms/torcs-data/devel added to the repository From fedora-extras-commits at redhat.com Thu Jan 13 18:33:29 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:33:29 -0500 Subject: rpms/torcs-data - New directory Message-ID: <200501131833.j0DIXTi1009647@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/torcs-data In directory cvs.fedora.redhat.com:/tmp/cvs-serv9640/torcs-data Log Message: Directory /cvs/extras/rpms/torcs-data added to the repository From fedora-extras-commits at redhat.com Thu Jan 13 18:33:41 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:33:41 -0500 Subject: rpms/torcs-data Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501131833.j0DIXfT3009709@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/torcs-data In directory cvs.fedora.redhat.com:/tmp/cvs-serv9700 Added Files: Makefile import.log Log Message: Setup of module torcs-data --- NEW FILE Makefile --- # Top level Makefile for module torcs-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 Thu Jan 13 18:33:41 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:33:41 -0500 Subject: rpms/torcs-data/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501131833.j0DIXfQv009712@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/torcs-data/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv9700/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module torcs-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 Thu Jan 13 18:41:24 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:41:24 -0500 Subject: rpms/torcs-data import.log,1.1,1.2 Message-ID: <200501131841.j0DIfOhc009868@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/torcs-data In directory cvs.fedora.redhat.com:/tmp/cvs-serv9859 Modified Files: import.log Log Message: auto-import torcs-data-1.2.2-1.fr on branch devel from torcs-data-1.2.2-1.fr.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/torcs-data/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Jan 2005 18:33:39 -0000 1.1 +++ import.log 13 Jan 2005 18:41:22 -0000 1.2 @@ -0,0 +1 @@ +torcs-data-1_2_2-1_fr:HEAD:torcs-data-1.2.2-1.fr.src.rpm:1105641671 From fedora-extras-commits at redhat.com Thu Jan 13 18:41:24 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:41:24 -0500 Subject: rpms/torcs-data/devel torcs-data.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501131841.j0DIfOFR009872@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/torcs-data/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv9859/devel Modified Files: .cvsignore sources Added Files: torcs-data.spec Log Message: auto-import torcs-data-1.2.2-1.fr on branch devel from torcs-data-1.2.2-1.fr.src.rpm --- NEW FILE torcs-data.spec --- # $Id: torcs-data.spec 1833 2004-08-02 23:22:28Z dag $ # Authority: matthias # Dist: nodist Summary: The Open Racing Car Simulator data files Name: torcs-data Version: 1.2.2 Release: 1.fr License: GPL Group: Amusements/Games URL: http://torcs.org/ Source0: http://dl.sf.net/torcs/TORCS-%{version}-data.tgz Source1: http://dl.sf.net/torcs/TORCS-%{version}-data-tracks-dirt.tgz Source2: http://dl.sf.net/torcs/TORCS-%{version}-data-tracks-oval.tgz Source3: http://dl.sf.net/torcs/TORCS-%{version}-data-tracks-road.tgz Source4: http://dl.sf.net/torcs/TORCS-%{version}-data-cars-extra.tgz Source5: http://dl.sf.net/torcs/TORCS-%{version}-data-cars-kcendra-gt.tgz Source6: http://dl.sf.net/torcs/TORCS-%{version}-data-cars-kcendra-roadsters.tgz Source7: http://dl.sf.net/torcs/TORCS-%{version}-data-cars-kcendra-sport.tgz Source8: http://dl.sf.net/torcs/TORCS-%{version}-data-cars-nascar.tgz Source9: http://dl.sf.net/torcs/TORCS-%{version}-data-cars-Patwo-Design.tgz Source10: http://dl.sf.net/torcs/TORCS-%{version}-data-cars-VM.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: torcs, %{name}-tracks = %{version} BuildArch: noarch %description TORCS is a 3D racing cars simulator using OpenGL. The goal is to have programmed robots drivers racing against each others. You can also drive yourself with either a wheel, keyboard or mouse. This package contains the data files needed to run the game. %package tracks-dirt Summary: The Open Racing Car Simulator additional dirt tracks Group: Amusements/Games Requires: torcs Provides: %{name}-tracks = %{version}-%{release} %description tracks-dirt TORCS is a 3D racing cars simulator using OpenGL. The goal is to have programmed robots drivers racing against each others. You can also drive yourself with either a wheel, keyboard or mouse. This package contains additional tracks for the game. %package tracks-oval Summary: The Open Racing Car Simulator additional oval tracks Group: Amusements/Games Requires: torcs Provides: %{name}-tracks = %{version}-%{release} %description tracks-oval TORCS is a 3D racing cars simulator using OpenGL. The goal is to have programmed robots drivers racing against each others. You can also drive yourself with either a wheel, keyboard or mouse. This package contains additional tracks for the game. %package tracks-road Summary: The Open Racing Car Simulator additional road tracks Group: Amusements/Games Requires: torcs Provides: %{name}-tracks = %{version}-%{release} %description tracks-road TORCS is a 3D racing cars simulator using OpenGL. The goal is to have programmed robots drivers racing against each others. You can also drive yourself with either a wheel, keyboard or mouse. This package contains additional tracks for the game. %package cars-extra Summary: The Open Racing Car Simulator additional cars Group: Amusements/Games Requires: torcs %description cars-extra TORCS is a 3D racing cars simulator using OpenGL. The goal is to have programmed robots drivers racing against each others. You can also drive yourself with either a wheel, keyboard or mouse. This package contains additional cars for the game. %package cars-kcendra-gt Summary: The Open Racing Car Simulator additional kcendra GT cars Group: Amusements/Games Requires: torcs %description cars-kcendra-gt TORCS is a 3D racing cars simulator using OpenGL. The goal is to have programmed robots drivers racing against each others. You can also drive yourself with either a wheel, keyboard or mouse. This package contains additional cars for the game. %package cars-kcendra-roadsters Summary: The Open Racing Car Simulator additional kcendra roadsters Group: Amusements/Games Requires: torcs %description cars-kcendra-roadsters TORCS is a 3D racing cars simulator using OpenGL. The goal is to have programmed robots drivers racing against each others. You can also drive yourself with either a wheel, keyboard or mouse. This package contains additional cars for the game. %package cars-kcendra-sport Summary: The Open Racing Car Simulator additional kcendra sport cars Group: Amusements/Games Requires: torcs %description cars-kcendra-sport TORCS is a 3D racing cars simulator using OpenGL. The goal is to have programmed robots drivers racing against each others. You can also drive yourself with either a wheel, keyboard or mouse. This package contains additional cars for the game. %package cars-nascar Summary: The Open Racing Car Simulator additional NASCAR cars Group: Amusements/Games Requires: torcs %description cars-nascar TORCS is a 3D racing cars simulator using OpenGL. The goal is to have programmed robots drivers racing against each others. You can also drive yourself with either a wheel, keyboard or mouse. This package contains additional cars for the game. %package cars-Patwo-Design Summary: The Open Racing Car Simulator addition Patwo Design cars Group: Amusements/Games License: Other Requires: torcs %description cars-Patwo-Design TORCS is a 3D racing cars simulator using OpenGL. The goal is to have programmed robots drivers racing against each others. You can also drive yourself with either a wheel, keyboard or mouse. This package contains additional Patwo Design cars (non free!!!). %package cars-VM Summary: The Open Racing Car Simulator additional VM cars Group: Amusements/Games Requires: torcs %description cars-VM TORCS is a 3D racing cars simulator using OpenGL. The goal is to have programmed robots drivers racing against each others. You can also drive yourself with either a wheel, keyboard or mouse. This package contains additional cars for the game. %prep %setup -T -c %{name}-%{version} # Uncompress all packages in a separate tree for source in %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE10}; do package="`basename ${source} .tgz | sed 's/TORCS-%{version}-//g'`" mkdir -p ${package}%{_datadir}/games/torcs/ ( cd ${package}%{_datadir}/games/torcs/ tar xzf %{_sourcedir}/TORCS-%{version}-${package}.tgz ) echo ${package} >> package.list done %build # List each package's files for package in `cat package.list`; do ( cd ${package} find .%{_datadir}/games/torcs -type d \ | sed s/^./\%dir\ / > ../${package}.files find .%{_datadir}/games/torcs -type f \ | sed s/^.// >> ../${package}.files ) done %install %{__rm} -rf %{buildroot} # Install all trees into the main build root mkdir -p %{buildroot} for package in `cat package.list`; do cp -a ${package}/* %{buildroot}/ done %clean %{__rm} -rf %{buildroot} %files -f data.files %defattr(-, root, root, 0755) %files tracks-dirt -f data-tracks-dirt.files %defattr(-, root, root, 0755) %files tracks-oval -f data-tracks-oval.files %defattr(-, root, root, 0755) %files tracks-road -f data-tracks-road.files %defattr(-, root, root, 0755) %files cars-extra -f data-cars-extra.files %defattr(-, root, root, 0755) %files cars-kcendra-gt -f data-cars-kcendra-gt.files %defattr(-, root, root, 0755) %files cars-kcendra-roadsters -f data-cars-kcendra-roadsters.files %defattr(-, root, root, 0755) %files cars-kcendra-sport -f data-cars-kcendra-sport.files %defattr(-, root, root, 0755) %files cars-nascar -f data-cars-nascar.files %defattr(-, root, root, 0755) %files cars-Patwo-Design -f data-cars-Patwo-Design.files %defattr(-, root, root, 0755) %files cars-VM -f data-cars-VM.files %defattr(-, root, root, 0755) %changelog * Thu Feb 26 2004 Matthias Saou 1.2.2-1.fr - Update to 1.2.1 - Added all new tracks : dirt, oval and road. - Added all new cars : kcendra-gt, kcendra-roadsters, kcendra-sport, nascar and VM. - Updated the %%setup and %%build sections to make them even more flexible. * Tue Nov 11 2003 Matthias Saou 1.2.1-4.fr - Rebuild for Fedora Core 1. * Tue May 27 2003 Matthias Saou - Added a requires on torcs for all packages. * Mon Apr 28 2003 Matthias Saou - Fixed the defattr problem, doh! * Wed Apr 23 2003 Matthias Saou - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/torcs-data/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Jan 2005 18:33:39 -0000 1.1 +++ .cvsignore 13 Jan 2005 18:41:22 -0000 1.2 @@ -0,0 +1,11 @@ +TORCS-1.2.2-data-cars-Patwo-Design.tgz +TORCS-1.2.2-data-cars-VM.tgz +TORCS-1.2.2-data-cars-extra.tgz +TORCS-1.2.2-data-cars-kcendra-gt.tgz +TORCS-1.2.2-data-cars-kcendra-roadsters.tgz +TORCS-1.2.2-data-cars-kcendra-sport.tgz +TORCS-1.2.2-data-cars-nascar.tgz +TORCS-1.2.2-data-tracks-dirt.tgz +TORCS-1.2.2-data-tracks-oval.tgz +TORCS-1.2.2-data-tracks-road.tgz +TORCS-1.2.2-data.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/torcs-data/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Jan 2005 18:33:39 -0000 1.1 +++ sources 13 Jan 2005 18:41:22 -0000 1.2 @@ -0,0 +1,11 @@ +df5706fd877d98cebf0d9977005304d4 TORCS-1.2.2-data-cars-Patwo-Design.tgz +4394bdbe9722cc8b962fea29dec9531d TORCS-1.2.2-data-cars-VM.tgz +96ff8279e7d77a40564122fa1a7a78b6 TORCS-1.2.2-data-cars-extra.tgz +858c0e05e589c88264472a27c94f2a29 TORCS-1.2.2-data-cars-kcendra-gt.tgz +7d490c510914a0cdab5939cca66f37cb TORCS-1.2.2-data-cars-kcendra-roadsters.tgz +3e574373fe582269f927b94b3d01ccfa TORCS-1.2.2-data-cars-kcendra-sport.tgz +4b20ced6ffc65357ffddb31fbc561682 TORCS-1.2.2-data-cars-nascar.tgz +630e7e53ffcd84a46175a7627438ba2b TORCS-1.2.2-data-tracks-dirt.tgz +846a977e0a147de2560b23e740ebdecb TORCS-1.2.2-data-tracks-oval.tgz +78dabde8e38aa618fcfa570a5835732e TORCS-1.2.2-data-tracks-road.tgz +241552524488396fc5cca4ff8c943709 TORCS-1.2.2-data.tgz From fedora-extras-commits at redhat.com Thu Jan 13 18:45:40 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:45:40 -0500 Subject: rpms/torcs-data/devel torcs-data.spec,1.1,1.2 Message-ID: <200501131845.j0DIjeR8009994@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/torcs-data/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv9985 Modified Files: torcs-data.spec Log Message: Clean up. Index: torcs-data.spec =================================================================== RCS file: /cvs/extras/rpms/torcs-data/devel/torcs-data.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- torcs-data.spec 13 Jan 2005 18:41:22 -0000 1.1 +++ torcs-data.spec 13 Jan 2005 18:45:38 -0000 1.2 @@ -1,12 +1,7 @@ -# $Id$ -# Authority: matthias - -# Dist: nodist - Summary: The Open Racing Car Simulator data files Name: torcs-data Version: 1.2.2 -Release: 1.fr +Release: 1 License: GPL Group: Amusements/Games URL: http://torcs.org/ @@ -248,14 +243,14 @@ %changelog -* Thu Feb 26 2004 Matthias Saou 1.2.2-1.fr +* Thu Feb 26 2004 Matthias Saou 1.2.2-1 - Update to 1.2.1 - Added all new tracks : dirt, oval and road. - Added all new cars : kcendra-gt, kcendra-roadsters, kcendra-sport, nascar and VM. - Updated the %%setup and %%build sections to make them even more flexible. -* Tue Nov 11 2003 Matthias Saou 1.2.1-4.fr +* Tue Nov 11 2003 Matthias Saou 1.2.1-4 - Rebuild for Fedora Core 1. * Tue May 27 2003 Matthias Saou From fedora-extras-commits at redhat.com Thu Jan 13 18:52:16 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 13 Jan 2005 13:52:16 -0500 Subject: rpms/torcs/devel torcs-1.2.2-build.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 torcs.spec, 1.1, 1.2 Message-ID: <200501131852.j0DIqGjl010060@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/torcs/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv10054 Modified Files: .cvsignore sources torcs.spec Added Files: torcs-1.2.2-build.patch Log Message: Update to my own version, after approval. torcs-1.2.2-build.patch: --- NEW FILE torcs-1.2.2-build.patch --- diff -Naupr torcs-1.2.2.orig/Make-config torcs-1.2.2/Make-config --- torcs-1.2.2.orig/Make-config 2004-02-12 19:12:42.000000000 +0100 +++ torcs-1.2.2/Make-config 2004-07-23 18:09:23.050675688 +0200 @@ -47,13 +47,13 @@ INSTALL_SCRIPT = ${INSTALL_PROGRAM} mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CFLAGSD = -D_SVID_SOURCE -D_BSD_SOURCE -DSHM -CXXFLAGS = -march=i686 -Wall -Wstrict-prototypes -O3 -mieee-fp -Wall -Wstrict-prototypes -O3 -mieee-fp -march=i686 ${CFLAGSD} -CFLAGS = -march=i686 -Wall -Wstrict-prototypes -O3 -mieee-fp -Wall -Wstrict-prototypes -O3 -mieee-fp ${CFLAGSD} +CXXFLAGS = $(RPM_OPT_FLAGS) -fPIC -Wall -mieee-fp -Wall -Wstrict-prototypes ${CFLAGSD} +CFLAGS = $(RPM_OPT_FLAGS) -fPIC -Wall -mieee-fp -Wall -Wstrict-prototypes ${CFLAGSD} #EXT_LIBS = -lpthread -lplibssgaux -lplibssg -lplibsm -lplibsl -lplibsg -lplibul -lglut -lGLU -lGL -lpng -lz -ldl -lXxf86vm -lXmu -lXi -lXt -lSM -lICE -lXext -lX11 -lm EXT_LIBS = -lplibssgaux -lplibssg -lplibsm -lplibsl -lplibsg -lplibul -lglut -lGLU -lGL -lpng -lz -ldl -lXxf86vm -lXmu -lXi -lXt -lSM -lICE -lXext -lX11 -lm #LDFLAGS = -L/usr/X11R6/lib -L${EXPORTBASE}/lib -L/usr/lib -L/usr/local/lib -LDFLAGS = -L${EXPORTBASE}/lib -L/usr/X11R6/lib -L/usr/lib +LDFLAGS = -fPIC -L${EXPORTBASE}/lib -L/usr/X11R6/lib -L/usr/lib #INCFLAGS = -I${EXPORTBASE}/include -I/usr/include -I/usr/local/include INCFLAGS = -I${EXPORTBASE}/include Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/torcs/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:28:23 -0000 1.2 +++ .cvsignore 13 Jan 2005 18:52:14 -0000 1.3 @@ -1,8 +1,6 @@ -TORCS-1.2.1-data-cars-Patwo-Design.tgz -TORCS-1.2.1-data-cars-extra.tgz -TORCS-1.2.1-data-tracks-base.tgz -TORCS-1.2.1-data.tgz -TORCS-1.2.1-src-robots-K1999.tgz -TORCS-1.2.1-src-robots-base.tgz -TORCS-1.2.1-src-robots-berniw.tgz -TORCS-1.2.1-src.tgz +TORCS-1.2.2-src.tgz +TORCS-1.2.2-src-robots-base.tgz +TORCS-1.2.2-src-robots-berniw.tgz +TORCS-1.2.2-src-robots-billy.tgz +TORCS-1.2.2-src-robots-bt.tgz +TORCS-1.2.2-src-robots-K1999.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/torcs/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:28:23 -0000 1.2 +++ sources 13 Jan 2005 18:52:14 -0000 1.3 @@ -1,8 +1,6 @@ -dddb6ffec22c15a9f8c60d0c69a806cf TORCS-1.2.1-data-cars-Patwo-Design.tgz -1b96f6f9eedda8d1857f9bd112664ab6 TORCS-1.2.1-data-cars-extra.tgz -afb991a29f875e2030f2ad24d82d2c22 TORCS-1.2.1-data-tracks-base.tgz -b7c8729b122d1a3bc1fc563783828d12 TORCS-1.2.1-data.tgz -ee6a5f0099723087585d1295a2d3b48d TORCS-1.2.1-src-robots-K1999.tgz -f21e4e88c2d6982efb28798d02b1c491 TORCS-1.2.1-src-robots-base.tgz -df4588752f50eedee7aa0d6f5df74036 TORCS-1.2.1-src-robots-berniw.tgz -5e43742b252f1e96f8d93da82b8f9fbb TORCS-1.2.1-src.tgz +cf03f0623eab7f9f7d6b13ac20660515 TORCS-1.2.2-src.tgz +425b9737f951f95e4255f81b60449f94 TORCS-1.2.2-src-robots-base.tgz +7e49902b503edb9245c95ffb682bc5c1 TORCS-1.2.2-src-robots-berniw.tgz +43af2098b788aa96556c8939048ac1b3 TORCS-1.2.2-src-robots-billy.tgz +e81c9f15a8089b138113621e9e7013d1 TORCS-1.2.2-src-robots-bt.tgz +b092acfca04bd4708f9722fe0732ba75 TORCS-1.2.2-src-robots-K1999.tgz Index: torcs.spec =================================================================== RCS file: /cvs/extras/rpms/torcs/devel/torcs.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- torcs.spec 8 Nov 2004 05:28:23 -0000 1.1 +++ torcs.spec 13 Jan 2005 18:52:14 -0000 1.2 @@ -1,233 +1,154 @@ -Summary: An OpenGL 3d racing game -Name: torcs -Version: 1.2.1 -Release: 0.fdr.9.rh90 -Epoch: 0 -License: GPL -Group: Amusements/Games -URL: http://torcs.org/ -Source0: TORCS-%{version}-src.tgz -Source1: TORCS-%{version}-src-robots-base.tgz -Source2: TORCS-%{version}-src-robots-berniw.tgz -Source3: TORCS-%{version}-src-robots-K1999.tgz -Source4: TORCS-%{version}-data.tgz -Source5: TORCS-%{version}-data-tracks-base.tgz -Source6: TORCS-%{version}-data-cars-extra.tgz -Source7: TORCS-%{version}-data-cars-Patwo-Design.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -BuildRequires: XFree86-devel glut-devel zlib-devel libpng-devel desktop-file-utils -BuildRequires: plib-devel >= 0:1.6.0 -Requires: %{name}-robots %{name}-data - -%package robots-base -Summary: Base robots for torcs -Group: Amusements/Games -Provides: %{name}-robots -Requires: %{name} %{name}-data-cars-extra - -%package robots-berniw -Summary: Berniw robots for torcs -Group: Amusements/Games -Provides: %{name}-robots -Requires: %{name} - -%package robots-K1999 -Summary: K1999 robots for torcs -Group: Amusements/Games -Provides: %{name}-robots -Requires: %{name} - -%package data -Summary: Data for torcs -Group: Amusements/Games -Requires: %{name} -Requires: %{name}-robots-base - -%package data-tracks -Summary: Tracks for torcs -Group: Amusements/Games -Requires: %{name} - -%package data-cars-extra -Summary: Cars model for torcs -Group: Amusements/Games -Requires: %{name} - -%package data-cars-Patwo-Design -Summary: Cars model for torcs -Group: Amusements/Games -Requires: %{name} +%define desktop_vendor fedora + +Summary: The Open Racing Car Simulator +Name: torcs +Version: 1.2.2 +Release: 4 +License: GPL +Group: Amusements/Games +URL: http://torcs.org/ +Source: http://dl.sf.net/torcs/TORCS-%{version}-src.tgz +Source1: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-base.tgz +Source2: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-berniw.tgz +Source3: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-K1999.tgz +Source4: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-billy.tgz +Source5: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-bt.tgz +Patch: torcs-1.2.2-build.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Requires: torcs-data +%{?_without_xorg:BuildRequires: XFree86-devel, XFree86-Mesa-libGLU, XFree86-Mesa-libGL} +%{!?_without_xorg:BuildRequires: xorg-x11-devel, xorg-x11-Mesa-libGLU, xorg-x11-Mesa-libGL} +BuildRequires: gcc-c++, plib16-devel, freeglut-devel +BuildRequires: libpng-devel, libjpeg-devel, zlib-devel +BuildRequires: desktop-file-utils -#--------------------------------------------------------------------- %description -TORCS is a 3D racing cars simulator using OpenGL. The goal is to have -programmed robot drivers racing against each others. Nevertheless, a -joystick interface is present in order to drive yourself. - -%description robots-base -TORCS is a 3D racing cars simulator using OpenGL. The goal is to have -programmed robot drivers racing against each others. Nevertheless, a -joystick interface is present in order to drive yourself. -This package contains some driver bot for torcs - -%description robots-berniw -TORCS is a 3D racing cars simulator using OpenGL. The goal is to have -programmed robot drivers racing against each others. Nevertheless, a -joystick interface is present in order to drive yourself. -This package contains some driver bot for torcs - -%description robots-K1999 -TORCS is a 3D racing cars simulator using OpenGL. The goal is to have -programmed robot drivers racing against each others. Nevertheless, a -joystick interface is present in order to drive yourself. -This package contains some driver bot for torcs - -%description data -TORCS is a 3D racing cars simulator using OpenGL. The goal is to have -programmed robot drivers racing against each others. Nevertheless, a -joystick interface is present in order to drive yourself. -This package contains mandatory data for %{name} - -%description data-tracks -TORCS is a 3D racing cars simulator using OpenGL. The goal is to have -programmed robot drivers racing against each others. Nevertheless, a -joystick interface is present in order to drive yourself. -This package contains some extra tracks for %{name} - -%description data-cars-extra -TORCS is a 3D racing cars simulator using OpenGL. The goal is to have -programmed robot drivers racing against each others. Nevertheless, a -joystick interface is present in order to drive yourself. -This package contains some extra car models - -%description data-cars-Patwo-Design -TORCS is a 3D racing cars simulator using OpenGL. The goal is to have -programmed robot drivers racing against each others. Nevertheless, a -joystick interface is present in order to drive yourself. -This package contains some extra car models +TORCS is a 3D racing cars simulator using OpenGL. The goal is to have +programmed robots drivers racing against each others. You can also drive +yourself with either a wheel, keyboard or mouse. + + +%package robots +Summary: The Open Racing Car Simulator robots +Group: Amusements/Games +Requires: %{name} + +%description robots +TORCS is a 3D racing cars simulator using OpenGL. The goal is to have +programmed robots drivers racing against each others. You can also drive +yourself with either a wheel, keyboard or mouse. + +This package contains the robots who can race on their own. + -#--------------------------------------------------------------------- %prep -%setup -q -b 1 -b 2 -b 3 +%setup -a 1 -a 2 -a 3 -a 4 -a 5 +%patch -p1 -b .build +# Put the drivers back where they belong +%{__mv} %{name}-%{version}/src/drivers/* src/drivers/ + -#--------------------------------------------------------------------- %build %configure -# Race conditions. -make +%{__make} %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags}" + -#--------------------------------------------------------------------- %install -rm -rf $RPM_BUILD_ROOT -%makeinstall -for i in %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} -do - tar zvxf $i -C $RPM_BUILD_ROOT/%{_datadir}/games/%{name} |\ - sed 's:^\.:%{_datadir}/games/%{name}:g' |\ - sed 's:^\(.\+/\)$:%%dir \1:g' > ${i##*/}.list -done +%{__rm} -rf %{buildroot} +%{__make} install DESTDIR=%{buildroot} -install -m 644 -D Ticon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png -cat > %{name}.desktop << EOF +%{__install} -m 644 -D Ticon.png %{buildroot}%{_datadir}/pixmaps/%{name}.png + +%{__cat} > %{name}.desktop << EOF [Desktop Entry] Name=TORCS -Comment=An OpenGL 3d racing game -Exec=%{name} -Icon=%{name}.png +Comment=The Open Racing Car Simulator +Exec=torcs +Icon=torcs.png Terminal=false Type=Application Encoding=UTF-8 +Categories=Application;Game; EOF -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install --vendor fedora \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Fedora \ - --add-category Application \ - --add-category Game \ - %{name}.desktop +%{__mkdir_p} %{buildroot}%{_datadir}/applications +desktop-file-install --vendor %{desktop_vendor} \ + --dir %{buildroot}%{_datadir}/applications \ + %{name}.desktop + +# We need this for proper automatic stripping to take place +find %{buildroot}%{_libdir}/%{name} -name '*.so' | xargs %{__chmod} +x + -#--------------------------------------------------------------------- %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} + -#--------------------------------------------------------------------- %files -%defattr(-,root,root,-) -%doc COPYING CHANGELOG.html -%{_bindir}/gennmtab -%{_bindir}/%{name} -%{_libdir}/lib*.so -%dir %{_datadir}/games +%defattr(-, root, root, 0755) +%doc CHANGELOG.html COPYING README.linux TODO.html +%{_bindir}/* +%dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/drivers +%{_libdir}/%{name}/drivers/human +%{_libdir}/%{name}/lib +%{_libdir}/%{name}/modules +%{_libdir}/%{name}/setup_linux.sh +%{_libdir}/%{name}/*-bin +%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop %dir %{_datadir}/games/%{name} -%dir %{_datadir}/games/%{name}/drivers -%dir %{_datadir}/games/%{name}/tracks -%{_datadir}/games/%{name}/%{name} %{_datadir}/games/%{name}/config -%{_datadir}/games/%{name}/modules -%{_datadir}/games/%{name}/setup_linux.sh -%{_datadir}/games/%{name}/telemetry +%dir %{_datadir}/games/%{name}/drivers %{_datadir}/games/%{name}/drivers/human +%{_datadir}/games/%{name}/results +%{_datadir}/games/%{name}/telemetry %{_datadir}/pixmaps/%{name}.png -%{_datadir}/applications/*%{name}.desktop -%files robots-base -%defattr(-,root,root,-) -%{_datadir}/games/%{name}/drivers/tita -%{_datadir}/games/%{name}/drivers/tanhoj -%{_datadir}/games/%{name}/drivers/lliaw -%{_datadir}/games/%{name}/drivers/inferno* -%{_datadir}/games/%{name}/drivers/damned -%{_datadir}/games/%{name}/drivers/cylos1 - -%files robots-berniw -%defattr(-,root,root,-) -%{_datadir}/games/%{name}/drivers/berniw2 -%{_datadir}/games/%{name}/drivers/berniw - -%files robots-K1999 -%defattr(-,root,root,-) -%{_datadir}/games/%{name}/drivers/K1999 - -%files data -f TORCS-%{version}-data.tgz.list -%defattr(-,root,root,-) - -%files data-tracks -f TORCS-%{version}-data-tracks-base.tgz.list -%defattr(-,root,root,-) -%files data-cars-extra -f TORCS-%{version}-data-cars-extra.tgz.list -%defattr(-,root,root,-) +%files robots +%defattr(-, root, root, 0755) +%dir %{_libdir}/%{name} +%{_libdir}/%{name}/drivers +# Easier this way, since we package them all-minus-one in ;-) +%exclude %{_libdir}/%{name}/drivers/human +%dir %{_datadir}/games/%{name} +%{_datadir}/games/%{name}/drivers +%exclude %{_datadir}/games/%{name}/drivers/human -%files data-cars-Patwo-Design -f TORCS-%{version}-data-cars-Patwo-Design.tgz.list -%defattr(-,root,root,-) -#--------------------------------------------------------------------- %changelog -* Mon Jul 7 2003 Dams 0:1.2.1-0.fdr.9 -- Added missing directories - -* Sat Jun 28 2003 Dams 0:1.2.1-0.fdr.8 -- removed ugliness in SourceX tags - -* Fri Jun 27 2003 Dams 0:1.2.1-0.fdr.7 -- Added missing dep - -* Thu Jun 26 2003 Dams 0:1.2.1-0.fdr.6 -- Removed URL in Source tags. -- Added Encoding for the desktop entry -- buildroot -> RPM_BUILD_ROOT +* Fri Nov 5 2004 Matthias Saou 1.2.2-4 +- Add +x chmod'ing to .so files in order to get them stripped properly. -* Thu Jun 26 2003 Dams 0:1.2.1-0.fdr.5 -- data now requires robots-base package +* Mon Oct 25 2004 Matthias Saou 1.2.2-3 +- Remove un-needed /sbin/ldconfig calls. -* Thu May 1 2003 Dams 0:1.2.1-0.fdr.4 -- Added dir entry in main package +* Fri Jul 23 2004 Matthias Saou 1.2.2-3 +- Change build dependency of plib to compat package plib16-devel as + rebuilding against 1.8 is not currently possible. +- Add patch for -fPIC to fix x86_64 build (hmm, doesn't work). + +* Thu May 20 2004 Matthias Saou 1.2.2-2 +- Rebuild for Fedora Core 2. +- Change XFree86 deps to xorg-x11 and glut to freeglut. + +* Thu Feb 26 2004 Matthias Saou 1.2.2-1 +- Update to 1.2.2. +- No longer require compat-libstdc++-devel for building. +- This version broke %%makeinstall, so switch to DESTDIR method. +- Re-enabled K1999 build, it works again. +- Added new robots : billy and bt. + +* Tue Jan 13 2004 Matthias Saou 1.2.1-4 +- Work around the XFree86 dependency problem by adding XFree86-Mesa-libGLU. + +* Tue Dec 2 2003 Matthias Saou 1.2.1-3 +- Rebuild for Fedora Core 1. +- Disabled build of the K1999 driver (strstream.h seems obsolete). -* Fri Apr 25 2003 Dams 0:1.2.1-0.fdr.3 -- Added dir entries according to discussion on bugzilla entry #203 +* Tue May 27 2003 Matthias Saou +- Added a torcs requirement to the robots package. -* Fri Apr 25 2003 Dams 0:1.2.1-0.fdr.2 -- Stole Desktop entry from Freshrpms spec file +* Wed Apr 23 2003 Matthias Saou +- Initial RPM release. -* Wed Apr 23 2003 Dams -- Initial build. From fedora-extras-commits at redhat.com Thu Jan 13 19:33:03 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 13 Jan 2005 14:33:03 -0500 Subject: rpms/liferea import.log,1.7,1.8 Message-ID: <200501131933.j0DJX3ju010978@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/liferea In directory cvs.fedora.redhat.com:/tmp/cvs-serv10969 Modified Files: import.log Log Message: auto-import liferea-0.6.4-0.fdr.1.b.2 on branch FC-2 from liferea-0.6.4-0.fdr.1.b.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/liferea/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 12 Jan 2005 20:05:46 -0000 1.7 +++ import.log 13 Jan 2005 19:33:01 -0000 1.8 @@ -4,3 +4,4 @@ liferea-0_5_3-0_fdr_3_c_2:HEAD:liferea-0.5.3-0.fdr.3.c.2.src.rpm:1099889383 liferea-0_5_3-0_fdr_4_c_2:HEAD:liferea-0.5.3-0.fdr.4.c.2.src.rpm:1099889386 liferea-0_6_4-1_b:HEAD:liferea-0.6.4-1.b.src.rpm:1105560383 +liferea-0_6_4-0_fdr_1_b_2:FC-2:liferea-0.6.4-0.fdr.1.b.2.src.rpm:1105644774 From fedora-extras-commits at redhat.com Thu Jan 13 19:33:03 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 13 Jan 2005 14:33:03 -0500 Subject: rpms/liferea/FC-2 .cvsignore, 1.2, 1.3 liferea.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200501131933.j0DJX3ar010982@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/liferea/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv10969/FC-2 Modified Files: .cvsignore liferea.spec sources Log Message: auto-import liferea-0.6.4-0.fdr.1.b.2 on branch FC-2 from liferea-0.6.4-0.fdr.1.b.2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-2/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:49:13 -0000 1.2 +++ .cvsignore 13 Jan 2005 19:33:01 -0000 1.3 @@ -1 +1 @@ -liferea-0.5.3b.tar.gz +liferea-0.6.4b.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-2/liferea.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- liferea.spec 25 Nov 2004 06:15:04 -0000 1.5 +++ liferea.spec 13 Jan 2005 19:33:01 -0000 1.6 @@ -1,13 +1,13 @@ Name: liferea -Version: 0.6.1 -Release: 0.fdr.1.2 +Version: 0.6.4 +Release: 0.fdr.1.b.2 Epoch: 0 Summary: An RSS/RDF feed reader. Group: Applications/Internet License: GPL URL: http://liferea.sourceforge.net/ -Source0: http://download.sourceforge.net/liferea/liferea-0.6.1.tar.gz +Source0: http://download.sourceforge.net/liferea/liferea-0.6.4b.tar.gz Source2: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -31,7 +31,7 @@ %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{version}b %build @@ -83,6 +83,9 @@ %changelog +* Wed Jan 12 2005 Brian Pepple - 0:0.6.4-0.fdr.1.b +- Updated to 0.6.4b. + * Mon Nov 1 2004 Brian Pepple - 0:0.6.1-0.fdr.1 - Updated to 0.6.1. - Added %exclude *.la Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-2/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 25 Nov 2004 06:15:04 -0000 1.3 +++ sources 13 Jan 2005 19:33:01 -0000 1.4 @@ -1 +1 @@ -a9a03cdeeb2a57c96dd8e7718917e787 liferea-0.6.1.tar.gz +d45086ee3fc098cc9ca146bece0ddf9f liferea-0.6.4b.tar.gz From ville.skytta at iki.fi Thu Jan 13 19:44:20 2005 From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=) Date: Thu, 13 Jan 2005 21:44:20 +0200 Subject: /cvs/extras/tags/liferea: Permission denied In-Reply-To: <200501131933.j0DJX3ar010982@cvs.fedora.redhat.com> References: <200501131933.j0DJX3ar010982@cvs.fedora.redhat.com> Message-ID: <1105645460.524.7.camel@bobcat.mine.nu> On Thu, 2005-01-13 at 14:33 -0500, Ville Skytta wrote: > Author: scop > > Update of /cvs/extras/rpms/liferea/FC-2 > In directory cvs.fedora.redhat.com:/tmp/cvs-serv10969/FC-2 > > Modified Files: > .cvsignore liferea.spec sources > Log Message: > auto-import liferea-0.6.4-0.fdr.1.b.2 on branch FC-2 from liferea-0.6.4-0.fdr.1.b.2.src.rpm While importing this, I got: [...] Source upload succeeded. Don't forget to commit the new ./sources file M sources M .cvsignore cvs commit... Commit Complete /cvs/extras/CVSROOT/tag-check: line 156: /cvs/extras/tags/liferea: Permission denied Tagging 'liferea-0_6_4-0_fdr_1_b_2' complete. I didn't notice any breakage from this, but perhaps someone wants to take a look at what's causing the error. From fedora-extras-commits at redhat.com Thu Jan 13 19:51:11 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 13 Jan 2005 14:51:11 -0500 Subject: rpms/perl-Test-Pod-Coverage - New directory Message-ID: <200501131951.j0DJpBX5011214@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Test-Pod-Coverage In directory cvs.fedora.redhat.com:/tmp/cvs-serv11207/perl-Test-Pod-Coverage Log Message: Directory /cvs/extras/rpms/perl-Test-Pod-Coverage added to the repository From fedora-extras-commits at redhat.com Thu Jan 13 19:51:11 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 13 Jan 2005 14:51:11 -0500 Subject: rpms/perl-Test-Pod-Coverage/devel - New directory Message-ID: <200501131951.j0DJpBJe011217@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Test-Pod-Coverage/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv11207/perl-Test-Pod-Coverage/devel Log Message: Directory /cvs/extras/rpms/perl-Test-Pod-Coverage/devel added to the repository From fedora-extras-commits at redhat.com Thu Jan 13 19:51:29 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 13 Jan 2005 14:51:29 -0500 Subject: rpms/perl-Test-Pod-Coverage Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501131951.j0DJpTlM011279@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Test-Pod-Coverage In directory cvs.fedora.redhat.com:/tmp/cvs-serv11270 Added Files: Makefile import.log Log Message: Setup of module perl-Test-Pod-Coverage --- NEW FILE Makefile --- # Top level Makefile for module perl-Test-Pod-Coverage all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 13 19:51:29 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 13 Jan 2005 14:51:29 -0500 Subject: rpms/perl-Test-Pod-Coverage/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501131951.j0DJpT4Z011282@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Test-Pod-Coverage/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv11270/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Test-Pod-Coverage --- NEW 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 Jan 13 19:51:58 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 13 Jan 2005 14:51:58 -0500 Subject: rpms/perl-Test-Pod-Coverage import.log,1.1,1.2 Message-ID: <200501131951.j0DJpwS3011379@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Test-Pod-Coverage In directory cvs.fedora.redhat.com:/tmp/cvs-serv11369 Modified Files: import.log Log Message: auto-import perl-Test-Pod-Coverage-1.06-1 on branch devel from perl-Test-Pod-Coverage-1.06-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Jan 2005 19:51:27 -0000 1.1 +++ import.log 13 Jan 2005 19:51:56 -0000 1.2 @@ -0,0 +1 @@ +perl-Test-Pod-Coverage-1_06-1:HEAD:perl-Test-Pod-Coverage-1.06-1.src.rpm:1105645910 From fedora-extras-commits at redhat.com Thu Jan 13 19:51:58 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 13 Jan 2005 14:51:58 -0500 Subject: rpms/perl-Test-Pod-Coverage/devel perl-Test-Pod-Coverage.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501131951.j0DJpwsa011382@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Test-Pod-Coverage/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv11369/devel Modified Files: .cvsignore sources Added Files: perl-Test-Pod-Coverage.spec Log Message: auto-import perl-Test-Pod-Coverage-1.06-1 on branch devel from perl-Test-Pod-Coverage-1.06-1.src.rpm --- NEW FILE perl-Test-Pod-Coverage.spec --- %{!?perl_vendorlib: %define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)} Name: perl-Test-Pod-Coverage Version: 1.06 Release: 1 Epoch: 0 Summary: Check for pod coverage in your distribution Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Test-Pod-Coverage/ Source0: http://www.cpan.org/authors/id/P/PE/PETDANCE/Test-Pod-Coverage-1.06.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 BuildRequires: perl(Pod::Coverage) BuildRequires: perl(Test::More), perl(Test::Pod), perl(Test::Builder::Tester) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Checks for POD coverage in files for your distribution. %prep %setup -q -n Test-Pod-Coverage-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check || : make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes %{perl_vendorlib}/Test/ %{_mandir}/man3/*.3* %changelog * Thu Jun 24 2004 Jose Pedro Oliveira - 0:1.06-1 - Update to 1.06. * Wed Jun 02 2004 Jose Pedro Oliveira - 0:1.04-0.fdr.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Jan 2005 19:51:27 -0000 1.1 +++ .cvsignore 13 Jan 2005 19:51:56 -0000 1.2 @@ -0,0 +1 @@ +Test-Pod-Coverage-1.06.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Jan 2005 19:51:27 -0000 1.1 +++ sources 13 Jan 2005 19:51:56 -0000 1.2 @@ -0,0 +1 @@ +2e9991d4ac04149179fa60f621b3f42f Test-Pod-Coverage-1.06.tar.gz From fedora-extras-commits at redhat.com Fri Jan 14 09:41:51 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:41:51 -0500 Subject: rpms/proj - New directory Message-ID: <200501140941.j0E9fpe4024590@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/proj In directory cvs.fedora.redhat.com:/tmp/cvs-serv24583/proj Log Message: Directory /cvs/extras/rpms/proj added to the repository From fedora-extras-commits at redhat.com Fri Jan 14 09:41:51 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:41:51 -0500 Subject: rpms/proj/devel - New directory Message-ID: <200501140941.j0E9fpf2024593@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/proj/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24583/proj/devel Log Message: Directory /cvs/extras/rpms/proj/devel added to the repository From fedora-extras-commits at redhat.com Fri Jan 14 09:42:10 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:42:10 -0500 Subject: rpms/proj Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501140942.j0E9gAoT024656@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/proj In directory cvs.fedora.redhat.com:/tmp/cvs-serv24647 Added Files: Makefile import.log Log Message: Setup of module proj --- NEW FILE Makefile --- # Top level Makefile for module proj all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 14 09:42:10 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:42:10 -0500 Subject: rpms/proj/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501140942.j0E9gACI024659@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/proj/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24647/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module proj --- NEW 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 Jan 14 09:45:23 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:45:23 -0500 Subject: rpms/proj import.log,1.1,1.2 Message-ID: <200501140945.j0E9jNTQ024773@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/proj In directory cvs.fedora.redhat.com:/tmp/cvs-serv24764 Modified Files: import.log Log Message: auto-import proj-4.4.8-4 on branch devel from proj-4.4.8-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/proj/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Jan 2005 09:42:08 -0000 1.1 +++ import.log 14 Jan 2005 09:45:21 -0000 1.2 @@ -0,0 +1 @@ +proj-4_4_8-4:HEAD:proj-4.4.8-4.src.rpm:1105695966 From fedora-extras-commits at redhat.com Fri Jan 14 09:45:23 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:45:23 -0500 Subject: rpms/proj/devel proj.copyright, NONE, 1.1 proj.copyright.patch, NONE, 1.1 proj.spec, NONE, 1.1 proj.test_scripts.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501140945.j0E9jNca024777@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/proj/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24764/devel Modified Files: .cvsignore sources Added Files: proj.copyright proj.copyright.patch proj.spec proj.test_scripts.patch Log Message: auto-import proj-4.4.8-4 on branch devel from proj-4.4.8-4.src.rpm --- NEW FILE proj.copyright --- This package was debianized by Peter S Galbraith psg at debian.org on Sun, 24 Oct 1999 14:13:26 -0400. It was downloaded from ftp://ftp.remotesensing.org/pub/proj/proj-4.4.5.tar.gz Web page: http://www.remotesensing.org/proj Old Web pages: http://kai.er.usgs.gov/ftp/mapgenproj.html http://www.vectaport.com/ivmaps/projinfo.html Version 4.3.3 was authored by: Gerald (Jerry) Ian Evenden email: gie at kai.er.usgs.gov gevenden at capecod.net phone: (508)563-6766 P.O. Box 1027 N.Falmouth, MA 02556-1027 Proj is a U.S. Government work and is not eligible for U.S. copyright protection. This is free software. Here's what Jerry replied when I asked what the license was: `The software was developed by the USGS and has no copyright nor license. Do with it what you will. :-)' Maintenance of proj has been taken up by Frank Warmerdam under the following license: All source, data files and other contents of the PROJ.4 package are available under the following terms. Note that the PROJ 4.3 and earlier was "public domain" as is common with US government work, but apparently this is not a well defined legal term in many countries. I am placing everything under the following MIT style license because I believe it is effectively the same as public domain, allowing anyone to use the code as they wish, including making proprietary derivatives. Though I have put my own name as copyright holder, I don't mean to imply I did the work. Essentially all work was done by Gerald Evenden. -------------- Copyright (c) 2000, Frank Warmerdam Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. proj.copyright.patch: --- NEW FILE proj.copyright.patch --- --- proj.copyright 2004-08-13 10:28:21.000000000 -0700 +++ proj.copyright.fedora 2004-08-13 10:39:08.000000000 -0700 @@ -1,3 +1,15 @@ +This package was created for Fedora by David M. Kaplan dmkaplan at ucdavis.edu on +Fri Aug 13 10:31:34 PDT 2004. + +It was downloaded from ftp://ftp.remotesensing.org/pub/proj/proj-4.4.8.tar.gz + +Below is the version of the copyright that appeared with the Debian +version of this package. It explains the complete history of this +package, including the transfer of the license from a governmental +"public domain" license to an MIT-style license. + +==================Original Debian copyright file below====================== + This package was debianized by Peter S Galbraith psg at debian.org on Sun, 24 Oct 1999 14:13:26 -0400. --- NEW FILE proj.spec --- Name: proj Version: 4.4.8 Release: 4 Epoch: 0 Summary: Cartographic projection software (PROJ.4) Group: Applications/Engineering License: MIT URL: http://www.remotesensing.org/proj/ Source0: ftp://ftp.remotesensing.org/pub/proj/proj-4.4.8.tar.gz Source1: ftp://ftp.remotesensing.org/pub/proj/proj-nad27-1.1.tar.gz Source2: http://packages.debian.org/changelogs/pool/main/p/proj/proj_4.4.8-3/proj.copyright Patch0: proj.copyright.patch Patch1: proj.test_scripts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %package devel Summary: Development files for PROJ.4 Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} %package nad Summary: US and Canadian datum shift grids for PROJ.4 Group: Applications/Engineering Requires: %{name} = %{epoch}:%{version}-%{release} %description Proj and invproj perform respective forward and inverse transformation of cartographic data to or from cartesian data with a wide range of selectable projection functions. Proj docs: http://www.remotesensing.org/dl/new_docs/ %description devel This package contains libproj and the appropriate header files and man pages. %description nad This package contains additional US and Canadian datum shift grids. %prep %setup -q # Prepare copyright cp %{SOURCE2} ./ %patch0 -p0 -b .buildroot %patch1 -p1 -b .buildroot cp proj.copyright COPYING # Prepare nad cd nad gzip -dc %{SOURCE1} | tar -xvvf - cd .. %build %configure make OPTIMIZE="$RPM_OPT_FLAGS" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT %makeinstall install -p -m 0644 nad/pj_out27.dist nad/pj_out83.dist nad/td_out.dist $RPM_BUILD_ROOT%{_datadir}/%{name} install -p -m 0755 nad/test27 nad/test83 nad/testvarious $RPM_BUILD_ROOT%{_datadir}/%{name} %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc NEWS AUTHORS COPYING README ChangeLog %{_bindir}/* %{_mandir}/man1/*.1* %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %{_mandir}/man3/*.3* %{_includedir}/*.h %{_libdir}/*.so %{_libdir}/*.a %exclude %{_libdir}/libproj.la %files nad %defattr(-,root,root,-) %doc nad/README %attr(0755,root,root) %{_datadir}/%{name}/test27 %attr(0755,root,root) %{_datadir}/%{name}/test83 %attr(0755,root,root) %{_datadir}/%{name}/testvarious %{_datadir}/%{name} %changelog * Wed Dec 29 2004 David Kaplan - 0:4.4.8-4 - Added testvarious to nad distribution * Wed Dec 29 2004 David Kaplan - 0:4.4.8-0.fdr.3 - Added patch for test scripts so that they will work in installed rpm * Wed Dec 29 2004 David Kaplan - 0:4.4.8-0.fdr.2 - Fixed permissions on nad27 and nad83 - Included test27 and test83 in the nad rpm and made them executable * Fri Aug 13 2004 David M. Kaplan 0:4.4.8-0.fdr.1 - Updated to version 4.4.8 of library. - Changed license file so that it agrees with Debian version. - Updated web addresses of packages. * Wed Aug 11 2004 David M. Kaplan 0:4.4.7-0.fdr.3 - Removed the "Requires(post,postun)" * Tue Dec 30 2003 David M. Kaplan 0:4.4.7-0.fdr.2 - proj-nad now owns %{_datadir}/%{name} * Wed Oct 29 2003 Steve Arnold - Basically re-wrote previous spec file from scratch so as - to comply with both Fedora and RedHat 9 packaging guidelines. - Split files into proj, proj-devel, and proj-nad (additional grids) - and adjusted the EXE path in the test scripts. proj.test_scripts.patch: --- NEW FILE proj.test_scripts.patch --- diff -Naur proj-4.4.8.orig/nad/test27 proj-4.4.8/nad/test27 --- proj-4.4.8.orig/nad/test27 2004-12-29 13:00:31.428068481 -0800 +++ proj-4.4.8/nad/test27 2004-12-29 13:00:55.742384745 -0800 @@ -8,7 +8,7 @@ # Mercator due to greater precision of meridinal distance function. # OUT=proj_out27 -EXE=../src/proj +EXE=proj INIT_FILE=./nad27 # echo "doing tests into file ${OUT}, please wait" diff -Naur proj-4.4.8.orig/nad/test83 proj-4.4.8/nad/test83 --- proj-4.4.8.orig/nad/test83 2004-12-29 13:00:31.421069541 -0800 +++ proj-4.4.8/nad/test83 2004-12-29 13:01:04.976985631 -0800 @@ -8,7 +8,7 @@ # Mercator due to greater precision of meridinal distance function. # OUT=proj_out83 -EXE=../src/proj +EXE=proj INIT_FILE=./nad83 # echo "doing tests into file ${OUT}, please wait" diff -Naur proj-4.4.8.orig/nad/testvarious proj-4.4.8/nad/testvarious --- proj-4.4.8.orig/nad/testvarious 2004-12-29 13:00:31.420069693 -0800 +++ proj-4.4.8/nad/testvarious 2004-12-29 13:35:39.314658254 -0800 @@ -3,7 +3,7 @@ # # OUT=td_out -EXE=../src/cs2cs +EXE=cs2cs # echo "doing tests into file ${OUT}, please wait" rm -f ${OUT} Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/proj/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jan 2005 09:42:08 -0000 1.1 +++ .cvsignore 14 Jan 2005 09:45:21 -0000 1.2 @@ -0,0 +1,2 @@ +proj-4.4.8.tar.gz +proj-nad27-1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/proj/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jan 2005 09:42:08 -0000 1.1 +++ sources 14 Jan 2005 09:45:21 -0000 1.2 @@ -0,0 +1,2 @@ +1bdfb7bf5df081d029828ed47b780519 proj-4.4.8.tar.gz +66537aa24ad729d43db383abe2bf7707 proj-nad27-1.1.tar.gz From fedora-extras-commits at redhat.com Fri Jan 14 09:46:14 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:46:14 -0500 Subject: rpms/shapelib - New directory Message-ID: <200501140946.j0E9kEP3024895@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/shapelib In directory cvs.fedora.redhat.com:/tmp/cvs-serv24886/shapelib Log Message: Directory /cvs/extras/rpms/shapelib added to the repository From fedora-extras-commits at redhat.com Fri Jan 14 09:46:14 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:46:14 -0500 Subject: rpms/shapelib/devel - New directory Message-ID: <200501140946.j0E9kEaW024898@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/shapelib/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24886/shapelib/devel Log Message: Directory /cvs/extras/rpms/shapelib/devel added to the repository From fedora-extras-commits at redhat.com Fri Jan 14 09:46:35 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:46:35 -0500 Subject: rpms/shapelib Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501140946.j0E9kZE7024959@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/shapelib In directory cvs.fedora.redhat.com:/tmp/cvs-serv24950 Added Files: Makefile import.log Log Message: Setup of module shapelib --- NEW FILE Makefile --- # Top level Makefile for module shapelib all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 14 09:46:35 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:46:35 -0500 Subject: rpms/shapelib/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501140946.j0E9kZsG024962@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/shapelib/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24950/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module shapelib --- NEW 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 Jan 14 09:47:30 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:47:30 -0500 Subject: rpms/shapelib import.log,1.1,1.2 Message-ID: <200501140947.j0E9lUU2025061@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/shapelib In directory cvs.fedora.redhat.com:/tmp/cvs-serv25052 Modified Files: import.log Log Message: auto-import shapelib-1.2.10-5 on branch devel from shapelib-1.2.10-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/shapelib/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Jan 2005 09:46:33 -0000 1.1 +++ import.log 14 Jan 2005 09:47:27 -0000 1.2 @@ -0,0 +1 @@ +shapelib-1_2_10-5:HEAD:shapelib-1.2.10-5.src.rpm:1105696087 From fedora-extras-commits at redhat.com Fri Jan 14 09:47:30 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:47:30 -0500 Subject: rpms/shapelib/devel shapelib-1.2.10.patch, NONE, 1.1 shapelib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501140947.j0E9lUdZ025065@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/shapelib/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25052/devel Modified Files: .cvsignore sources Added Files: shapelib-1.2.10.patch shapelib.spec Log Message: auto-import shapelib-1.2.10-5 on branch devel from shapelib-1.2.10-5.src.rpm shapelib-1.2.10.patch: --- NEW FILE shapelib-1.2.10.patch --- diff -Naur shapelib-1.2.10.orig/Makefile shapelib-1.2.10/Makefile --- shapelib-1.2.10.orig/Makefile 2003-04-07 06:03:22.000000000 -0700 +++ shapelib-1.2.10/Makefile 2004-08-12 10:41:15.000000000 -0700 @@ -1,5 +1,9 @@ +bindir = /usr/local/bin +libdir = /usr/local/lib +includedir = /usr/local/include #LINKOPT = /usr/local/lib/libdbmalloc.a +CC = gcc CFLAGS = -g default: all @@ -99,21 +103,21 @@ 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 @@ -126,17 +130,23 @@ rm -fr .libs/libshp.lax (cd .libs && rm -f libshp.la && ln -s ../libshp.la libshp.la) -lib_install: +lib_install: cp .libs/libshp.la .libs/libshp.lai - /bin/sh ./mkinstalldirs /usr/local/lib - /bin/sh ./libtool --mode=install /usr/bin/install -c libshp.la /usr/local/lib/libshp.la - /usr/bin/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) - /usr/bin/install -c .libs/libshp.la /usr/local/lib/libshp.la - /usr/bin/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 - /usr/bin/install -c -m 644 shapefil.h /usr/local/include/libshp/shapefil.h + mkdir -p $(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 + mkdir -p $(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 diff -Naur shapelib-1.2.10.orig/contrib/Makefile shapelib-1.2.10/contrib/Makefile --- shapelib-1.2.10.orig/contrib/Makefile 2003-04-07 06:03:22.000000000 -0700 +++ shapelib-1.2.10/contrib/Makefile 2004-08-12 10:59:35.000000000 -0700 @@ -1,11 +1,14 @@ +bindir = /usr/local/bin #LINKOPT = /usr/local/lib/libdbmalloc.a #CFLAGS = -g # Endian: define either _LITTLE_ENDIAN or _BIG_ENDIAN +CC = gcc ENDIAN = -D_LITTLE_ENDIAN -CFLAGS = -g -I.. -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2 +EXTRACFLAGS = -g +CFLAGS = $(EXTRACFLAGS) -I.. -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2 SHPOBJ = ../shpopen.o ../dbfopen.o @@ -32,7 +35,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) @@ -57,3 +60,7 @@ testproj: tests/shpproj.sh + +install: all + install dbfcat dbfinfo shpcat shpcentrd shpdata shpdxf shpfix shpinfo shpwkb shpproj \ + $(bindir) --- NEW FILE shapelib.spec --- # This RPM will possibly fail on PowerPCs, but I am ignoring this. Summary: API in "C" for Shapefile handling Name: shapelib Version: 1.2.10 Release: 5 Epoch: 0 URL: http://shapelib.maptools.org/ Source: http://shapelib.maptools.org/dl/shapelib-%{version}.tar.gz Patch0: shapelib-%{version}.patch License: LGPL/MIT Group: Development/Libraries Buildrequires: libtool BuildRequires: proj-devel >= 0:4.4.1 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %package devel Summary: Development files for shapelib Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} %description The Shapefile C Library provides the ability to write simple C programs for reading, writing and updating (to a limited extent) ESRI Shapefiles, and the associated attribute file (.dbf). %description devel This package contains libshp and the appropriate header files. %prep %setup -q -T -b 0 %patch -p1 -b .buildroot %build make %{?_smp_mflags} libdir=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" lib make %{?_smp_mflags} libdir=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" all cd contrib make %{?_smp_mflags} libdir=%{_libdir} EXTRACFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT %makeinstall cd contrib %makeinstall %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root) %{_bindir}/* %{_libdir}/*.so.* %doc LICENSE.LGPL README README.tree dbf_api.html shapelib.html shp_api.html %doc contrib/doc/shpproj.txt stream1.sh stream1.out stream2.sh %doc stream2.out makeshape.sh stream3.out ChangeLog %files devel %defattr(-,root,root,-) %{_includedir}/* %{_libdir}/*.so %{_libdir}/*.a %exclude %{_libdir}/libshp.la %changelog * Wed Dec 15 2004 David M. Kaplan 0:1.2.10-5 - Patched patch and spec file according to suggestions of Michael Schwendt - In particular, this separates the building from the installing in the rpm. * Thu Aug 12 2004 David M. Kaplan 0:1.2.10-0.fdr.4 - Moved RPM_OPT_FLAGS out of make files. - Removed backup files from patch. - Made sure that make was using the appropriate libdir. * Mon Dec 22 2003 David M. Kaplan 0:1.2.10-0.fdr.3 - Added url tag, changed copyright to license and changed permissions on patch file. * Mon Dec 22 2003 David M. Kaplan 0:1.2.10-0.fdr.2 - Add source URL - Removed proj requirement as it is automatically detected. - Added epoch to proj-devel requirement - Fixed %post and %postun - Changed group to Development/Libraries, although this appears to be only somewhat satisfactory. - Removed "which make" * Wed Nov 5 2003 David M. Kaplan 0:1.2.10-0.fdr.1 - Updated to 1.2.10 release - Major changes to spec for Fedora - Changes to Makefile patch for Fedora - Split off devel package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/shapelib/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jan 2005 09:46:33 -0000 1.1 +++ .cvsignore 14 Jan 2005 09:47:28 -0000 1.2 @@ -0,0 +1 @@ +shapelib-1.2.10.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/shapelib/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jan 2005 09:46:33 -0000 1.1 +++ sources 14 Jan 2005 09:47:28 -0000 1.2 @@ -0,0 +1 @@ +4d96bd926167193d27bf14d56e2d484e shapelib-1.2.10.tar.gz From fedora-extras-commits at redhat.com Fri Jan 14 09:48:19 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:48:19 -0500 Subject: rpms/netcdf - New directory Message-ID: <200501140948.j0E9mJcv025180@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/netcdf In directory cvs.fedora.redhat.com:/tmp/cvs-serv25173/netcdf Log Message: Directory /cvs/extras/rpms/netcdf added to the repository From fedora-extras-commits at redhat.com Fri Jan 14 09:48:19 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:48:19 -0500 Subject: rpms/netcdf/devel - New directory Message-ID: <200501140948.j0E9mJY0025183@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/netcdf/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25173/netcdf/devel Log Message: Directory /cvs/extras/rpms/netcdf/devel added to the repository From fedora-extras-commits at redhat.com Fri Jan 14 09:48:39 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:48:39 -0500 Subject: rpms/netcdf Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501140948.j0E9mdwS025244@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/netcdf In directory cvs.fedora.redhat.com:/tmp/cvs-serv25235 Added Files: Makefile import.log Log Message: Setup of module netcdf --- NEW FILE Makefile --- # Top level Makefile for module netcdf all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 14 09:48:39 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:48:39 -0500 Subject: rpms/netcdf/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501140948.j0E9mdCG025247@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/netcdf/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25235/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module netcdf --- NEW 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 Jan 14 09:50:51 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:50:51 -0500 Subject: rpms/netcdf import.log,1.1,1.2 Message-ID: <200501140950.j0E9opnt025348@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/netcdf In directory cvs.fedora.redhat.com:/tmp/cvs-serv25339 Modified Files: import.log Log Message: auto-import netcdf-3.5.1-0.fdr.8 on branch devel from netcdf-3.5.1-0.fdr.8.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/netcdf/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Jan 2005 09:48:37 -0000 1.1 +++ import.log 14 Jan 2005 09:50:48 -0000 1.2 @@ -0,0 +1 @@ +netcdf-3_5_1-0_fdr_8:HEAD:netcdf-3.5.1-0.fdr.8.src.rpm:1105696292 From fedora-extras-commits at redhat.com Fri Jan 14 09:50:51 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:50:51 -0500 Subject: rpms/netcdf/devel netcdf-mandir.patch, NONE, 1.1 netcdf.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501140950.j0E9opRS025353@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/netcdf/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25339/devel Modified Files: .cvsignore sources Added Files: netcdf-mandir.patch netcdf.spec Log Message: auto-import netcdf-3.5.1-0.fdr.8 on branch devel from netcdf-3.5.1-0.fdr.8.src.rpm netcdf-mandir.patch: --- NEW FILE netcdf-mandir.patch --- --- netcdf-3.5.1/src/macros.make.in 2001-07-11 12:30:33.000000000 -0400 +++ netcdf-3.5.1/src/macros.make.in.new 2004-07-14 20:24:39.805458165 -0400 @@ -15,7 +15,7 @@ INCDIR = $(exec_prefix)/include LIBDIR = $(exec_prefix)/lib BINDIR = $(exec_prefix)/bin -MANDIR = $(prefix)/man +MANDIR = $(prefix)/share/man # Preprocessing: --- NEW FILE netcdf.spec --- Name: netcdf Version: 3.5.1 Release: 0.fdr.8 Epoch: 0 Summary: Libraries for the Unidata network Common Data Form (NetCDF) Group: Applications/Engineering License: NetCDF URL: http://my.unidata.ucar.edu/content/software/netcdf/index.html Source0: ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-3.5.1.tar.Z Patch0: netcdf-mandir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-g77 %description NetCDF (network Common Data Form) is an interface for array-oriented data access and a freely-distributed collection of software libraries for C, Fortran, C++, and perl that provides an implementation of the interface. The NetCDF library also defines a machine-independent format for representing scientific data. Together, the interface, library, and format support the creation, access, and sharing of scientific data. The NetCDF software was developed at the Unidata Program Center in Boulder, Colorado. NetCDF data is: o Self-Describing: A NetCDF file includes information about the data it contains. o Network-transparent: A NetCDF file is represented in a form that can be accessed by computers with different ways of storing integers, characters, and floating-point numbers. o Direct-access: A small subset of a large dataset may be accessed efficiently, without first reading through all the preceding data. o Appendable: Data can be appended to a NetCDF dataset along one dimension without copying the dataset or redefining its structure. The structure of a NetCDF dataset can be changed, though this sometimes causes the dataset to be copied. o Sharable: One writer and multiple readers may simultaneously access the same NetCDF file. %prep %setup -q %patch0 -p1 %build cd src %ifarch x86_64 mv macros.make.in OLD_macros.make.in cat OLD_macros.make.in | \ sed -e 's|exec_prefix)/lib|exec_prefix)/lib64|' > macros.make.in %endif export CPPFLAGS="-DNDEBUG -Df2cFortran -fPIC" export CFLAGS="$RPM_OPT_FLAGS -Df2cFortran -fPIC" %configure # WARNING! # The parallel build was tested and it does NOT work. # make %{?_smp_mflags} make %install rm -rf $RPM_BUILD_ROOT mkdir $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_prefix} mkdir -p $RPM_BUILD_ROOT/%{_datadir} mkdir -p $RPM_BUILD_ROOT/%{_mandir} cd src %makeinstall rm -rf $RPM_BUILD_ROOT/%{_mandir}/man3f %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc src/COPYRIGHT src/README src/COMPATIBILITY %{_bindir}/* %{_libdir}/*.a %{_includedir}/* %{_mandir}/*/* %changelog * Sun Aug 1 2004 Ed Hill - 0:3.5.1-0.fdr.8 - added -fPIC so x86_64 build works with nco package * Fri Jul 30 2004 Ed Hill - 0:3.5.1-0.fdr.7 - fix typo in the x86_64 build and now works on x86_64 * Thu Jul 15 2004 Ed Hill - 0:3.5.1-0.fdr.6 - fix license * Thu Jul 15 2004 Ed Hill - 0:3.5.1-0.fdr.5 - fix (hopefully?) x86_64 /usr/lib64 handling * Thu Jul 15 2004 Ed Hill - 0:3.5.1-0.fdr.4 - replace paths with macros * Thu Jul 15 2004 Ed Hill - 0:3.5.1-0.fdr.3 - fix spelling * Thu Jul 15 2004 Ed Hill - 0:3.5.1-0.fdr.2 - removed "--prefix=/usr" from %configure * Wed Jul 14 2004 Ed Hill - 0:3.5.1-0.fdr.1 - Remove unnecessary parts and cleanup for submission * Wed Jul 14 2004 Ed Hill - 0:3.5.1-0.fdr.0 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/netcdf/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jan 2005 09:48:37 -0000 1.1 +++ .cvsignore 14 Jan 2005 09:50:49 -0000 1.2 @@ -0,0 +1 @@ +netcdf-3.5.1.tar.Z Index: sources =================================================================== RCS file: /cvs/extras/rpms/netcdf/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jan 2005 09:48:37 -0000 1.1 +++ sources 14 Jan 2005 09:50:49 -0000 1.2 @@ -0,0 +1 @@ +52972e8765394010d2507a9a1dc02a56 netcdf-3.5.1.tar.Z From fedora-extras-commits at redhat.com Fri Jan 14 09:52:46 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:52:46 -0500 Subject: rpms/netcdf import.log,1.2,1.3 Message-ID: <200501140952.j0E9qk2c025468@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/netcdf In directory cvs.fedora.redhat.com:/tmp/cvs-serv25459 Modified Files: import.log Log Message: auto-import netcdf-3.6.0-0.2.beta6 on branch devel from netcdf-3.6.0-0.2.beta6.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/netcdf/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 14 Jan 2005 09:50:48 -0000 1.2 +++ import.log 14 Jan 2005 09:52:44 -0000 1.3 @@ -1 +1,2 @@ netcdf-3_5_1-0_fdr_8:HEAD:netcdf-3.5.1-0.fdr.8.src.rpm:1105696292 +netcdf-3_6_0-0_2_beta6:HEAD:netcdf-3.6.0-0.2.beta6.src.rpm:1105696408 From fedora-extras-commits at redhat.com Fri Jan 14 09:52:46 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 04:52:46 -0500 Subject: rpms/netcdf/devel .cvsignore, 1.2, 1.3 netcdf.spec, 1.1, 1.2 sources, 1.2, 1.3 netcdf-mandir.patch, 1.1, NONE Message-ID: <200501140952.j0E9qkCN025472@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/netcdf/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25459/devel Modified Files: .cvsignore netcdf.spec sources Removed Files: netcdf-mandir.patch Log Message: auto-import netcdf-3.6.0-0.2.beta6 on branch devel from netcdf-3.6.0-0.2.beta6.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/netcdf/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Jan 2005 09:50:49 -0000 1.2 +++ .cvsignore 14 Jan 2005 09:52:44 -0000 1.3 @@ -1 +1 @@ -netcdf-3.5.1.tar.Z +netcdf-3_6_0-beta6.tar.gz Index: netcdf.spec =================================================================== RCS file: /cvs/extras/rpms/netcdf/devel/netcdf.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- netcdf.spec 14 Jan 2005 09:50:49 -0000 1.1 +++ netcdf.spec 14 Jan 2005 09:52:44 -0000 1.2 @@ -1,28 +1,31 @@ Name: netcdf -Version: 3.5.1 -Release: 0.fdr.8 +Version: 3.6.0 +Release: 0.2.beta6 Epoch: 0 -Summary: Libraries for the Unidata network Common Data Form (NetCDF) +Summary: Libraries for the Unidata network Common Data Form (NetCDF v3) Group: Applications/Engineering License: NetCDF URL: http://my.unidata.ucar.edu/content/software/netcdf/index.html -Source0: ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-3.5.1.tar.Z -Patch0: netcdf-mandir.patch +Source0: ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-3_6_0-beta6.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-g77 +%package devel +Summary: Development files for netcdf-3 +Group: Development/Libraries +#Requires: %{name} = %{epoch}:%{version}-%{release} %description -NetCDF (network Common Data Form) is an interface for array-oriented -data access and a freely-distributed collection of software libraries -for C, Fortran, C++, and perl that provides an implementation of the -interface. The NetCDF library also defines a machine-independent -format for representing scientific data. Together, the interface, -library, and format support the creation, access, and sharing of -scientific data. The NetCDF software was developed at the Unidata -Program Center in Boulder, Colorado. +NetCDF-3 (network Common Data Form ver3) is an interface for +array-oriented data access and a freely-distributed collection of +software libraries for C, Fortran, C++, and perl that provides an +implementation of the interface. The NetCDF library also defines a +machine-independent format for representing scientific data. Together, +the interface, library, and format support the creation, access, and +sharing of scientific data. The NetCDF software was developed at the +Unidata Program Center in Boulder, Colorado. NetCDF data is: @@ -45,21 +48,25 @@ o Sharable: One writer and multiple readers may simultaneously access the same NetCDF file. +%description devel +This package contains the netCDF-3 header files, static libs, and man +pages. + %prep -%setup -q -%patch0 -p1 +cd $RPM_BUILD_DIR +rm -rf netcdf-3_6_0-beta6* +/usr/bin/gzip -dc $RPM_SOURCE_DIR/netcdf-3_6_0-beta6.tar.gz | tar -xf - +cd netcdf-3_6_0-beta6 +[ `/usr/bin/id -u` = '0' ] && /bin/chown -Rhf root . +[ `/usr/bin/id -u` = '0' ] && /bin/chgrp -Rhf root . +/bin/chmod -Rf a+rX,u+w,g-w,o-w . %build -cd src -%ifarch x86_64 - mv macros.make.in OLD_macros.make.in - cat OLD_macros.make.in | \ - sed -e 's|exec_prefix)/lib|exec_prefix)/lib64|' > macros.make.in -%endif -export CPPFLAGS="-DNDEBUG -Df2cFortran -fPIC" -export CFLAGS="$RPM_OPT_FLAGS -Df2cFortran -fPIC" +cd $RPM_BUILD_DIR/netcdf-3_6_0-beta6/src +export FC="g77" +export CPPFLAGS="-fPIC" %configure # WARNING! # The parallel build was tested and it does NOT work. @@ -69,12 +76,15 @@ %install rm -rf $RPM_BUILD_ROOT mkdir $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{_prefix} +mkdir -p $RPM_BUILD_ROOT/%{_includedir}/netcdf-3 +mkdir -p $RPM_BUILD_ROOT/%{_libdir}/netcdf-3 mkdir -p $RPM_BUILD_ROOT/%{_datadir} mkdir -p $RPM_BUILD_ROOT/%{_mandir} -cd src -%makeinstall -rm -rf $RPM_BUILD_ROOT/%{_mandir}/man3f +cd $RPM_BUILD_DIR/netcdf-3_6_0-beta6/src +%makeinstall INCDIR=${RPM_BUILD_ROOT}%{_includedir}/netcdf-3 \ + LIBDIR=${RPM_BUILD_ROOT}%{_libdir}/netcdf-3 \ + MANDIR=$RPM_BUILD_ROOT/%{_mandir} +rm -rf $RPM_BUILD_ROOT/%{_mandir}/man3f* %clean rm -rf $RPM_BUILD_ROOT @@ -82,14 +92,47 @@ %files %defattr(-,root,root,-) -%doc src/COPYRIGHT src/README src/COMPATIBILITY +%doc $RPM_BUILD_DIR/netcdf-3_6_0-beta6/src/COPYRIGHT $RPM_BUILD_DIR/netcdf-3_6_0-beta6/src/README $RPM_BUILD_DIR/netcdf-3_6_0-beta6/src/COMPATIBILITY %{_bindir}/* -%{_libdir}/*.a -%{_includedir}/* -%{_mandir}/*/* +%{_mandir}/man1/* + +%files devel +%defattr(-,root,root,-) +%{_includedir}/netcdf-3 +%{_libdir}/netcdf-3 +%{_mandir}/man3/* %changelog +* Sun Dec 12 2004 Ed Hill - 0:3.6.0-0.2.beta6 +- fix naming scheme for pre-releases (per Michael Schwendt) + +* Sat Dec 11 2004 Ed Hill - 0:3.6.0beta6-0.fdr.2 +- For Fortran, use only g77 (ignore gfortran, even if its installed) + +* Tue Dec 7 2004 Ed Hill - 0:3.6.0beta6-0.fdr.1 +- remove "BuildRequires: gcc4-gfortran" + +* Sat Dec 4 2004 Ed Hill - 0:3.6.0beta6-0.fdr.0 +- upgrade to 3.6.0beta6 +- create separate devel package that does *not* depend upon + the non-devel package and put the headers/libs in "netcdf-3" + subdirs for easy co-existance with upcoming netcdf-4 + +* Thu Dec 2 2004 Ed Hill - 0:3.5.1-0.fdr.12 +- remove unneeded %configure flags + +* Wed Dec 1 2004 Ed Hill - 0:3.5.1-0.fdr.11 +- headers in /usr/include/netcdf, libs in /usr/lib/netcdf + +* Mon Oct 4 2004 Ed Hill - 0:3.5.1-0.fdr.10 +- Put headers in their own directory but leave the libraries in the + %{_libdir} -- there are only two libs and the majority of other + "*-devel" packages follow this pattern + +* Sun Oct 3 2004 Michael Schwendt - 0:3.5.1-0.fdr.9 +- add patch to install lib and headers into own tree + * Sun Aug 1 2004 Ed Hill - 0:3.5.1-0.fdr.8 - added -fPIC so x86_64 build works with nco package Index: sources =================================================================== RCS file: /cvs/extras/rpms/netcdf/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Jan 2005 09:50:49 -0000 1.2 +++ sources 14 Jan 2005 09:52:44 -0000 1.3 @@ -1 +1 @@ -52972e8765394010d2507a9a1dc02a56 netcdf-3.5.1.tar.Z +6c914f05c3327dd91d05322b143f7e9b netcdf-3_6_0-beta6.tar.gz --- netcdf-mandir.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jan 14 10:10:05 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 05:10:05 -0500 Subject: rpms/netcdf/devel netcdf.spec,1.2,1.3 Message-ID: <200501141010.j0EAA5st026353@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/netcdf/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv26347 Modified Files: netcdf.spec Log Message: Apply fedora.us bug 1874 comment 64 Index: netcdf.spec =================================================================== RCS file: /cvs/extras/rpms/netcdf/devel/netcdf.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- netcdf.spec 14 Jan 2005 09:52:44 -0000 1.2 +++ netcdf.spec 14 Jan 2005 10:10:03 -0000 1.3 @@ -54,13 +54,7 @@ %prep -cd $RPM_BUILD_DIR -rm -rf netcdf-3_6_0-beta6* -/usr/bin/gzip -dc $RPM_SOURCE_DIR/netcdf-3_6_0-beta6.tar.gz | tar -xf - -cd netcdf-3_6_0-beta6 -[ `/usr/bin/id -u` = '0' ] && /bin/chown -Rhf root . -[ `/usr/bin/id -u` = '0' ] && /bin/chgrp -Rhf root . -/bin/chmod -Rf a+rX,u+w,g-w,o-w . +%setup -q -n netcdf-3_6_0-beta6 %build From fedora-extras-commits at redhat.com Fri Jan 14 20:00:31 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 15:00:31 -0500 Subject: rpms/bittorrent/devel bittorrent.spec,1.5,1.6 Message-ID: <200501142000.j0EK0VBm001620@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/bittorrent/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv1614 Modified Files: bittorrent.spec Log Message: Fix #143136, x86_64. Index: bittorrent.spec =================================================================== RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- bittorrent.spec 10 Dec 2004 22:03:01 -0000 1.5 +++ bittorrent.spec 14 Jan 2005 20:00:29 -0000 1.6 @@ -2,7 +2,7 @@ Name: bittorrent Version: 3.4.1 -Release: 2.a +Release: 3.a Epoch: 0 Summary: BitTorrent swarming network file transfer tool @@ -13,7 +13,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel -Requires: python, %{python_sitelib} +Requires: python +Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") + BuildArch: noarch %description @@ -79,6 +81,9 @@ %changelog +* Wed Dec 22 2004 Michael Schwendt - 0:3.4.1-3.a +- x86_64: Fix python dependency, replace with python-abi dependency. + * Mon Mar 29 2004 Marius L. J??hndal - 0:3.4.1-0.fdr.2.a - Changed Requires wxPythonGTK to wxPython (bug 1416). - Converted spec file to UTF-8. From fedora-extras-commits at redhat.com Fri Jan 14 20:15:10 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 14 Jan 2005 15:15:10 -0500 Subject: rpms/python-sqlite/devel python-sqlite.spec,1.1,1.2 Message-ID: <200501142015.j0EKFAxR002380@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/python-sqlite/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv2374 Modified Files: python-sqlite.spec Log Message: Fixes, so fedora.us #2000 can be squashed. Index: python-sqlite.spec =================================================================== RCS file: /cvs/extras/rpms/python-sqlite/devel/python-sqlite.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-sqlite.spec 31 Dec 2004 18:19:21 -0000 1.1 +++ python-sqlite.spec 14 Jan 2005 20:15:08 -0000 1.2 @@ -1,10 +1,12 @@ +%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + Name: python-sqlite Version: 0.5.0 -Release: 0.fdr.1.3 -Summary: Python bindings for sqlite. +Release: 1 +Summary: Python bindings for SQLite Group: Development/Libraries -License: GPL +License: Freely distributable URL: http://pysqlite.sf.net/ Source: http://dl.sf.net/pysqlite/pysqlite-%{version}.tar.gz @@ -14,6 +16,8 @@ BuildRequires: python-devel BuildRequires: sqlite-devel +Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") + %description This packages allows you to use sqlite with python. sqlite is a simple database engine. @@ -21,13 +25,15 @@ %prep %setup -n pysqlite rm -f doc/rest/.*swp +chmod -x doc/rest/* LICENSE README %build +%{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT -python ./setup.py install \ - --prefix="$RPM_BUILD_ROOT/%{_prefix}" +%{__python} setup.py install -O1 --skip-build \ + --root %{buildroot} --prefix="%{_prefix}" %clean rm -rf $RPM_BUILD_ROOT @@ -35,9 +41,21 @@ %files %defattr(-, root, root, 0755) %doc LICENSE README doc/ examples/ -%{_libdir}/python*/site-packages/* +%{python_sitearch}/*sqlite*.so +%dir %{python_sitearch}/sqlite +%{python_sitearch}/sqlite/*.py +%{python_sitearch}/sqlite/*.pyc +%ghost %{python_sitearch}/sqlite/*.pyo %changelog +* Tue Dec 28 2004 Michael Schwendt - 0.5.0-1 +- Fix build: install into arch-dependent python sitelib, + compile without including buildroot paths, build and ghost + optimized files. +- Add python-abi dependency. +- Fix licence and %%doc permissions. +- Bump release, drop 0.fdr. prefix. + * Thu Sep 02 2004 Thomas Vander Stichele - 0.5.0-0.fdr.1 - package copied from Dag From wtogami at redhat.com Sat Jan 15 08:14:08 2005 From: wtogami at redhat.com (Warren Togami) Date: Fri, 14 Jan 2005 22:14:08 -1000 Subject: APPROVED: abcde, cd-discid, convmv Message-ID: <41E8D0D0.8020006@redhat.com> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 abcde cd-discid convmv Pass my inspection and approved for adding to Fedora Extras. nphilipp at redhat.com will be responsible for these packages. PUBLISH APPROVED by wtogami at redhat.com on Fri Jan 14th, 2004 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) iD4DBQFB6NBEa93+jlSirPERAuXXAJi8yAWVIAMWKKtc4xR+/BWiz1xzAJ4ogu3G UViwpWtrqtTFphTS4LFc3Q== =K5L5 -----END PGP SIGNATURE----- From fedora-extras-commits at redhat.com Sat Jan 15 08:16:29 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:16:29 -0500 Subject: rpms/abcde - New directory Message-ID: <200501150816.j0F8GTFv017021@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/abcde In directory cvs.fedora.redhat.com:/tmp/cvs-serv17006/abcde Log Message: Directory /cvs/extras/rpms/abcde added to the repository From fedora-extras-commits at redhat.com Sat Jan 15 08:16:29 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:16:29 -0500 Subject: rpms/abcde/devel - New directory Message-ID: <200501150816.j0F8GTsw017024@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/abcde/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17006/abcde/devel Log Message: Directory /cvs/extras/rpms/abcde/devel added to the repository From fedora-extras-commits at redhat.com Sat Jan 15 08:16:46 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:16:46 -0500 Subject: rpms/abcde Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501150816.j0F8GkkK017105@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/abcde In directory cvs.fedora.redhat.com:/tmp/cvs-serv17090 Added Files: Makefile import.log Log Message: Setup of module abcde --- NEW FILE Makefile --- # Top level Makefile for module abcde all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 15 08:16:46 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:16:46 -0500 Subject: rpms/abcde/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501150816.j0F8Gk2H017108@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/abcde/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17090/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module abcde --- NEW 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 Jan 15 08:17:26 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:17:26 -0500 Subject: rpms/abcde import.log,1.1,1.2 Message-ID: <200501150817.j0F8HQov017293@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/abcde In directory cvs.fedora.redhat.com:/tmp/cvs-serv17278 Modified Files: import.log Log Message: auto-import abcde-2.2.0-1 on branch devel from abcde-2.2.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/abcde/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 Jan 2005 08:16:44 -0000 1.1 +++ import.log 15 Jan 2005 08:17:24 -0000 1.2 @@ -0,0 +1 @@ +abcde-2_2_0-1:HEAD:abcde-2.2.0-1.src.rpm:1105777038 From fedora-extras-commits at redhat.com Sat Jan 15 08:17:26 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:17:26 -0500 Subject: rpms/abcde/devel abcde-2.1.19-genre.patch, NONE, 1.1 abcde-2.1.19-inst.patch, NONE, 1.1 abcde-2.1.19-vi.patch, NONE, 1.1 abcde.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501150817.j0F8HQX2017297@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/abcde/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17278/devel Modified Files: .cvsignore sources Added Files: abcde-2.1.19-genre.patch abcde-2.1.19-inst.patch abcde-2.1.19-vi.patch abcde.spec Log Message: auto-import abcde-2.2.0-1 on branch devel from abcde-2.2.0-1.src.rpm abcde-2.1.19-genre.patch: --- NEW FILE abcde-2.1.19-genre.patch --- --- abcde-2.1.19/cddb-tool.genre 2003-12-06 22:28:53.000000000 +0100 +++ abcde-2.1.19/cddb-tool 2004-04-14 13:08:37.901055971 +0200 @@ -122,7 +122,7 @@ DARTISTALBUM=$(grep ^DTITLE= "$CDDBFILE" | cut -f2- -d= | tr -d \\n | sed 's- / -~-g' | tr -d \[:cntrl:\]) DARTIST=$(echo "$DARTISTALBUM" | cut -f1 -d~ | sed 's,\\,\\\\,g;s,\([\"\$\`]\),\\\1,g' | tr -d \[:cntrl:\]) DALBUM=$(echo "$DARTISTALBUM" | cut -f2 -d~ | sed 's,\\,\\\\,g;s,\([\"\$\`]\),\\\1,g' | tr -d \[:cntrl:\]) - CDDBGENRE=$(grep '^#CATEGORY=' "$CDDBFILE" | cut -f2- -d=) + CDDBGENRE=$(grep '^#CATEGORY=' "$CDDBFILE" | cut -f2- -d= | tr -d \[:cntrl:\]) if grep "^DYEAR" "$CDDBFILE" 2>&1 > /dev/null ; then CDYEAR=$(grep "^DYEAR" "$CDDBFILE" | cut -f2- -d= | tr -d \[:cntrl:\]) elif grep YEAR "$CDDBFILE" 2>&1 > /dev/null ; then @@ -192,7 +192,7 @@ FILE="$1" ADDRESS="$2" DISCID=$(grep ^DISCID= "$FILE" | cut -f2 -d= | tr -d \[:cntrl:\]) - CDDBGENRE=$(grep '^#CATEGORY=' "$FILE" | cut -f2- -d=) + CDDBGENRE=$(grep '^#CATEGORY=' "$FILE" | cut -f2- -d= | tr -d \[:cntrl:\]) grep -v "^#CATEGORY=" "$FILE" | mail -s "cddb $CDDBGENRE $DISCID" "$ADDRESS" ;; abcde-2.1.19-inst.patch: --- NEW FILE abcde-2.1.19-inst.patch --- --- abcde-2.1.19/Makefile.inst 2004-04-09 20:12:15.000000000 +0200 +++ abcde-2.1.19/Makefile 2004-04-14 13:06:31.680708323 +0200 @@ -14,13 +14,13 @@ install: $(INSTALL) -d -m 755 $(bindir) - $(INSTALL) -m 755 -o 0 abcde $(bindir) - $(INSTALL) -m 755 -o 0 cddb-tool $(bindir) + $(INSTALL) -m 755 abcde $(bindir) + $(INSTALL) -m 755 cddb-tool $(bindir) $(INSTALL) -d -m 755 $(mandir) - $(INSTALL) -m 644 -o 0 abcde.1 $(mandir) - $(INSTALL) -m 644 -o 0 cddb-tool.1 $(mandir) + $(INSTALL) -m 644 abcde.1 $(mandir) + $(INSTALL) -m 644 cddb-tool.1 $(mandir) $(INSTALL) -d -m 755 $(etcdir) - $(INSTALL) -m 644 -o 0 abcde.conf $(etcdir) + $(INSTALL) -m 644 abcde.conf $(etcdir) tarball: @cd .. && tar czvf abcde_$(VERSION).orig.tar.gz \ abcde-2.1.19-vi.patch: --- NEW FILE abcde-2.1.19-vi.patch --- --- abcde-2.1.19/abcde.vi 2004-04-09 20:12:15.000000000 +0200 +++ abcde-2.1.19/abcde 2004-04-14 13:03:40.296108335 +0200 @@ -1270,8 +1270,12 @@ eval $(echo "$EDITOR") "$CDDBDATA" fi # If that fails, check for a vi + elif [ -x /usr/bin/vim ]; then + /usr/bin/vim "$CDDBDATA" elif [ -x /usr/bin/vi ]; then /usr/bin/vi "$CDDBDATA" + elif [ -x /bin/vi ]; then + /bin/vi "$CDDBDATA" # nano should be on all (modern, i.e., sarge) debian systems elif [ -x /usr/bin/nano ]; then /usr/bin/nano "$CDDBDATA" --- NEW FILE abcde.spec --- Summary: A Better CD Encoder Name: abcde Version: 2.2.0 Release: 1 License: GPL & Artistic Group: Applications/Multimedia Source: http://www.hispalinux.es/~data/files/abcde_%{version}.orig.tar.gz Patch0: abcde-2.1.19-vi.patch Patch1: abcde-2.1.19-inst.patch Patch2: abcde-2.1.19-genre.patch URL: http://www.hispalinux.es/~data/abcde.php BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: cd-discid %description abcde is a frontend command-line utility (actually, a shell script) that grabs tracks off a CD, encodes them to ogg or mp3 format, and tags them, all in one go. %prep %setup -q %patch0 -p1 -b .vi %patch1 -p1 -b .inst %patch2 -p1 -b .genre %install rm -rf $RPM_BUILD_ROOT %makeinstall etcdir=$RPM_BUILD_ROOT%{_sysconfdir} mandir=$RPM_BUILD_ROOT%{_mandir}/man1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr (-, root, root, -) %doc changelog COPYING README TODO %config(noreplace) %{_sysconfdir}/abcde.conf %{_bindir}/* %{_mandir}/man1/* %changelog * Fri Jan 14 2005 Nils Philippsen - version 2.2.0 * Wed Apr 14 2004 Nils Philippsen - version 2.1.19 * Tue May 21 2002 Nils Philippsen - version 2.0.3 - update rh, genre patches * Wed Apr 25 2001 Nils Philippsen - version 1.9.9 - configuration now uses freedb.org per default, no need to patch - various artist media can have a different output file name (than single artist ones) - fix newlines with CR in parsing cddb genre * Tue Jan 09 2001 Nils Philippsen - version 1.9.7 - initial build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcde/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Jan 2005 08:16:44 -0000 1.1 +++ .cvsignore 15 Jan 2005 08:17:24 -0000 1.2 @@ -0,0 +1 @@ +abcde_2.2.0.orig.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcde/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Jan 2005 08:16:44 -0000 1.1 +++ sources 15 Jan 2005 08:17:24 -0000 1.2 @@ -0,0 +1 @@ +e21dd33ab3b4eca6758976120d8a4f22 abcde_2.2.0.orig.tar.gz From fedora-extras-commits at redhat.com Sat Jan 15 08:18:34 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:18:34 -0500 Subject: rpms/cd-discid - New directory Message-ID: <200501150818.j0F8IYsb017481@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/cd-discid In directory cvs.fedora.redhat.com:/tmp/cvs-serv17468/cd-discid Log Message: Directory /cvs/extras/rpms/cd-discid added to the repository From fedora-extras-commits at redhat.com Sat Jan 15 08:18:34 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:18:34 -0500 Subject: rpms/cd-discid/devel - New directory Message-ID: <200501150818.j0F8IYp2017484@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/cd-discid/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17468/cd-discid/devel Log Message: Directory /cvs/extras/rpms/cd-discid/devel added to the repository From fedora-extras-commits at redhat.com Sat Jan 15 08:18:51 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:18:51 -0500 Subject: rpms/cd-discid Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501150818.j0F8IpmZ017563@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/cd-discid In directory cvs.fedora.redhat.com:/tmp/cvs-serv17548 Added Files: Makefile import.log Log Message: Setup of module cd-discid --- NEW FILE Makefile --- # Top level Makefile for module cd-discid all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 15 08:18:51 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:18:51 -0500 Subject: rpms/cd-discid/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501150818.j0F8IpsM017566@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/cd-discid/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17548/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module cd-discid --- NEW 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 Jan 15 08:19:22 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:19:22 -0500 Subject: rpms/cd-discid import.log,1.1,1.2 Message-ID: <200501150819.j0F8JMew017698@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/cd-discid In directory cvs.fedora.redhat.com:/tmp/cvs-serv17682 Modified Files: import.log Log Message: auto-import cd-discid-0.9-1 on branch devel from cd-discid-0.9-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/cd-discid/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 Jan 2005 08:18:49 -0000 1.1 +++ import.log 15 Jan 2005 08:19:20 -0000 1.2 @@ -0,0 +1 @@ +cd-discid-0_9-1:HEAD:cd-discid-0.9-1.src.rpm:1105777154 From fedora-extras-commits at redhat.com Sat Jan 15 08:19:22 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:19:22 -0500 Subject: rpms/cd-discid/devel cd-discid.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501150819.j0F8JMUi017701@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/cd-discid/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17682/devel Modified Files: .cvsignore sources Added Files: cd-discid.spec Log Message: auto-import cd-discid-0.9-1 on branch devel from cd-discid-0.9-1.src.rpm --- NEW FILE cd-discid.spec --- Summary: utility to get CDDB discid information Name: cd-discid Version: 0.9 Release: 1 Group: Applications/Multimedia License: GPL Source: http://www.hispalinux.es/~data/files/cd-discid/cd-discid_%{version}.orig.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %description cd-discid is a backend utility to get CDDB discid information from a CD-ROM disc. It was originally designed for cdgrab, but can be used for any purpose requiring CDDB data. %prep %setup -q %build make cd-discid %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} install -m 0755 cd-discid $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 install -m 0444 cd-discid $RPM_BUILD_ROOT%{_mandir}/man1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr (-, root, root) %doc changelog COPYING README %{_bindir}/* %{_mandir}/man1/* %changelog * Wed Apr 14 2004 Nils Philippsen - version 0.9 * Tue May 21 2002 Nils Philippsen - version 0.7 * Wed Apr 25 2001 Nils Philippsen - version 0.6 * Tue Jan 09 2001 Nils Philippsen - version 0.4 - initial build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cd-discid/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Jan 2005 08:18:49 -0000 1.1 +++ .cvsignore 15 Jan 2005 08:19:20 -0000 1.2 @@ -0,0 +1 @@ +cd-discid_0.9.orig.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/cd-discid/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Jan 2005 08:18:49 -0000 1.1 +++ sources 15 Jan 2005 08:19:20 -0000 1.2 @@ -0,0 +1 @@ +64677b8b63d1db0db015043f5455171a cd-discid_0.9.orig.tar.gz From fedora-extras-commits at redhat.com Sat Jan 15 08:20:12 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:20:12 -0500 Subject: rpms/convmv - New directory Message-ID: <200501150820.j0F8KCV6017865@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/convmv In directory cvs.fedora.redhat.com:/tmp/cvs-serv17852/convmv Log Message: Directory /cvs/extras/rpms/convmv added to the repository From fedora-extras-commits at redhat.com Sat Jan 15 08:20:12 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:20:12 -0500 Subject: rpms/convmv/devel - New directory Message-ID: <200501150820.j0F8KCQv017868@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/convmv/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17852/convmv/devel Log Message: Directory /cvs/extras/rpms/convmv/devel added to the repository From fedora-extras-commits at redhat.com Sat Jan 15 08:20:29 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:20:29 -0500 Subject: rpms/convmv Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501150820.j0F8KTeO017945@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/convmv In directory cvs.fedora.redhat.com:/tmp/cvs-serv17930 Added Files: Makefile import.log Log Message: Setup of module convmv --- NEW FILE Makefile --- # Top level Makefile for module convmv all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 15 08:20:29 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:20:29 -0500 Subject: rpms/convmv/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501150820.j0F8KTvr017948@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/convmv/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17930/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module convmv --- NEW 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 Jan 15 08:20:57 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:20:57 -0500 Subject: rpms/convmv import.log,1.1,1.2 Message-ID: <200501150820.j0F8Kvhn018077@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/convmv In directory cvs.fedora.redhat.com:/tmp/cvs-serv18062 Modified Files: import.log Log Message: auto-import convmv-1.08-1 on branch devel from convmv-1.08-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/convmv/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 Jan 2005 08:20:27 -0000 1.1 +++ import.log 15 Jan 2005 08:20:55 -0000 1.2 @@ -0,0 +1 @@ +convmv-1_08-1:HEAD:convmv-1.08-1.src.rpm:1105777250 From fedora-extras-commits at redhat.com Sat Jan 15 08:20:57 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 03:20:57 -0500 Subject: rpms/convmv/devel convmv.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501150820.j0F8Kv5H018081@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/convmv/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv18062/devel Modified Files: .cvsignore sources Added Files: convmv.spec Log Message: auto-import convmv-1.08-1 on branch devel from convmv-1.08-1.src.rpm --- NEW FILE convmv.spec --- Summary: Convert filename encodings. Name: convmv Version: 1.08 Release: 1 Group: Applications/System License: GPL URL: http://j3e.de/linux/convmv Source: http://j3e.de/linux/convmv/convmv-%{version}.tar.gz BuildRequires: /usr/bin/md5sum BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %description This package contains the tool convmv with which you can convert the encodings of filenames, e.g. from Latin1 to UTF-8. %prep %setup -q %build md5sum -c MD5sums make PREFIX=%{_prefix} make test %install rm -rf %{buildroot} make PREFIX=%{_prefix} DESTDIR=%{buildroot} install %clean rm -rf %{buildroot} %files %defattr(-, root, root) %doc CREDITS Changes GPL2 TODO testsuite.tar %{_bindir}/convmv %{_mandir}/man*/* %changelog * Fri Jan 14 2005 Nils Philippsen - version 1.08 * Sat Feb 07 2004 Nils Philippsen - version 1.07 - initial build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/convmv/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Jan 2005 08:20:27 -0000 1.1 +++ .cvsignore 15 Jan 2005 08:20:55 -0000 1.2 @@ -0,0 +1 @@ +convmv-1.08.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/convmv/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Jan 2005 08:20:27 -0000 1.1 +++ sources 15 Jan 2005 08:20:55 -0000 1.2 @@ -0,0 +1 @@ +40707f82b1a9631fe715f68f94431d3a convmv-1.08.tar.gz From fedora-extras-commits at redhat.com Sat Jan 15 09:22:42 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 15 Jan 2005 04:22:42 -0500 Subject: rpms/convmv/devel convmv.spec,1.1,1.2 Message-ID: <200501150922.j0F9MgCQ019748@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/convmv/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv19735 Modified Files: convmv.spec Log Message: remove testsuite.tar from doc Index: convmv.spec =================================================================== RCS file: /cvs/extras/rpms/convmv/devel/convmv.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- convmv.spec 15 Jan 2005 08:20:55 -0000 1.1 +++ convmv.spec 15 Jan 2005 09:22:40 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Convert filename encodings. Name: convmv Version: 1.08 -Release: 1 +Release: 2 Group: Applications/System License: GPL URL: http://j3e.de/linux/convmv @@ -31,11 +31,14 @@ %files %defattr(-, root, root) -%doc CREDITS Changes GPL2 TODO testsuite.tar +%doc CREDITS Changes GPL2 TODO %{_bindir}/convmv %{_mandir}/man*/* %changelog +* Fri Jan 14 2005 Warren Togami +- remove testsuite.tar from doc + * Fri Jan 14 2005 Nils Philippsen - version 1.08 From fedora-extras-commits at redhat.com Sat Jan 15 09:42:45 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 15 Jan 2005 04:42:45 -0500 Subject: rpms/grisbi import.log,1.2,1.3 Message-ID: <200501150942.j0F9gjbL019884@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/grisbi In directory cvs.fedora.redhat.com:/tmp/cvs-serv19875 Modified Files: import.log Log Message: auto-import grisbi-0.5.5-0.fdr.1.2 on branch FC-2 from grisbi-0.5.5-0.fdr.1.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/grisbi/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 8 Nov 2004 04:30:07 -0000 1.2 +++ import.log 15 Jan 2005 09:42:43 -0000 1.3 @@ -1 +1,2 @@ grisbi-0_5_0-0_fdr_3_2:HEAD:grisbi-0.5.0-0.fdr.3.2.src.rpm:1099888207 +grisbi-0_5_5-0_fdr_1_2:FC-2:grisbi-0.5.5-0.fdr.1.2.src.rpm:1105782157 From fedora-extras-commits at redhat.com Sat Jan 15 09:42:45 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 15 Jan 2005 04:42:45 -0500 Subject: rpms/grisbi/FC-2 grisbi-0.5.5-htmlview.diff, NONE, 1.1 .cvsignore, 1.2, 1.3 grisbi.desktop, 1.1, 1.2 grisbi.spec, 1.1, 1.2 sources, 1.2, 1.3 grisbi-0.5-htmlview.patch, 1.1, NONE Message-ID: <200501150942.j0F9gjRp019888@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/grisbi/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv19875/FC-2 Modified Files: .cvsignore grisbi.desktop grisbi.spec sources Added Files: grisbi-0.5.5-htmlview.diff Removed Files: grisbi-0.5-htmlview.patch Log Message: auto-import grisbi-0.5.5-0.fdr.1.2 on branch FC-2 from grisbi-0.5.5-0.fdr.1.2.src.rpm grisbi-0.5.5-htmlview.diff: --- NEW FILE grisbi-0.5.5-htmlview.diff --- --- src/constants.h.old 2004-11-26 11:48:47.000000000 +0100 +++ src/constants.h 2004-11-27 16:55:59.067842048 +0100 @@ -112,6 +112,6 @@ #endif /* quelques chaines de configuration*/ -#define ETAT_WWW_BROWSER "mozilla" +#define ETAT_WWW_BROWSER "htmlview" #endif // !_CONSTANTS_H Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/grisbi/FC-2/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:30:07 -0000 1.2 +++ .cvsignore 15 Jan 2005 09:42:43 -0000 1.3 @@ -1 +1 @@ -grisbi-0.5.0.tar.bz2 +grisbi-0.5.5.tar.bz2 Index: grisbi.desktop =================================================================== RCS file: /cvs/extras/rpms/grisbi/FC-2/grisbi.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- grisbi.desktop 8 Nov 2004 04:30:07 -0000 1.1 +++ grisbi.desktop 15 Jan 2005 09:42:43 -0000 1.2 @@ -1,6 +1,10 @@ [Desktop Entry] Name=Grisbi Comment=Personal finances manager +Comment[fr]=Gestionnaire de finances personnelles +Comment[br]=Program a gonterezh an ti +Comment[hu]=Szem??lyi p??nz??gyi menedzser +Comment[it]=Software di contabilit?? personale Exec=grisbi Icon=grisbi.png Terminal=false Index: grisbi.spec =================================================================== RCS file: /cvs/extras/rpms/grisbi/FC-2/grisbi.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- grisbi.spec 8 Nov 2004 04:30:07 -0000 1.1 +++ grisbi.spec 15 Jan 2005 09:42:43 -0000 1.2 @@ -1,22 +1,23 @@ +%define GRISBI_HELP_DIR %{_datadir}/doc/%{name}/help Name: grisbi -Version: 0.5.0 -Release: 0.fdr.3.2 -Epoch: 0 +Version: 0.5.5 +Release: 0.fdr.1.2 +Epoch: 0 Summary: Personal finances manager Group: Applications/Productivity License: GPL Url: http://www.grisbi.org -Source0: http://dl.sf.net/grisbi/grisbi-0.5.0.tar.bz2 -Source1: grisbi.desktop -Patch0: grisbi-0.5-htmlview.patch +Source0: http://dl.sf.net/grisbi/%{name}-%{version}.tar.bz2 +Source1: %{name}.desktop +Patch0: %{name}-%{version}-htmlview.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel, libxml2-devel, glib2-devel, gettext -BuildRequires: desktop-file-utils, libofx-devel -Requires: htmlview +BuildRequires: desktop-file-utils, libofx-devel +Requires: htmlview # for report generation -Requires: tetex-unicode, tetex-dvips +Requires: tetex-unicode, tetex-dvips %description Grisbi is a very functional personal financial management program @@ -32,7 +33,7 @@ %prep %setup -q -%patch0 -p0 -b .htmlview +%patch0 %build %configure @@ -42,6 +43,12 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +for lang in C de fr +do + mv $RPM_BUILD_ROOT%{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.html $RPM_BUILD_ROOT%{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.bin.html + touch $RPM_BUILD_ROOT%{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.html +done + mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -54,6 +61,22 @@ %find_lang %{name} +%post +if [ $1 -eq 1 ] ; then + for lang in C de fr + do + alternatives --install %{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.html grisbi-manuel-${lang} %{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.bin.html 10 || : + done +fi + +%postun +if [ $1 -eq 0 ] ; then + for lang in C de fr + do + alternatives --remove grisbi-manuel-${lang} %{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.bin.html || : + done +fi + %clean rm -rf $RPM_BUILD_ROOT @@ -61,20 +84,63 @@ %defattr(644,root,root,755) %doc AUTHORS COPYING NEWS OLDNEWS README ABOUT-NLS %attr(755,root,root) %{_bindir}/* -%{_datadir}/applications/*.desktop -%{_datadir}/doc/grisbi -%{_datadir}/mime-info/%name.* +%{_datadir}/applications/* +%{_datadir}/mime-info/%{name}.* %{_datadir}/pixmaps/* +%dir %{_datadir}/doc/%{name} +%dir %{_datadir}/doc/%{name}/help +%dir %{_datadir}/doc/%{name}/help/C +%dir %{_datadir}/doc/%{name}/help/de +%dir %{_datadir}/doc/%{name}/help/fr +%{_datadir}/doc/%{name}/help/C/*.gif +%{_datadir}/doc/%{name}/help/C/grisbi-manuel.bin.html +%{_datadir}/doc/%{name}/help/C/quickstart.html +%{_datadir}/doc/%{name}/help/C/translation.html +%{_datadir}/doc/%{name}/help/C/topic.dat +%{_datadir}/doc/%{name}/help/de/*.gif +%{_datadir}/doc/%{name}/help/de/grisbi-manuel.bin.html +%{_datadir}/doc/%{name}/help/de/quickstart.html +%{_datadir}/doc/%{name}/help/de/translation.html +%{_datadir}/doc/%{name}/help/de/topic.dat +%{_datadir}/doc/%{name}/help/fr/*.gif +%{_datadir}/doc/%{name}/help/fr/grisbi-manuel.bin.html +%{_datadir}/doc/%{name}/help/fr/quickstart.html +%{_datadir}/doc/%{name}/help/fr/translation.html +%{_datadir}/doc/%{name}/help/fr/topic.dat %{_mandir}/man1/* +%ghost %{_datadir}/doc/%{name}/help/C/grisbi-manuel.html +%ghost %{_datadir}/doc/%{name}/help/de/grisbi-manuel.html +%ghost %{_datadir}/doc/%{name}/help/fr/grisbi-manuel.html %changelog +* Mon Jan 10 2005 Alain Portal 0:0.5.5-0.fdr.1 + - New version + - Fix alternatives setup +* Sat Nov 27 2004 Alain Portal 0:0.5.3-0.fdr.1 + - New version +* Tue Nov 2 2004 Alain Portal 0:0.5.2-0.fdr.4 + - Rename htmlview patch + - Force scriplet to return 0 +* Fri Oct 29 2004 Alain Portal 0:0.5.2-0.fdr.3 + - Patch to fix bugs #468, #470 +* Fri Oct 22 2004 Alain Portal 0:0.5.2-0.fdr.2 + - %{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.html should be owned by the + package. + - Improve %post and %postun scripts depends upon whe are installing or + upgrading. +* Fri Oct 15 2004 Alain Portal 0:0.5.2-0.fdr.1 + - New version +* Wed Sep 15 2004 Alain Portal 0:0.5.1-0.fdr.2 + - Use "alternatives" to manage separate documentation package +* Sat Jul 31 2004 Alain Portal 0:0.5.1-0.fdr.1 + - New version + - Patches to fix some compilation warnings + - Add %post and %preun scripts to manage separate documentation package * Fri Jul 23 2004 Aurelien Bompard 0:0.5.0-0.fdr.3 -- Fix typo in summary -- Change category to "Office" -- Change Terminal=0 to Terminal=false in desktop file - + - Fix typo in summary + - Change category to "Office" + - Change Terminal=0 to Terminal=false in desktop file * Tue Jun 01 2004 Aurelien Bompard 0:0.5.0-0.fdr.2 -- BR: libofx-devel to enable OFX import - + - BR: libofx-devel to enable OFX import * Mon May 31 2004 Aurelien Bompard 0:0.5.0-0.fdr.1 -- Initial Fedora RPM + - Initial Fedora RPM Index: sources =================================================================== RCS file: /cvs/extras/rpms/grisbi/FC-2/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:30:07 -0000 1.2 +++ sources 15 Jan 2005 09:42:43 -0000 1.3 @@ -1 +1 @@ -ceccf6799317686fe53f61730241f7e1 grisbi-0.5.0.tar.bz2 +09b06382f9bb5a4124c40296c5eba6d5 grisbi-0.5.5.tar.bz2 --- grisbi-0.5-htmlview.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jan 15 09:44:38 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 15 Jan 2005 04:44:38 -0500 Subject: rpms/grisbi import.log,1.3,1.4 Message-ID: <200501150944.j0F9ic4v020021@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/grisbi In directory cvs.fedora.redhat.com:/tmp/cvs-serv20012 Modified Files: import.log Log Message: auto-import grisbi-0.5.5-1 on branch devel from grisbi-0.5.5-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/grisbi/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 15 Jan 2005 09:42:43 -0000 1.3 +++ import.log 15 Jan 2005 09:44:36 -0000 1.4 @@ -1,2 +1,3 @@ grisbi-0_5_0-0_fdr_3_2:HEAD:grisbi-0.5.0-0.fdr.3.2.src.rpm:1099888207 grisbi-0_5_5-0_fdr_1_2:FC-2:grisbi-0.5.5-0.fdr.1.2.src.rpm:1105782157 +grisbi-0_5_5-1:HEAD:grisbi-0.5.5-1.src.rpm:1105782268 From fedora-extras-commits at redhat.com Sat Jan 15 09:44:38 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 15 Jan 2005 04:44:38 -0500 Subject: rpms/grisbi/devel grisbi-0.5.5-htmlview.diff, NONE, 1.1 .cvsignore, 1.3, 1.4 grisbi.spec, 1.2, 1.3 sources, 1.3, 1.4 constants.h.htmlview, 1.1, NONE grisbi-0.5.2-20041029-etats_calculs.c.diff, 1.1, NONE grisbi-0.5.2-20041029-operations_liste.c.diff, 1.1, NONE Message-ID: <200501150944.j0F9icY0020025@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/grisbi/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv20012/devel Modified Files: .cvsignore grisbi.spec sources Added Files: grisbi-0.5.5-htmlview.diff Removed Files: constants.h.htmlview grisbi-0.5.2-20041029-etats_calculs.c.diff grisbi-0.5.2-20041029-operations_liste.c.diff Log Message: auto-import grisbi-0.5.5-1 on branch devel from grisbi-0.5.5-1.src.rpm grisbi-0.5.5-htmlview.diff: --- NEW FILE grisbi-0.5.5-htmlview.diff --- --- src/constants.h.old 2004-11-26 11:48:47.000000000 +0100 +++ src/constants.h 2004-11-27 16:55:59.067842048 +0100 @@ -112,6 +112,6 @@ #endif /* quelques chaines de configuration*/ -#define ETAT_WWW_BROWSER "mozilla" +#define ETAT_WWW_BROWSER "htmlview" #endif // !_CONSTANTS_H Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/grisbi/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 25 Nov 2004 05:45:52 -0000 1.3 +++ .cvsignore 15 Jan 2005 09:44:36 -0000 1.4 @@ -1 +1 @@ -grisbi-0.5.2.tar.bz2 +grisbi-0.5.5.tar.bz2 Index: grisbi.spec =================================================================== RCS file: /cvs/extras/rpms/grisbi/devel/grisbi.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- grisbi.spec 25 Nov 2004 05:45:52 -0000 1.2 +++ grisbi.spec 15 Jan 2005 09:44:36 -0000 1.3 @@ -1,7 +1,7 @@ %define GRISBI_HELP_DIR %{_datadir}/doc/%{name}/help Name: grisbi -Version: 0.5.2 -Release: 4 +Version: 0.5.5 +Release: 1 Epoch: 0 Summary: Personal finances manager @@ -10,9 +10,7 @@ Url: http://www.grisbi.org Source0: http://dl.sf.net/grisbi/%{name}-%{version}.tar.bz2 Source1: %{name}.desktop -Patch0: constants.h.htmlview -Patch1: %{name}-%{version}-20041029-etats_calculs.c.diff -Patch2: %{name}-%{version}-20041029-operations_liste.c.diff +Patch0: %{name}-%{version}-htmlview.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel, libxml2-devel, glib2-devel, gettext @@ -36,8 +34,6 @@ %prep %setup -q %patch0 -%patch1 -p1 -%patch2 -p1 %build %configure @@ -47,7 +43,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -for lang in C fr +for lang in C de fr do mv $RPM_BUILD_ROOT%{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.html $RPM_BUILD_ROOT%{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.bin.html touch $RPM_BUILD_ROOT%{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.html @@ -67,14 +63,18 @@ %post if [ $1 -eq 1 ] ; then - alternatives --install %{GRISBI_HELP_DIR}/fr/grisbi-manuel.html grisbi-manuel-fr %{GRISBI_HELP_DIR}/fr/grisbi-manuel.bin.html 10 - alternatives --install %{GRISBI_HELP_DIR}/C/grisbi-manuel.html grisbi-manuel %{GRISBI_HELP_DIR}/C/grisbi-manuel.bin.html 10 + for lang in C de fr + do + alternatives --install %{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.html grisbi-manuel-${lang} %{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.bin.html 10 || : + done fi %postun if [ $1 -eq 0 ] ; then - alternatives --remove grisbi-manuel %{GRISBI_HELP_DIR}/C/grisbi-manuel.bin.html - alternatives --remove grisbi-manuel-fr %{GRISBI_HELP_DIR}/fr/grisbi-manuel.bin.html + for lang in C de fr + do + alternatives --remove grisbi-manuel-${lang} %{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.bin.html || : + done fi %clean @@ -89,50 +89,58 @@ %{_datadir}/pixmaps/* %dir %{_datadir}/doc/%{name} %dir %{_datadir}/doc/%{name}/help -%dir %{_datadir}/doc/%{name}/help/fr %dir %{_datadir}/doc/%{name}/help/C -%{_datadir}/doc/%{name}/help/fr/*.gif -%{_datadir}/doc/%{name}/help/fr/grisbi-manuel.bin.html -%{_datadir}/doc/%{name}/help/fr/quickstart.html -%{_datadir}/doc/%{name}/help/fr/translation.html -%{_datadir}/doc/%{name}/help/fr/topic.dat +%dir %{_datadir}/doc/%{name}/help/de +%dir %{_datadir}/doc/%{name}/help/fr %{_datadir}/doc/%{name}/help/C/*.gif %{_datadir}/doc/%{name}/help/C/grisbi-manuel.bin.html %{_datadir}/doc/%{name}/help/C/quickstart.html %{_datadir}/doc/%{name}/help/C/translation.html %{_datadir}/doc/%{name}/help/C/topic.dat +%{_datadir}/doc/%{name}/help/de/*.gif +%{_datadir}/doc/%{name}/help/de/grisbi-manuel.bin.html +%{_datadir}/doc/%{name}/help/de/quickstart.html +%{_datadir}/doc/%{name}/help/de/translation.html +%{_datadir}/doc/%{name}/help/de/topic.dat +%{_datadir}/doc/%{name}/help/fr/*.gif +%{_datadir}/doc/%{name}/help/fr/grisbi-manuel.bin.html +%{_datadir}/doc/%{name}/help/fr/quickstart.html +%{_datadir}/doc/%{name}/help/fr/translation.html +%{_datadir}/doc/%{name}/help/fr/topic.dat %{_mandir}/man1/* %ghost %{_datadir}/doc/%{name}/help/C/grisbi-manuel.html +%ghost %{_datadir}/doc/%{name}/help/de/grisbi-manuel.html %ghost %{_datadir}/doc/%{name}/help/fr/grisbi-manuel.html %changelog -* Fri Oct 29 2004 Alain Portal 0:0.5.2-4 +* Mon Jan 10 2005 Alain Portal 0:0.5.5-1 + - New version + - Fix alternatives setup +* Sat Nov 27 2004 Alain Portal 0:0.5.3-0.fdr.1 + - New version +* Tue Nov 2 2004 Alain Portal 0:0.5.2-0.fdr.4 + - Rename htmlview patch + - Force scriplet to return 0 +* Fri Oct 29 2004 Alain Portal 0:0.5.2-0.fdr.3 - Patch to fix bugs #468, #470 - * Fri Oct 22 2004 Alain Portal 0:0.5.2-0.fdr.2 - %{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.html should be owned by the package. - Improve %post and %postun scripts depends upon whe are installing or upgrading. - * Fri Oct 15 2004 Alain Portal 0:0.5.2-0.fdr.1 - New version - * Wed Sep 15 2004 Alain Portal 0:0.5.1-0.fdr.2 - Use "alternatives" to manage separate documentation package - * Sat Jul 31 2004 Alain Portal 0:0.5.1-0.fdr.1 - New version - Patches to fix some compilation warnings - Add %post and %preun scripts to manage separate documentation package - * Fri Jul 23 2004 Aurelien Bompard 0:0.5.0-0.fdr.3 -- Fix typo in summary -- Change category to "Office" -- Change Terminal=0 to Terminal=false in desktop file - + - Fix typo in summary + - Change category to "Office" + - Change Terminal=0 to Terminal=false in desktop file * Tue Jun 01 2004 Aurelien Bompard 0:0.5.0-0.fdr.2 -- BR: libofx-devel to enable OFX import - + - BR: libofx-devel to enable OFX import * Mon May 31 2004 Aurelien Bompard 0:0.5.0-0.fdr.1 -- Initial Fedora RPM + - Initial Fedora RPM Index: sources =================================================================== RCS file: /cvs/extras/rpms/grisbi/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 25 Nov 2004 05:45:52 -0000 1.3 +++ sources 15 Jan 2005 09:44:36 -0000 1.4 @@ -1 +1 @@ -5d496c64973452f2cf35def2d1e57b01 grisbi-0.5.2.tar.bz2 +09b06382f9bb5a4124c40296c5eba6d5 grisbi-0.5.5.tar.bz2 --- constants.h.htmlview DELETED --- --- grisbi-0.5.2-20041029-etats_calculs.c.diff DELETED --- --- grisbi-0.5.2-20041029-operations_liste.c.diff DELETED --- From fedora-extras-commits at redhat.com Sat Jan 15 09:53:23 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 15 Jan 2005 04:53:23 -0500 Subject: rpms/kile import.log,1.5,1.6 Message-ID: <200501150953.j0F9rNdI020152@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/kile In directory cvs.fedora.redhat.com:/tmp/cvs-serv20143 Modified Files: import.log Log Message: auto-import kile-1.7.1-0.fdr.3.2 on branch FC-2 from kile-1.7.1-0.fdr.3.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kile/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 13 Jan 2005 15:32:49 -0000 1.5 +++ import.log 15 Jan 2005 09:53:21 -0000 1.6 @@ -2,3 +2,4 @@ kile-1_6_3-0_fdr_1_1:HEAD:kile-1.6.3-0.fdr.1.1.src.rpm:1099888761 kile-1_6_3-0_fdr_1_2:HEAD:kile-1.6.3-0.fdr.1.2.src.rpm:1099888767 kile-1_7_1-3:HEAD:kile-1.7.1-3.src.rpm:1105630409 +kile-1_7_1-0_fdr_3_2:FC-2:kile-1.7.1-0.fdr.3.2.src.rpm:1105782794 From fedora-extras-commits at redhat.com Sat Jan 15 09:53:23 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 15 Jan 2005 04:53:23 -0500 Subject: rpms/kile/FC-2 kile-1.7-dt.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kile.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200501150953.j0F9rNvO020156@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/kile/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv20143/FC-2 Modified Files: .cvsignore kile.spec sources Added Files: kile-1.7-dt.patch Log Message: auto-import kile-1.7.1-0.fdr.3.2 on branch FC-2 from kile-1.7.1-0.fdr.3.2.src.rpm kile-1.7-dt.patch: --- NEW FILE kile-1.7-dt.patch --- --- kile-1.7/kile/kile.desktop.dt 2004-05-27 01:56:00.000000000 -0500 +++ kile-1.7/kile/kile.desktop 2004-10-18 08:09:27.000000000 -0500 @@ -51,4 +51,4 @@ GenericName[xx]=xxLaTeX Frontendxx GenericName[zh_CN]=LaTeX ?????? MimeType=text/x-tex;text/x-kilepr -Categories=Qt;KDE;Office +Categories=Qt;KDE;Office; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kile/FC-2/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:39:15 -0000 1.2 +++ .cvsignore 15 Jan 2005 09:53:21 -0000 1.3 @@ -1 +1 @@ -kile-1.6.3.tar.bz2 +kile-1.7.1.tar.bz2 Index: kile.spec =================================================================== RCS file: /cvs/extras/rpms/kile/FC-2/kile.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kile.spec 8 Nov 2004 04:39:27 -0000 1.3 +++ kile.spec 15 Jan 2005 09:53:21 -0000 1.4 @@ -1,48 +1,62 @@ -# $Id$ +#$Id$ + +# for optionally using destkop-file-install (for fc2 mostly) +%define desktop_file 1 Name: kile -Summary: LaTeX source editor and TeX shell +Summary: (La)TeX source editor and TeX shell Epoch: 0 -Version: 1.6.3 -Release: 0.fdr.1%{?dist_tag}.2 +Version: 1.7.1 +Release: 0.fdr.3%{?dist_tag}.2 Group: Applications/Publishing URL: http://kile.sourceforge.net/ -Source: http://dl.sourceforge.net/sourceforge/kile/kile-1.6.3.tar.bz2 +Source: http://dl.sourceforge.net/sourceforge/kile/kile-1.7.1.tar.bz2 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +# Append ; to .desktop Categories +Patch1: kile-1.7-dt.patch + BuildRequires: gettext +BuildRequires: libtool +%{?desktop_file:BuildRequires: desktop-file-utils} -# workarounds for missing Requires in redhat's qt-devel, kdelibs-devel -# and to make fedora's buildsystem happy -BuildRequires: XFree86-devel libtool +# workarounds for missing Requires in fc1's qt-devel, kdelibs-devel +# and to make fedora.us's buildsystem happy +BuildRequires: XFree86-devel BuildRequires: libpng-devel zlib-devel libjpeg-devel BuildRequires: arts-devel libart_lgpl-devel fam-devel Requires: tetex-latex +## Optional, but recommended +#Requires: gnuplot +#Requires: xfig -BuildRequires: qt-devel >= 1:3.1 -%define qt_ver %(rpm -q --qf '%%{version}' qt-devel | cut -d. -f1,2) +BuildRequires: qt-devel >= 1:3.3 +%define qt_ver %(rpm -q --qf '%%{version}' qt-devel | cut -d. -f-2) Requires: qt >= 1:%{qt_ver} -BuildRequires: kdelibs-devel >= 6:3.1 -%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel | cut -d. -f1,2 ) +BuildRequires: kdelibs-devel >= 6:3.2 +%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel | cut -d. -f-2 ) Requires: kdelibs >= 6:%{kdelibs_ver} -%if "%{kdelibs_ver}" < "3.2" -%define desktop_file 1 -%endif - %description -Kile is a LaTeX source editor, TeX shell and GnuPlot frontend that -simplifies the creation of LaTeX documents. +Kile is a user friendly (La)TeX editor. The main features are: + * Compile, convert and view your document with one click. + * Auto-completion of (La)TeX commands + * Templates and wizards makes starting a new document very little work. + * Easy insertion of many standard tags and symbols and the option to define (an arbitrary number of) user defined tags. + * Inverse and forward search: click in the DVI viewer and jump to the corresponding LaTeX line in the editor, or jump from the editor to the corresponding page in the viewer. + * Finding chapter or sections is very easy, Kile constructs a list of all the chapter etc. in your document. You can use the list to jump to the corresponding section. + * Collect documents that belong together into a project. + * Easy insertion of citations and references when using projects. + * Advanced editing commands. %prep %setup -q -# append ; to desktop_file Categories -perl -pi -e 's at Categories(.*)Office$@Categories${1}Office\;@' */*.desktop */*/*.desktop +%{?desktop_file:%patch1 -p1 -b .dt} %build @@ -52,9 +66,9 @@ --program-prefix="%{?_program_prefix}" \ --disable-rpath \ %{?debug: --enable-debug --enable-warnings } \ - %{!?debug: --disable-dependency-tracking --disable-debug --disable-warnings --enable-final } + %{!?debug: --disable-debug --disable-warnings --enable-final } -make %{?_smp_mflags} +make %{?_smp_mflags} %install @@ -76,11 +90,6 @@ popd %if "%{?desktop_file}" == "1" -# Put desktop/applnk file back -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applnk/Office -mv $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop \ - $RPM_BUILD_ROOT%{_datadir}/applnk/Office/ - mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --delete-original --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -89,29 +98,20 @@ $RPM_BUILD_ROOT%{_datadir}/app*/*/kile.desktop %endif -## Locale stuff -# find_lang -%find_lang %{name} -# HTML stuff -for lang_dir in $RPM_BUILD_ROOT%{_docdir}/HTML/* ; do - lang=$(basename $lang_dir) - echo "%lang($lang) %doc %{_docdir}/HTML/${lang}/*" >> %{name}.lang -done +## Unpackaged/conflicting files +rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/katepart - -%files -f %{name}.lang +%files %defattr(-,root,root,-) %doc AUTHORS ChangeLog README TODO +%lang(en) %doc %{_datadir}/doc/HTML/en/* %{_bindir}/* %{_datadir}/apps/kile -%{_datadir}/apps/katepart/syntax/*.xml +%{_datadir}/apps/kconf_update/kile* +%config %{_datadir}/config.kcfg/kile.kcfg %{_datadir}/icons/*/*/*/*.png -%if "%{?desktop_file}" == "1" -%{_datadir}/applications/*.desktop -%else -%{_datadir}/applications/kde/*.desktop -%endif +%{_datadir}/applications%{!?desktop_file:/kde}/*.desktop %{_datadir}/mimelnk/*/*.desktop @@ -120,6 +120,19 @@ %changelog +* Wed Jan 12 2005 Rex Dieter 0:1.7.1-0.fdr.3 +- fix (katepart) conflicts with kde >= 3.2 +- update %%description + +* Mon Oct 18 2004 Rex Dieter 0:1.7.1-0.fdr.2 +- -katepart: fix conflicts with kde >= 3.3 (optional) + +* Mon Oct 18 2004 Rex Dieter 0:1.7.1-0.fdr.1 +- 1.7.1 + +* Tue Sep 28 2004 Rex Dieter 0:1.6.3-0.fdr.2 +- respin (against kde-3.3) + * Fri May 14 2004 Rex Dieter 0:1.6.3-0.fdr.1 - 1.6.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kile/FC-2/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:39:15 -0000 1.2 +++ sources 15 Jan 2005 09:53:21 -0000 1.3 @@ -1 +1 @@ -6bf238c7a80fa647d8fd4ca89c0774ef kile-1.6.3.tar.bz2 +940fba9dc62e2687856885dffccf6e80 kile-1.7.1.tar.bz2 From fedora-extras-commits at redhat.com Sat Jan 15 09:55:33 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 15 Jan 2005 04:55:33 -0500 Subject: rpms/xtide import.log,1.6,1.7 Message-ID: <200501150955.j0F9tXOk020288@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xtide In directory cvs.fedora.redhat.com:/tmp/cvs-serv20279 Modified Files: import.log Log Message: auto-import xtide-2.8-0.fdr.1.2 on branch FC-2 from xtide-2.8-0.fdr.1.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xtide/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 8 Jan 2005 23:07:00 -0000 1.6 +++ import.log 15 Jan 2005 09:55:31 -0000 1.7 @@ -3,3 +3,4 @@ xtide-2_6_4-0_fdr_4_2:HEAD:xtide-2.6.4-0.fdr.4.2.src.rpm:1099892204 xtide-2_8-1:HEAD:xtide-2.8-1.src.rpm:1105165649 xtide-2_8-2:HEAD:xtide-2.8-2.src.rpm:1105225646 +xtide-2_8-0_fdr_1_2:FC-2:xtide-2.8-0.fdr.1.2.src.rpm:1105782923 From fedora-extras-commits at redhat.com Sat Jan 15 09:55:33 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 15 Jan 2005 04:55:33 -0500 Subject: rpms/xtide/FC-2 xtide-2.8.for_x86_64.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xtide.spec, 1.3, 1.4 xtide-2.6.4.patch, 1.1, NONE Message-ID: <200501150955.j0F9tX69020292@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xtide/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv20279/FC-2 Modified Files: .cvsignore sources xtide.spec Added Files: xtide-2.8.for_x86_64.patch Removed Files: xtide-2.6.4.patch Log Message: auto-import xtide-2.8-0.fdr.1.2 on branch FC-2 from xtide-2.8-0.fdr.1.2.src.rpm xtide-2.8.for_x86_64.patch: --- NEW FILE xtide-2.8.for_x86_64.patch --- diff -Naur xtide-2.8.orig/Makefile.in xtide-2.8/Makefile.in --- xtide-2.8.orig/Makefile.in 2004-12-17 18:21:28.000000000 -0800 +++ xtide-2.8/Makefile.in 2004-12-17 18:14:39.000000000 -0800 @@ -15,7 +15,7 @@ CXX = @CXX@ CC = @CC@ CXXFLAGS = @extracxxflags@ @DEFS@ -I at includedir@ -Ilibtcd -I$(XROOT)/include @normalcxxflags@ -c -LDFLAGS = @extraldflags@ -L at libdir@ -L$(XROOT)/lib @normalldflags@ -o +LDFLAGS = @extraldflags@ -L at libdir@ -L$(XROOT)/lib64 @normalldflags@ -o # Extra switches and libs determined by configure.in extraswitches=@extraswitches@ diff -Naur xtide-2.8.orig/configure xtide-2.8/configure --- xtide-2.8.orig/configure 2004-12-17 18:21:28.000000000 -0800 +++ xtide-2.8/configure 2004-12-17 18:23:57.000000000 -0800 @@ -2602,6 +2602,12 @@ break fi done +for dir in "/usr/X11R6" "/usr/openwin" "/usr/contrib/X11R6" "/usr"; do + if test -r "$dir/lib64/libXaw.so" -o -r "$dir/lib64/libXaw.a" -o -r "$dir/lib64/libXaw.dll.a"; then + xroot="$dir" + break + fi +done echo "$as_me:$LINENO: result: $xroot" >&5 echo "${ECHO_T}$xroot" >&6 if test "$xroot" = "NOT FOUND"; then diff -Naur xtide-2.8.orig/configure.in xtide-2.8/configure.in --- xtide-2.8.orig/configure.in 2004-12-17 18:21:28.000000000 -0800 +++ xtide-2.8/configure.in 2004-12-17 18:19:50.000000000 -0800 @@ -54,6 +54,12 @@ break fi done +for dir in "/usr/X11R6" "/usr/openwin" "/usr/contrib/X11R6" "/usr"; do + if test -r "$dir/lib64/libXaw.so" -o -r "$dir/lib64/libXaw.a" -o -r "$dir/lib64/libXaw.dll.a"; then + xroot="$dir" + break + fi +done AC_MSG_RESULT($xroot) if test "$xroot" = "NOT FOUND"; then AC_MSG_WARN(Type 'make tide' or 'make xttpd' to compile without X11.) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xtide/FC-2/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:36:19 -0000 1.2 +++ .cvsignore 15 Jan 2005 09:55:31 -0000 1.3 @@ -1,2 +1,2 @@ -harmonics.tcd.gz -xtide-2.6.4.tar.gz +harmonics-dwf-2004-12-10-v2.tcd.gz +xtide-2.8.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xtide/FC-2/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:36:19 -0000 1.2 +++ sources 15 Jan 2005 09:55:31 -0000 1.3 @@ -1,2 +1,2 @@ -d632604083928ab97deacfab76c2d50e harmonics.tcd.gz -6b0d5f99586a6356dbfa498629d8f793 xtide-2.6.4.tar.gz +cc55cdf906c9cb5e7938731391f486e0 harmonics-dwf-2004-12-10-v2.tcd.gz +17e34e7d7fc1dcf7b564b2970f821d0e xtide-2.8.tar.gz Index: xtide.spec =================================================================== RCS file: /cvs/extras/rpms/xtide/FC-2/xtide.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xtide.spec 8 Nov 2004 05:36:44 -0000 1.3 +++ xtide.spec 15 Jan 2005 09:55:31 -0000 1.4 @@ -1,17 +1,16 @@ Summary: A program for calculating tide all over the world Name: xtide -Version: 2.6.4 -Release: 0.fdr.4.2 +Version: 2.8 +Release: 0.fdr.1.2 Epoch: 0 URL: http://www.flaterco.com/xtide/ Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.gz -Source1: ftp://harmonics.unh.edu/xtide/harmonics.tcd.gz +Source1: ftp://ftp.flaterco.com/xtide/harmonics-dwf-2004-12-10-v2.tcd.gz Source2: %{name}.desktop -Patch0: %{name}-%{version}.patch +Patch0: %{name}-%{version}.for_x86_64.patch License: GPL Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# BuildRequires: wget BuildRequires: libpng-devel BuildRequires: XFree86-devel BuildRequires: zlib-devel @@ -58,23 +57,23 @@ %prep %setup -q -T -b 0 -%patch -p1 -b .buildroot + +%ifarch x86_64 +%patch0 -p1 -b .buildroot +%endif + cp %{SOURCE1} ./ cp %{SOURCE2} ./ %build %configure -# Generates xml parsing routines. Requires bison and flex. -./do_xml.sh - make %{?_smp_mflags} -# # Get harmonics file -# wget ftp://anonymous:$USER%40$HOSTNAME at harmonics.unh.edu/xtide/harmonics.tcd.gz - # Unzip harmonics file -gunzip harmonics.tcd.gz +gunzip harmonics-dwf-2004-12-10-v2.tcd.gz + +echo "%{_datadir}/%{name}/harmonics-dwf-2004-12-10-v2.tcd" > %{name}.conf %install rm -rf $RPM_BUILD_ROOT @@ -83,11 +82,11 @@ # Install harmonics file. mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name} -cp harmonics.tcd ${RPM_BUILD_ROOT}%{_datadir}/%{name}/ +install -m 644 harmonics-dwf-2004-12-10-v2.tcd ${RPM_BUILD_ROOT}%{_datadir}/%{name}/ # Add configuration file mkdir ${RPM_BUILD_ROOT}%{_sysconfdir} -echo "%{_datadir}/%{name}/harmonics.tcd" > ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}.conf +install -m 644 %{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}.conf # Add desktop entry mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications @@ -112,7 +111,7 @@ %dir %{_datadir}/%{name} # TCD file -%config(missingok) %{_datadir}/%{name}/harmonics.tcd +%config(missingok) %{_datadir}/%{name}/harmonics-dwf-2004-12-10-v2.tcd # Config file %config(noreplace) %{_sysconfdir}/* @@ -125,6 +124,14 @@ %{_sbindir}/* %changelog +* Fri Dec 17 2004 David M. Kaplan 0:2.8-0.fdr.1 +- Made a small hack that should make it compile on x86_64 systems. + +* Wed Dec 15 2004 David M. Kaplan 0:2.8-0.fdr.0 +- Updated to version 2.8 +- Cleaned up spec file because much of the tricks to get it to work + are no longer necessary. + * Mon Dec 8 2003 David M. Kaplan 0:2.6.4-0.fdr.4 - Removed 644 permissions. --- xtide-2.6.4.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jan 15 09:56:56 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 15 Jan 2005 04:56:56 -0500 Subject: rpms/xtide import.log,1.7,1.8 Message-ID: <200501150956.j0F9uuCl020423@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xtide In directory cvs.fedora.redhat.com:/tmp/cvs-serv20414 Modified Files: import.log Log Message: auto-import xtide-2.8-0.fdr.1.1 on branch FC-1 from xtide-2.8-0.fdr.1.1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xtide/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 15 Jan 2005 09:55:31 -0000 1.7 +++ import.log 15 Jan 2005 09:56:54 -0000 1.8 @@ -4,3 +4,4 @@ xtide-2_8-1:HEAD:xtide-2.8-1.src.rpm:1105165649 xtide-2_8-2:HEAD:xtide-2.8-2.src.rpm:1105225646 xtide-2_8-0_fdr_1_2:FC-2:xtide-2.8-0.fdr.1.2.src.rpm:1105782923 +xtide-2_8-0_fdr_1_1:FC-1:xtide-2.8-0.fdr.1.1.src.rpm:1105783000 From fedora-extras-commits at redhat.com Sat Jan 15 09:56:56 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 15 Jan 2005 04:56:56 -0500 Subject: rpms/xtide/FC-1 xtide-2.8.for_x86_64.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xtide.spec, 1.2, 1.3 xtide-2.6.4.patch, 1.1, NONE Message-ID: <200501150956.j0F9uuQC020429@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xtide/FC-1 In directory cvs.fedora.redhat.com:/tmp/cvs-serv20414/FC-1 Modified Files: .cvsignore sources xtide.spec Added Files: xtide-2.8.for_x86_64.patch Removed Files: xtide-2.6.4.patch Log Message: auto-import xtide-2.8-0.fdr.1.1 on branch FC-1 from xtide-2.8-0.fdr.1.1.src.rpm xtide-2.8.for_x86_64.patch: --- NEW FILE xtide-2.8.for_x86_64.patch --- diff -Naur xtide-2.8.orig/Makefile.in xtide-2.8/Makefile.in --- xtide-2.8.orig/Makefile.in 2004-12-17 18:21:28.000000000 -0800 +++ xtide-2.8/Makefile.in 2004-12-17 18:14:39.000000000 -0800 @@ -15,7 +15,7 @@ CXX = @CXX@ CC = @CC@ CXXFLAGS = @extracxxflags@ @DEFS@ -I at includedir@ -Ilibtcd -I$(XROOT)/include @normalcxxflags@ -c -LDFLAGS = @extraldflags@ -L at libdir@ -L$(XROOT)/lib @normalldflags@ -o +LDFLAGS = @extraldflags@ -L at libdir@ -L$(XROOT)/lib64 @normalldflags@ -o # Extra switches and libs determined by configure.in extraswitches=@extraswitches@ diff -Naur xtide-2.8.orig/configure xtide-2.8/configure --- xtide-2.8.orig/configure 2004-12-17 18:21:28.000000000 -0800 +++ xtide-2.8/configure 2004-12-17 18:23:57.000000000 -0800 @@ -2602,6 +2602,12 @@ break fi done +for dir in "/usr/X11R6" "/usr/openwin" "/usr/contrib/X11R6" "/usr"; do + if test -r "$dir/lib64/libXaw.so" -o -r "$dir/lib64/libXaw.a" -o -r "$dir/lib64/libXaw.dll.a"; then + xroot="$dir" + break + fi +done echo "$as_me:$LINENO: result: $xroot" >&5 echo "${ECHO_T}$xroot" >&6 if test "$xroot" = "NOT FOUND"; then diff -Naur xtide-2.8.orig/configure.in xtide-2.8/configure.in --- xtide-2.8.orig/configure.in 2004-12-17 18:21:28.000000000 -0800 +++ xtide-2.8/configure.in 2004-12-17 18:19:50.000000000 -0800 @@ -54,6 +54,12 @@ break fi done +for dir in "/usr/X11R6" "/usr/openwin" "/usr/contrib/X11R6" "/usr"; do + if test -r "$dir/lib64/libXaw.so" -o -r "$dir/lib64/libXaw.a" -o -r "$dir/lib64/libXaw.dll.a"; then + xroot="$dir" + break + fi +done AC_MSG_RESULT($xroot) if test "$xroot" = "NOT FOUND"; then AC_MSG_WARN(Type 'make tide' or 'make xttpd' to compile without X11.) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xtide/FC-1/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:36:19 -0000 1.2 +++ .cvsignore 15 Jan 2005 09:56:54 -0000 1.3 @@ -1,2 +1,2 @@ -harmonics.tcd.gz -xtide-2.6.4.tar.gz +harmonics-dwf-2004-12-10-v2.tcd.gz +xtide-2.8.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xtide/FC-1/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:36:19 -0000 1.2 +++ sources 15 Jan 2005 09:56:54 -0000 1.3 @@ -1,2 +1,2 @@ -d632604083928ab97deacfab76c2d50e harmonics.tcd.gz -6b0d5f99586a6356dbfa498629d8f793 xtide-2.6.4.tar.gz +cc55cdf906c9cb5e7938731391f486e0 harmonics-dwf-2004-12-10-v2.tcd.gz +17e34e7d7fc1dcf7b564b2970f821d0e xtide-2.8.tar.gz Index: xtide.spec =================================================================== RCS file: /cvs/extras/rpms/xtide/FC-1/xtide.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xtide.spec 8 Nov 2004 05:36:38 -0000 1.2 +++ xtide.spec 15 Jan 2005 09:56:54 -0000 1.3 @@ -1,17 +1,16 @@ Summary: A program for calculating tide all over the world Name: xtide -Version: 2.6.4 -Release: 0.fdr.4.1 +Version: 2.8 +Release: 0.fdr.1.1 Epoch: 0 URL: http://www.flaterco.com/xtide/ Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.gz -Source1: ftp://harmonics.unh.edu/xtide/harmonics.tcd.gz +Source1: ftp://ftp.flaterco.com/xtide/harmonics-dwf-2004-12-10-v2.tcd.gz Source2: %{name}.desktop -Patch0: %{name}-%{version}.patch +Patch0: %{name}-%{version}.for_x86_64.patch License: GPL Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# BuildRequires: wget BuildRequires: libpng-devel BuildRequires: XFree86-devel BuildRequires: zlib-devel @@ -58,23 +57,23 @@ %prep %setup -q -T -b 0 -%patch -p1 -b .buildroot + +%ifarch x86_64 +%patch0 -p1 -b .buildroot +%endif + cp %{SOURCE1} ./ cp %{SOURCE2} ./ %build %configure -# Generates xml parsing routines. Requires bison and flex. -./do_xml.sh - make %{?_smp_mflags} -# # Get harmonics file -# wget ftp://anonymous:$USER%40$HOSTNAME at harmonics.unh.edu/xtide/harmonics.tcd.gz - # Unzip harmonics file -gunzip harmonics.tcd.gz +gunzip harmonics-dwf-2004-12-10-v2.tcd.gz + +echo "%{_datadir}/%{name}/harmonics-dwf-2004-12-10-v2.tcd" > %{name}.conf %install rm -rf $RPM_BUILD_ROOT @@ -83,11 +82,11 @@ # Install harmonics file. mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name} -cp harmonics.tcd ${RPM_BUILD_ROOT}%{_datadir}/%{name}/ +install -m 644 harmonics-dwf-2004-12-10-v2.tcd ${RPM_BUILD_ROOT}%{_datadir}/%{name}/ # Add configuration file mkdir ${RPM_BUILD_ROOT}%{_sysconfdir} -echo "%{_datadir}/%{name}/harmonics.tcd" > ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}.conf +install -m 644 %{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}.conf # Add desktop entry mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications @@ -112,7 +111,7 @@ %dir %{_datadir}/%{name} # TCD file -%config(missingok) %{_datadir}/%{name}/harmonics.tcd +%config(missingok) %{_datadir}/%{name}/harmonics-dwf-2004-12-10-v2.tcd # Config file %config(noreplace) %{_sysconfdir}/* @@ -125,6 +124,14 @@ %{_sbindir}/* %changelog +* Fri Dec 17 2004 David M. Kaplan 0:2.8-0.fdr.1 +- Made a small hack that should make it compile on x86_64 systems. + +* Wed Dec 15 2004 David M. Kaplan 0:2.8-0.fdr.0 +- Updated to version 2.8 +- Cleaned up spec file because much of the tricks to get it to work + are no longer necessary. + * Mon Dec 8 2003 David M. Kaplan 0:2.6.4-0.fdr.4 - Removed 644 permissions. --- xtide-2.6.4.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jan 15 09:59:01 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 15 Jan 2005 04:59:01 -0500 Subject: rpms/xtide import.log,1.8,1.9 Message-ID: <200501150959.j0F9x1rF020559@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xtide In directory cvs.fedora.redhat.com:/tmp/cvs-serv20548 Modified Files: import.log Log Message: auto-import xtide-2.8-0.fdr.1.rh90 on branch RHL-9 from xtide-2.8-0.fdr.1.rh90.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xtide/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 15 Jan 2005 09:56:54 -0000 1.8 +++ import.log 15 Jan 2005 09:58:59 -0000 1.9 @@ -5,3 +5,4 @@ xtide-2_8-2:HEAD:xtide-2.8-2.src.rpm:1105225646 xtide-2_8-0_fdr_1_2:FC-2:xtide-2.8-0.fdr.1.2.src.rpm:1105782923 xtide-2_8-0_fdr_1_1:FC-1:xtide-2.8-0.fdr.1.1.src.rpm:1105783000 +xtide-2_8-0_fdr_1_rh90:RHL-9:xtide-2.8-0.fdr.1.rh90.src.rpm:1105783131 From fedora-extras-commits at redhat.com Sat Jan 15 09:59:01 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 15 Jan 2005 04:59:01 -0500 Subject: rpms/xtide/RHL-9 xtide-2.8.for_x86_64.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xtide.spec, 1.1, 1.2 xtide-2.6.4.patch, 1.1, NONE Message-ID: <200501150959.j0F9x1MW020567@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xtide/RHL-9 In directory cvs.fedora.redhat.com:/tmp/cvs-serv20548/RHL-9 Modified Files: .cvsignore sources xtide.spec Added Files: xtide-2.8.for_x86_64.patch Removed Files: xtide-2.6.4.patch Log Message: auto-import xtide-2.8-0.fdr.1.rh90 on branch RHL-9 from xtide-2.8-0.fdr.1.rh90.src.rpm xtide-2.8.for_x86_64.patch: --- NEW FILE xtide-2.8.for_x86_64.patch --- diff -Naur xtide-2.8.orig/Makefile.in xtide-2.8/Makefile.in --- xtide-2.8.orig/Makefile.in 2004-12-17 18:21:28.000000000 -0800 +++ xtide-2.8/Makefile.in 2004-12-17 18:14:39.000000000 -0800 @@ -15,7 +15,7 @@ CXX = @CXX@ CC = @CC@ CXXFLAGS = @extracxxflags@ @DEFS@ -I at includedir@ -Ilibtcd -I$(XROOT)/include @normalcxxflags@ -c -LDFLAGS = @extraldflags@ -L at libdir@ -L$(XROOT)/lib @normalldflags@ -o +LDFLAGS = @extraldflags@ -L at libdir@ -L$(XROOT)/lib64 @normalldflags@ -o # Extra switches and libs determined by configure.in extraswitches=@extraswitches@ diff -Naur xtide-2.8.orig/configure xtide-2.8/configure --- xtide-2.8.orig/configure 2004-12-17 18:21:28.000000000 -0800 +++ xtide-2.8/configure 2004-12-17 18:23:57.000000000 -0800 @@ -2602,6 +2602,12 @@ break fi done +for dir in "/usr/X11R6" "/usr/openwin" "/usr/contrib/X11R6" "/usr"; do + if test -r "$dir/lib64/libXaw.so" -o -r "$dir/lib64/libXaw.a" -o -r "$dir/lib64/libXaw.dll.a"; then + xroot="$dir" + break + fi +done echo "$as_me:$LINENO: result: $xroot" >&5 echo "${ECHO_T}$xroot" >&6 if test "$xroot" = "NOT FOUND"; then diff -Naur xtide-2.8.orig/configure.in xtide-2.8/configure.in --- xtide-2.8.orig/configure.in 2004-12-17 18:21:28.000000000 -0800 +++ xtide-2.8/configure.in 2004-12-17 18:19:50.000000000 -0800 @@ -54,6 +54,12 @@ break fi done +for dir in "/usr/X11R6" "/usr/openwin" "/usr/contrib/X11R6" "/usr"; do + if test -r "$dir/lib64/libXaw.so" -o -r "$dir/lib64/libXaw.a" -o -r "$dir/lib64/libXaw.dll.a"; then + xroot="$dir" + break + fi +done AC_MSG_RESULT($xroot) if test "$xroot" = "NOT FOUND"; then AC_MSG_WARN(Type 'make tide' or 'make xttpd' to compile without X11.) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xtide/RHL-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:36:19 -0000 1.2 +++ .cvsignore 15 Jan 2005 09:58:59 -0000 1.3 @@ -1,2 +1,2 @@ -harmonics.tcd.gz -xtide-2.6.4.tar.gz +harmonics-dwf-2004-12-10-v2.tcd.gz +xtide-2.8.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xtide/RHL-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:36:19 -0000 1.2 +++ sources 15 Jan 2005 09:58:59 -0000 1.3 @@ -1,2 +1,2 @@ -d632604083928ab97deacfab76c2d50e harmonics.tcd.gz -6b0d5f99586a6356dbfa498629d8f793 xtide-2.6.4.tar.gz +cc55cdf906c9cb5e7938731391f486e0 harmonics-dwf-2004-12-10-v2.tcd.gz +17e34e7d7fc1dcf7b564b2970f821d0e xtide-2.8.tar.gz Index: xtide.spec =================================================================== RCS file: /cvs/extras/rpms/xtide/RHL-9/xtide.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xtide.spec 8 Nov 2004 05:36:19 -0000 1.1 +++ xtide.spec 15 Jan 2005 09:58:59 -0000 1.2 @@ -1,17 +1,16 @@ Summary: A program for calculating tide all over the world Name: xtide -Version: 2.6.4 -Release: 0.fdr.4.rh90 +Version: 2.8 +Release: 0.fdr.1.rh90 Epoch: 0 URL: http://www.flaterco.com/xtide/ Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.gz -Source1: ftp://harmonics.unh.edu/xtide/harmonics.tcd.gz +Source1: ftp://ftp.flaterco.com/xtide/harmonics-dwf-2004-12-10-v2.tcd.gz Source2: %{name}.desktop -Patch0: %{name}-%{version}.patch +Patch0: %{name}-%{version}.for_x86_64.patch License: GPL Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# BuildRequires: wget BuildRequires: libpng-devel BuildRequires: XFree86-devel BuildRequires: zlib-devel @@ -58,23 +57,23 @@ %prep %setup -q -T -b 0 -%patch -p1 -b .buildroot + +%ifarch x86_64 +%patch0 -p1 -b .buildroot +%endif + cp %{SOURCE1} ./ cp %{SOURCE2} ./ %build %configure -# Generates xml parsing routines. Requires bison and flex. -./do_xml.sh - make %{?_smp_mflags} -# # Get harmonics file -# wget ftp://anonymous:$USER%40$HOSTNAME at harmonics.unh.edu/xtide/harmonics.tcd.gz - # Unzip harmonics file -gunzip harmonics.tcd.gz +gunzip harmonics-dwf-2004-12-10-v2.tcd.gz + +echo "%{_datadir}/%{name}/harmonics-dwf-2004-12-10-v2.tcd" > %{name}.conf %install rm -rf $RPM_BUILD_ROOT @@ -83,11 +82,11 @@ # Install harmonics file. mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name} -cp harmonics.tcd ${RPM_BUILD_ROOT}%{_datadir}/%{name}/ +install -m 644 harmonics-dwf-2004-12-10-v2.tcd ${RPM_BUILD_ROOT}%{_datadir}/%{name}/ # Add configuration file mkdir ${RPM_BUILD_ROOT}%{_sysconfdir} -echo "%{_datadir}/%{name}/harmonics.tcd" > ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}.conf +install -m 644 %{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}.conf # Add desktop entry mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications @@ -112,7 +111,7 @@ %dir %{_datadir}/%{name} # TCD file -%config(missingok) %{_datadir}/%{name}/harmonics.tcd +%config(missingok) %{_datadir}/%{name}/harmonics-dwf-2004-12-10-v2.tcd # Config file %config(noreplace) %{_sysconfdir}/* @@ -125,6 +124,14 @@ %{_sbindir}/* %changelog +* Fri Dec 17 2004 David M. Kaplan 0:2.8-0.fdr.1 +- Made a small hack that should make it compile on x86_64 systems. + +* Wed Dec 15 2004 David M. Kaplan 0:2.8-0.fdr.0 +- Updated to version 2.8 +- Cleaned up spec file because much of the tricks to get it to work + are no longer necessary. + * Mon Dec 8 2003 David M. Kaplan 0:2.6.4-0.fdr.4 - Removed 644 permissions. --- xtide-2.6.4.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jan 15 11:10:45 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 15 Jan 2005 06:10:45 -0500 Subject: rpms/lft/devel .cvsignore,1.2,1.3 lft.spec,1.5,1.6 sources,1.2,1.3 Message-ID: <200501151110.j0FBAjnk022003@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lft/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv21997 Modified Files: .cvsignore lft.spec sources Log Message: Update to 2.3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lft/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:40:48 -0000 1.2 +++ .cvsignore 15 Jan 2005 11:10:43 -0000 1.3 @@ -1 +1 @@ -lft-2.2.tar.gz +lft-2.3.tar.gz Index: lft.spec =================================================================== RCS file: /cvs/extras/rpms/lft/devel/lft.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lft.spec 10 Dec 2004 22:03:04 -0000 1.5 +++ lft.spec 15 Jan 2005 11:10:43 -0000 1.6 @@ -1,15 +1,17 @@ Name: lft -Version: 2.2 -Release: 2 +Version: 2.3 +Release: 1 Epoch: 0 Summary: Alternate traceroute tool Group: Applications/Internet -License: MainNerve Public License -URL: http://www.mainnerve.com/lft/ -Source0: http://mainnerve.com/lft/lft-2.2.tar.gz +License: VOSTROM Public License +URL: http://oppleman.com/lft/ +# http://oppleman.com/dl/?file=lft-2.3.tar.gz +Source0: %{name}-%{version}.tar.gz Patch0: %{name}-install.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + BuildRequires: libpcap Obsoletes: fft @@ -19,43 +21,39 @@ and goes through many configurations of packet-filter based firewalls. More importantly, LFT implements numerous other features including AS number lookups, loose source routing, netblock name -lookups, et al. Though LFT has been around since 1998, its development -effort has just recently resumed. +lookups, et al. -# ----------------------------------------------------------------------------- %prep %setup -q %patch0 -p0 -# ----------------------------------------------------------------------------- %build %configure make %{?_smp_mflags} -# ----------------------------------------------------------------------------- %install rm -rf $RPM_BUILD_ROOT -%makeinstall +%makeinstall # no DESTDIR support -# ----------------------------------------------------------------------------- %clean rm -rf $RPM_BUILD_ROOT -# ----------------------------------------------------------------------------- %files %defattr(0644,root,root,0755) %doc CHANGELOG COPYING README TODO lft-manpage.html %attr(4755,root,root) %{_bindir}/lft -%{_mandir}/*/* +%{_mandir}/man8/lft.8* -# ----------------------------------------------------------------------------- %changelog +* Sat Jan 15 2005 Ville Skytt?? - 0:2.3-1 +- Update to 2.3. + * Sat Jul 12 2003 Ville Skytt?? - 0:2.2-0.fdr.2 - Fix stale patch issue (bug 311). Index: sources =================================================================== RCS file: /cvs/extras/rpms/lft/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:40:48 -0000 1.2 +++ sources 15 Jan 2005 11:10:43 -0000 1.3 @@ -1 +1 @@ -75d2a4f0e224733156a668ca04881c4b lft-2.2.tar.gz +8ec24dd3bf27d6b736e82ab8ec3b902f lft-2.3.tar.gz From fedora-extras-commits at redhat.com Mon Jan 17 09:43:11 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Mon, 17 Jan 2005 04:43:11 -0500 Subject: rpms/imlib2/devel imlib2-1.2.0-configure-xlib64.patch, NONE, 1.1 imlib2.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200501170943.j0H9hBdn005893@cvs.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/imlib2/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv5887 Modified Files: imlib2.spec sources Added Files: imlib2-1.2.0-configure-xlib64.patch Log Message: imlib2: updates spec file (1.2.0). fix for x86_64 build imlib2-1.2.0-configure-xlib64.patch: --- NEW FILE imlib2-1.2.0-configure-xlib64.patch --- --- configure.old 2005-01-09 18:36:09.314185880 +0100 +++ configure 2005-01-09 18:37:15.840072408 +0100 @@ -20262,7 +20262,7 @@ if test "x$have_x" = "xyes"; then x_dir="/usr/X11R6"; x_cflags="-I"$x_dir"/include" - x_libs="-L"$x_dir"/lib -lX11 -lXext" + x_libs="-L"$x_dir"/lib64 -lX11 -lXext" echo "$as_me:$LINENO: result: enabling X11 support" >&5 echo "${ECHO_T}enabling X11 support" >&6 Index: imlib2.spec =================================================================== RCS file: /cvs/extras/rpms/imlib2/devel/imlib2.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- imlib2.spec 10 Dec 2004 22:03:04 -0000 1.6 +++ imlib2.spec 17 Jan 2005 09:43:09 -0000 1.7 @@ -1,15 +1,19 @@ Summary: A graphic library for file loading, saving, rendering, and manipulation Name: imlib2 -Version: 1.1.2 -Release: 1 +Version: 1.2.0 +Release: 3 Epoch: 0 License: BSD Group: System Environment/Libraries URL: http://www.enlightenment.org/pages/imlib2.html Source0: http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz +Patch0: imlib2-1.2.0-configure-xlib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: XFree86-devel libjpeg-devel libpng-devel libtiff-devel BuildRequires: libungif-devel freetype-devel libtool bzip2-devel +%ifarch x86_64 +BuildRequires: perl +%endif %package devel Summary: Development package for %{name} @@ -39,33 +43,45 @@ %prep %setup -q +%ifarch x86_64 +%patch0 -b .patch0 +%endif # ----------------------------------------------------------------------------- %build %configure \ -%ifarch %{ix86} x86_64 ia64 + --x-libraries=%{_prefix}/X11R6/%{_lib} \ + --with-pic \ +%ifarch %{ix86} ia64 --enable-mmx +%else + --disable-mmx +%endif +%ifarch x86_64 +# fix hardcoded rpath im Makefiles on x86_64 due to freetype-config --libs +# returning "-L/usr/lib64 -Wl,--rpath -Wl,/usr/lib64 -lfreetype -lz": +perl -pi.orig -e 's|-Wl,--rpath -Wl,/usr/lib64||g;' Makefile */Makefile */*/Makefile imlib2-config %endif -make %{?_smp_mflags} -make -C demo +make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool # ----------------------------------------------------------------------------- %install rm -rf $RPM_BUILD_ROOT __doc -make install DESTDIR=$RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -C demo +make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool cp -a doc __doc rm -f __doc/Makefile* rm -f \ - $RPM_BUILD_ROOT%{_libdir}/libImlib2.la \ - $RPM_BUILD_ROOT%{_libdir}/imlib2_loaders/*/*.*a \ + $RPM_BUILD_ROOT%{_libdir}/imlib2/{loaders,filters}/*.*a \ $RPM_BUILD_ROOT%{_bindir}/{color_spaces,imlib2,*test} +# ship .la files due to a bug in kdelibs (see changelog): +# $RPM_BUILD_ROOT%{_libdir}/libImlib2.la \ + # ----------------------------------------------------------------------------- %clean @@ -79,22 +95,56 @@ %files %defattr(-,root,root,-) %doc COPYING AUTHORS README ChangeLog TODO __doc/* -%{_bindir}/imconvert %{_bindir}/imlib2_view +%{_bindir}/imlib2_bumpmap +%{_bindir}/imlib2_colorspace +%{_bindir}/imlib2_conv +%{_bindir}/imlib2_poly +%{_bindir}/imlib2_show %{_libdir}/libImlib2.so.* -%{_libdir}/imlib2_loaders +%{_datadir}/imlib2/data/ +%dir %{_libdir}/imlib2/filters/ +%{_libdir}/imlib2/filters/*.so +%dir %{_libdir}/imlib2/loaders/ +%{_libdir}/imlib2/loaders/*.so %files devel %defattr(-,root,root,-) %{_bindir}/imlib2-config %{_includedir}/Imlib2.h %{_libdir}/libImlib2.a +%{_libdir}/libImlib2.la %{_libdir}/libImlib2.so %{_libdir}/pkgconfig/imlib2.pc # ----------------------------------------------------------------------------- %changelog +* Fri Jan 14 2005 Thorsten Leemhuis - 0:1.1.2-0.fdr.1 - Update to 1.1.2, fixes CAN-2004-0802. - Enable MMX on all ix86, x86_64 and ia64, it seems runtime-detected. Index: sources =================================================================== RCS file: /cvs/extras/rpms/imlib2/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:35:58 -0000 1.3 +++ sources 17 Jan 2005 09:43:09 -0000 1.4 @@ -1 +1 @@ -3389bad516032c951fda4fe620df0cef imlib2-1.1.2.tar.gz +853fb77100ee3c3ca944f52c892ab49b imlib2-1.2.0.tar.gz From fedora-extras-commits at redhat.com Mon Jan 17 11:24:06 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 17 Jan 2005 06:24:06 -0500 Subject: rpms/gpgme03/devel gpgme03.spec,1.6,1.7 Message-ID: <200501171124.j0HBO6mu007690@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gpgme03/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv7684 Modified Files: gpgme03.spec Log Message: Help preparing the road to GPGME 1.0 migration. This change gets rid of dependency on newpg. Index: gpgme03.spec =================================================================== RCS file: /cvs/extras/rpms/gpgme03/devel/gpgme03.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gpgme03.spec 6 Jan 2005 18:17:16 -0000 1.6 +++ gpgme03.spec 17 Jan 2005 11:24:04 -0000 1.7 @@ -1,7 +1,7 @@ Summary: GnuPG Made Easy interface library Name: gpgme03 Version: 0.3.16 -Release: 6 +Release: 7 Epoch: 0 License: GPL Group: Applications/System @@ -10,8 +10,8 @@ Patch1: gpgme-0.3.16-underquoted.patch URL: http://www.gnupg.org/related_software/gpgme/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gnupg >= 0:1.2.0, %{_bindir}/gpgsm -Requires: gnupg >= 0:1.2.0, %{_bindir}/gpgsm +BuildRequires: gnupg >= 0:1.2.0 +Requires: gnupg >= 0:1.2.0 %description GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier @@ -37,7 +37,7 @@ %build -%configure --with-pth=no +%configure --with-pth=no --without-gpgsm make %{?_smp_mflags} @@ -84,6 +84,10 @@ %changelog +* Sun Jan 16 2005 Michael Schwendt - 0.3.16-7 +- Disable GPGSM, remove /usr/bin/gpgsm dependency. + None of our GPGME 0.3.x API users need this. + * Thu Jan 6 2005 Michael Schwendt - 0.3.16-6 - Fix underquoted definition in gpgme.m4. From fedora-extras-commits at redhat.com Mon Jan 17 11:28:07 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 17 Jan 2005 06:28:07 -0500 Subject: rpms/cryptplug/devel cryptplug.spec, 1.5, NONE Makefile, 1.2, NONE sources, 1.3, NONE Message-ID: <200501171128.j0HBS7bM007761@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/cryptplug/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv7755 Removed Files: cryptplug.spec Makefile sources Log Message: As discussed on fedora-devel-list, package is obsolete. KMail in FC3, for instance, uses GPGME >= 0.4.5 instead. --- cryptplug.spec DELETED --- --- Makefile DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon Jan 17 12:11:48 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 17 Jan 2005 07:11:48 -0500 Subject: rpms/kannel/devel kannel-1.4.0-depend.patch, NONE, 1.1 kannel.spec, 1.3, 1.4 Message-ID: <200501171211.j0HCBmiM008568@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/kannel/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv8562 Modified Files: kannel.spec Added Files: kannel-1.4.0-depend.patch Log Message: Fix for FC3's gcc, at last. kannel-1.4.0-depend.patch: --- NEW FILE kannel-1.4.0-depend.patch --- # # improve resistence against broken gcc -MM behaviour # (observed with gcc 3.4.1) # 2005-01-12 stefan.radman at ctbto.org # --- Makefile.in.orig 2004-08-24 21:50:09.000000000 +0000 +++ Makefile.in 2005-01-13 16:23:56.123117718 +0000 @@ -311,7 +311,7 @@ depend .depend: wmlscript/wsgram.h gw-config.h for dir in $(srcdirs); do \ - $(MKDEPEND) $$dir/*.c | sed "s:^[^ ]:$$dir/&:"; done > .depend + $(MKDEPEND) $$dir/*.c | sed -e "s:^ *:\t:" -e "s:^[^\t#]:$$dir/&:" -e "s:^#.*::"; done > .depend include .depend libgw.a: $(gwobjs) Index: kannel.spec =================================================================== RCS file: /cvs/extras/rpms/kannel/devel/kannel.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kannel.spec 13 Jan 2005 18:06:30 -0000 1.3 +++ kannel.spec 17 Jan 2005 12:11:46 -0000 1.4 @@ -1,14 +1,16 @@ Summary: WAP and SMS gateway Name: kannel Version: 1.4.0 -Release: 1 +Release: 3 License: Kannel Group: System Environment/Daemons URL: http://www.kannel.org/ Source: http://www.kannel.org/download/%{version}/gateway-%{version}.tar.bz2 +Patch: kannel-1.4.0-depend.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: bison, byacc, flex, ImageMagick BuildRequires: libxml2-devel, openssl-devel, zlib-devel +BuildRequires: pcre-devel # DB backends BuildRequires: sqlite-devel # For the docs... I think we need transfig too, so disable for now. @@ -42,6 +44,7 @@ %prep %setup -n gateway-%{version} +%patch -p0 -b .depend %build @@ -93,8 +96,16 @@ %changelog +* Mon Jan 17 2005 Matthias Saou 1.4.0-3 +- Added Stefan Radman's patch for kannel bug #173 to fix .depend problem. + * Fri Dec 10 2004 Matthias Saou 1.4.0-1 - Update to 1.4.0. +- Remove the obsolete OpenSSL workaround. + +* Thu Nov 4 2004 Matthias Saou 1.3.2-4 +- Added pcre support, doc building (almost) and sqlite backend... + it still fails with a corrupt first line of .depend on FC3, though. * Tue Aug 24 2004 Matthias Saou 1.3.2-2 - Really comment out all scriplets, they're not yet used. From fedora-extras-commits at redhat.com Mon Jan 17 20:00:22 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 15:00:22 -0500 Subject: rpms/bash-completion/devel .cvsignore, 1.4, 1.5 bash-completion.spec, 1.4, 1.5 sources, 1.4, 1.5 bash-completion-openssl-cnf.patch, 1.1, NONE Message-ID: <200501172000.j0HK0MlM015274@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/bash-completion/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv15268 Modified Files: .cvsignore bash-completion.spec sources Removed Files: bash-completion-openssl-cnf.patch Log Message: Update to 20050112. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bash-completion/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 4 Jan 2005 23:23:51 -0000 1.4 +++ .cvsignore 17 Jan 2005 20:00:20 -0000 1.5 @@ -1 +1 @@ -bash-completion-20050103.tar.bz2 +bash-completion-20050112.tar.bz2 Index: bash-completion.spec =================================================================== RCS file: /cvs/extras/rpms/bash-completion/devel/bash-completion.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bash-completion.spec 4 Jan 2005 23:23:51 -0000 1.4 +++ bash-completion.spec 17 Jan 2005 20:00:20 -0000 1.5 @@ -1,5 +1,5 @@ Name: bash-completion -Version: 20050103 +Version: 20050112 Release: 1 Epoch: 0 Summary: Programmable completion for Bash @@ -7,9 +7,8 @@ Group: System Environment/Shells License: GPL URL: http://www.caliban.org/bash/ -Source0: http://www.caliban.org/files/bash/bash-completion-20050103.tar.bz2 +Source0: http://www.caliban.org/files/bash/bash-completion-20050112.tar.bz2 Source1: %{name}.profile -Patch0: %{name}-openssl-cnf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -22,7 +21,6 @@ %prep %setup -q -n bash_completion -%patch0 %build @@ -130,6 +128,9 @@ %changelog +* Thu Jan 13 2005 Ville Skytt?? - 0:20050112-1 +- Update to 20050112, openssl patch applied upstream. + * Wed Jan 5 2005 Ville Skytt?? - 0:20050103-1 - Update to 20050103. Index: sources =================================================================== RCS file: /cvs/extras/rpms/bash-completion/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Jan 2005 23:23:51 -0000 1.4 +++ sources 17 Jan 2005 20:00:20 -0000 1.5 @@ -1 +1 @@ -0ee7009b18ff862f8a63c2395e5fd100 bash-completion-20050103.tar.bz2 +82fbd64d75fb9942519763c7188407e7 bash-completion-20050112.tar.bz2 --- bash-completion-openssl-cnf.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jan 17 21:06:02 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:06:02 -0500 Subject: rpms/perl-Chart - New directory Message-ID: <200501172106.j0HL62YY017006@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Chart In directory cvs.fedora.redhat.com:/tmp/cvs-serv16999/perl-Chart Log Message: Directory /cvs/extras/rpms/perl-Chart added to the repository From fedora-extras-commits at redhat.com Mon Jan 17 21:06:02 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:06:02 -0500 Subject: rpms/perl-Chart/devel - New directory Message-ID: <200501172106.j0HL62Vj017009@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Chart/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv16999/perl-Chart/devel Log Message: Directory /cvs/extras/rpms/perl-Chart/devel added to the repository From fedora-extras-commits at redhat.com Mon Jan 17 21:06:21 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:06:21 -0500 Subject: rpms/perl-Chart Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501172106.j0HL6LAK017068@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Chart In directory cvs.fedora.redhat.com:/tmp/cvs-serv17059 Added Files: Makefile import.log Log Message: Setup of module perl-Chart --- NEW FILE Makefile --- # Top level Makefile for module perl-Chart all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 17 21:06:21 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:06:21 -0500 Subject: rpms/perl-Chart/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501172106.j0HL6L23017071@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Chart/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17059/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Chart --- NEW 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 Jan 17 21:07:18 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:07:18 -0500 Subject: rpms/perl-Chart import.log,1.1,1.2 Message-ID: <200501172107.j0HL7I6a017169@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Chart In directory cvs.fedora.redhat.com:/tmp/cvs-serv17160 Modified Files: import.log Log Message: auto-import perl-Chart-2.3-2 on branch devel from perl-Chart-2.3-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Chart/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 Jan 2005 21:06:19 -0000 1.1 +++ import.log 17 Jan 2005 21:07:15 -0000 1.2 @@ -0,0 +1 @@ +perl-Chart-2_3-2:HEAD:perl-Chart-2.3-2.src.rpm:1105996029 From fedora-extras-commits at redhat.com Mon Jan 17 21:07:18 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:07:18 -0500 Subject: rpms/perl-Chart/devel perl-Chart.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501172107.j0HL7IOQ017173@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Chart/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17160/devel Modified Files: .cvsignore sources Added Files: perl-Chart.spec Log Message: auto-import perl-Chart-2.3-2 on branch devel from perl-Chart-2.3-2.src.rpm --- NEW FILE perl-Chart.spec --- %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-Chart Version: 2.3 Release: 2 Epoch: 0 Summary: Perl module for producing many types of charts Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Chart/ Source0: http://www.cpan.org/authors/id/C/CH/CHARTGRP/Chart-2.3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1, perl(GD) >= 0:1.20 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. %prep %setup -q -n Chart-%{version} chmod 644 Chart/*.pm TODO doc/Documentation.pdf %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check || : make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README TODO doc/Documentation.pdf rgb.txt %{perl_vendorlib}/Chart %changelog * Sun Jul 11 2004 Ville Skytt?? - 0:2.3-2 - Bring up to date with current fedora.us Perl Spec template. * Thu Jan 15 2004 Ville Skytt?? - 0:2.3-0.fdr.1 - Update to 2.3. - Fix file permissions. * Sat Oct 11 2003 Ville Skytt?? - 0:2.2-0.fdr.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Chart/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jan 2005 21:06:19 -0000 1.1 +++ .cvsignore 17 Jan 2005 21:07:15 -0000 1.2 @@ -0,0 +1 @@ +Chart-2.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Chart/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jan 2005 21:06:19 -0000 1.1 +++ sources 17 Jan 2005 21:07:15 -0000 1.2 @@ -0,0 +1 @@ +809540667dd703353af30147ef27b67d Chart-2.3.tar.gz From fedora-extras-commits at redhat.com Mon Jan 17 21:09:15 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:09:15 -0500 Subject: rpms/perl-ExtUtils-CBuilder import.log,1.10,1.11 Message-ID: <200501172109.j0HL9FQe017285@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder In directory cvs.fedora.redhat.com:/tmp/cvs-serv17276 Modified Files: import.log Log Message: auto-import perl-ExtUtils-CBuilder-0.07-0.fdr.1.rh90 on branch RHL-9 from perl-ExtUtils-CBuilder-0.07-0.fdr.1.rh90.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/import.log,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- import.log 1 Jan 2005 13:01:58 -0000 1.10 +++ import.log 17 Jan 2005 21:09:13 -0000 1.11 @@ -7,3 +7,4 @@ perl-ExtUtils-CBuilder-0_06-0_fdr_1_rh90:RHL-9:perl-ExtUtils-CBuilder-0.06-0.fdr.1.rh90.src.rpm:1104584228 perl-ExtUtils-CBuilder-0_06-0_fdr_1_1:FC-1:perl-ExtUtils-CBuilder-0.06-0.fdr.1.1.src.rpm:1104584345 perl-ExtUtils-CBuilder-0_06-0_fdr_1_2:FC-2:perl-ExtUtils-CBuilder-0.06-0.fdr.1.2.src.rpm:1104584511 +perl-ExtUtils-CBuilder-0_07-0_fdr_1_rh90:RHL-9:perl-ExtUtils-CBuilder-0.07-0.fdr.1.rh90.src.rpm:1105996146 From fedora-extras-commits at redhat.com Mon Jan 17 21:09:15 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:09:15 -0500 Subject: rpms/perl-ExtUtils-CBuilder/RHL-9 ExtUtils-CBuilder-0.07-02-link.t.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 perl-ExtUtils-CBuilder.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200501172109.j0HL9FZh017289@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/RHL-9 In directory cvs.fedora.redhat.com:/tmp/cvs-serv17276/RHL-9 Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Added Files: ExtUtils-CBuilder-0.07-02-link.t.patch Log Message: auto-import perl-ExtUtils-CBuilder-0.07-0.fdr.1.rh90 on branch RHL-9 from perl-ExtUtils-CBuilder-0.07-0.fdr.1.rh90.src.rpm ExtUtils-CBuilder-0.07-02-link.t.patch: --- NEW FILE ExtUtils-CBuilder-0.07-02-link.t.patch --- diff -ruN ExtUtils-CBuilder-0.07-orig/t/02-link.t ExtUtils-CBuilder-0.07/t/02-link.t --- ExtUtils-CBuilder-0.07-orig/t/02-link.t 2005-01-13 03:52:30.000000000 +0000 +++ ExtUtils-CBuilder-0.07/t/02-link.t 2005-01-15 01:49:42.018884208 +0000 @@ -20,7 +20,7 @@ { local *FH; open FH, "> $source_file" or die "Can't create $source_file: $!"; - print FH "int main(char **argv) { return 11; }\n"; + print FH "int main(void) { return 11; }\n"; close FH; } ok -e $source_file; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/RHL-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 1 Jan 2005 12:57:15 -0000 1.4 +++ .cvsignore 17 Jan 2005 21:09:13 -0000 1.5 @@ -1 +1 @@ -ExtUtils-CBuilder-0.06.tar.gz +ExtUtils-CBuilder-0.07.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/RHL-9/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-ExtUtils-CBuilder.spec 1 Jan 2005 12:57:15 -0000 1.3 +++ perl-ExtUtils-CBuilder.spec 17 Jan 2005 21:09:13 -0000 1.4 @@ -1,7 +1,7 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-ExtUtils-CBuilder -Version: 0.06 +Version: 0.07 Release: 0.fdr.1.rh90 Epoch: 0 Summary: Compile and link C code for Perl modules @@ -9,7 +9,8 @@ Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/ExtUtils-CBuilder/ -Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.06.tar.gz +Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.07.tar.gz +Patch: ExtUtils-CBuilder-0.07-02-link.t.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -25,6 +26,7 @@ %prep %setup -q -n ExtUtils-CBuilder-%{version} +%patch -p1 %build @@ -56,6 +58,9 @@ %changelog +* Sat Jan 15 2005 Jose Pedro Oliveira - 0:0.07-0.fdr.1 +- Update to 0.07. + * Tue Dec 28 2004 Jose Pedro Oliveira - 0:0.06-0.fdr.1 - Update to 0.06. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/RHL-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Jan 2005 12:57:15 -0000 1.4 +++ sources 17 Jan 2005 21:09:13 -0000 1.5 @@ -1 +1 @@ -3aef9536908deb4194583c3cfd5281b1 ExtUtils-CBuilder-0.06.tar.gz +145c90ea9be4c13a6ad3a5d170413857 ExtUtils-CBuilder-0.07.tar.gz From fedora-extras-commits at redhat.com Mon Jan 17 21:10:14 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:10:14 -0500 Subject: rpms/perl-ExtUtils-CBuilder import.log,1.11,1.12 Message-ID: <200501172110.j0HLAEtn017408@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder In directory cvs.fedora.redhat.com:/tmp/cvs-serv17399 Modified Files: import.log Log Message: auto-import perl-ExtUtils-CBuilder-0.07-0.fdr.1.1 on branch FC-1 from perl-ExtUtils-CBuilder-0.07-0.fdr.1.1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/import.log,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- import.log 17 Jan 2005 21:09:13 -0000 1.11 +++ import.log 17 Jan 2005 21:10:12 -0000 1.12 @@ -8,3 +8,4 @@ perl-ExtUtils-CBuilder-0_06-0_fdr_1_1:FC-1:perl-ExtUtils-CBuilder-0.06-0.fdr.1.1.src.rpm:1104584345 perl-ExtUtils-CBuilder-0_06-0_fdr_1_2:FC-2:perl-ExtUtils-CBuilder-0.06-0.fdr.1.2.src.rpm:1104584511 perl-ExtUtils-CBuilder-0_07-0_fdr_1_rh90:RHL-9:perl-ExtUtils-CBuilder-0.07-0.fdr.1.rh90.src.rpm:1105996146 +perl-ExtUtils-CBuilder-0_07-0_fdr_1_1:FC-1:perl-ExtUtils-CBuilder-0.07-0.fdr.1.1.src.rpm:1105996205 From fedora-extras-commits at redhat.com Mon Jan 17 21:10:14 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:10:14 -0500 Subject: rpms/perl-ExtUtils-CBuilder/FC-1 ExtUtils-CBuilder-0.07-02-link.t.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 perl-ExtUtils-CBuilder.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200501172110.j0HLAEVd017412@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-1 In directory cvs.fedora.redhat.com:/tmp/cvs-serv17399/FC-1 Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Added Files: ExtUtils-CBuilder-0.07-02-link.t.patch Log Message: auto-import perl-ExtUtils-CBuilder-0.07-0.fdr.1.1 on branch FC-1 from perl-ExtUtils-CBuilder-0.07-0.fdr.1.1.src.rpm ExtUtils-CBuilder-0.07-02-link.t.patch: --- NEW FILE ExtUtils-CBuilder-0.07-02-link.t.patch --- diff -ruN ExtUtils-CBuilder-0.07-orig/t/02-link.t ExtUtils-CBuilder-0.07/t/02-link.t --- ExtUtils-CBuilder-0.07-orig/t/02-link.t 2005-01-13 03:52:30.000000000 +0000 +++ ExtUtils-CBuilder-0.07/t/02-link.t 2005-01-15 01:49:42.018884208 +0000 @@ -20,7 +20,7 @@ { local *FH; open FH, "> $source_file" or die "Can't create $source_file: $!"; - print FH "int main(char **argv) { return 11; }\n"; + print FH "int main(void) { return 11; }\n"; close FH; } ok -e $source_file; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-1/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 1 Jan 2005 12:59:11 -0000 1.4 +++ .cvsignore 17 Jan 2005 21:10:12 -0000 1.5 @@ -1 +1 @@ -ExtUtils-CBuilder-0.06.tar.gz +ExtUtils-CBuilder-0.07.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-1/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-ExtUtils-CBuilder.spec 1 Jan 2005 12:59:11 -0000 1.4 +++ perl-ExtUtils-CBuilder.spec 17 Jan 2005 21:10:12 -0000 1.5 @@ -1,7 +1,7 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-ExtUtils-CBuilder -Version: 0.06 +Version: 0.07 Release: 0.fdr.1.1 Epoch: 0 Summary: Compile and link C code for Perl modules @@ -9,7 +9,8 @@ Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/ExtUtils-CBuilder/ -Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.06.tar.gz +Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.07.tar.gz +Patch: ExtUtils-CBuilder-0.07-02-link.t.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -25,6 +26,7 @@ %prep %setup -q -n ExtUtils-CBuilder-%{version} +%patch -p1 %build @@ -56,6 +58,9 @@ %changelog +* Sat Jan 15 2005 Jose Pedro Oliveira - 0:0.07-0.fdr.1 +- Update to 0.07. + * Tue Dec 28 2004 Jose Pedro Oliveira - 0:0.06-0.fdr.1 - Update to 0.06. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-1/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Jan 2005 12:59:11 -0000 1.4 +++ sources 17 Jan 2005 21:10:12 -0000 1.5 @@ -1 +1 @@ -3aef9536908deb4194583c3cfd5281b1 ExtUtils-CBuilder-0.06.tar.gz +145c90ea9be4c13a6ad3a5d170413857 ExtUtils-CBuilder-0.07.tar.gz From fedora-extras-commits at redhat.com Mon Jan 17 21:11:12 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:11:12 -0500 Subject: rpms/perl-ExtUtils-CBuilder import.log,1.12,1.13 Message-ID: <200501172111.j0HLBCOO017537@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder In directory cvs.fedora.redhat.com:/tmp/cvs-serv17528 Modified Files: import.log Log Message: auto-import perl-ExtUtils-CBuilder-0.07-0.fdr.1.2 on branch FC-2 from perl-ExtUtils-CBuilder-0.07-0.fdr.1.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/import.log,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- import.log 17 Jan 2005 21:10:12 -0000 1.12 +++ import.log 17 Jan 2005 21:11:10 -0000 1.13 @@ -9,3 +9,4 @@ perl-ExtUtils-CBuilder-0_06-0_fdr_1_2:FC-2:perl-ExtUtils-CBuilder-0.06-0.fdr.1.2.src.rpm:1104584511 perl-ExtUtils-CBuilder-0_07-0_fdr_1_rh90:RHL-9:perl-ExtUtils-CBuilder-0.07-0.fdr.1.rh90.src.rpm:1105996146 perl-ExtUtils-CBuilder-0_07-0_fdr_1_1:FC-1:perl-ExtUtils-CBuilder-0.07-0.fdr.1.1.src.rpm:1105996205 +perl-ExtUtils-CBuilder-0_07-0_fdr_1_2:FC-2:perl-ExtUtils-CBuilder-0.07-0.fdr.1.2.src.rpm:1105996263 From fedora-extras-commits at redhat.com Mon Jan 17 21:11:12 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:11:12 -0500 Subject: rpms/perl-ExtUtils-CBuilder/FC-2 ExtUtils-CBuilder-0.07-02-link.t.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 perl-ExtUtils-CBuilder.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200501172111.j0HLBCLI017541@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv17528/FC-2 Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Added Files: ExtUtils-CBuilder-0.07-02-link.t.patch Log Message: auto-import perl-ExtUtils-CBuilder-0.07-0.fdr.1.2 on branch FC-2 from perl-ExtUtils-CBuilder-0.07-0.fdr.1.2.src.rpm ExtUtils-CBuilder-0.07-02-link.t.patch: --- NEW FILE ExtUtils-CBuilder-0.07-02-link.t.patch --- diff -ruN ExtUtils-CBuilder-0.07-orig/t/02-link.t ExtUtils-CBuilder-0.07/t/02-link.t --- ExtUtils-CBuilder-0.07-orig/t/02-link.t 2005-01-13 03:52:30.000000000 +0000 +++ ExtUtils-CBuilder-0.07/t/02-link.t 2005-01-15 01:49:42.018884208 +0000 @@ -20,7 +20,7 @@ { local *FH; open FH, "> $source_file" or die "Can't create $source_file: $!"; - print FH "int main(char **argv) { return 11; }\n"; + print FH "int main(void) { return 11; }\n"; close FH; } ok -e $source_file; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-2/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 1 Jan 2005 13:01:58 -0000 1.4 +++ .cvsignore 17 Jan 2005 21:11:10 -0000 1.5 @@ -1 +1 @@ -ExtUtils-CBuilder-0.06.tar.gz +ExtUtils-CBuilder-0.07.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-2/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-ExtUtils-CBuilder.spec 1 Jan 2005 13:01:58 -0000 1.5 +++ perl-ExtUtils-CBuilder.spec 17 Jan 2005 21:11:10 -0000 1.6 @@ -1,7 +1,7 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-ExtUtils-CBuilder -Version: 0.06 +Version: 0.07 Release: 0.fdr.1.2 Epoch: 0 Summary: Compile and link C code for Perl modules @@ -9,7 +9,8 @@ Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/ExtUtils-CBuilder/ -Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.06.tar.gz +Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.07.tar.gz +Patch: ExtUtils-CBuilder-0.07-02-link.t.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -25,6 +26,7 @@ %prep %setup -q -n ExtUtils-CBuilder-%{version} +%patch -p1 %build @@ -56,6 +58,9 @@ %changelog +* Sat Jan 15 2005 Jose Pedro Oliveira - 0:0.07-0.fdr.1 +- Update to 0.07. + * Tue Dec 28 2004 Jose Pedro Oliveira - 0:0.06-0.fdr.1 - Update to 0.06. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-2/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Jan 2005 13:01:58 -0000 1.4 +++ sources 17 Jan 2005 21:11:10 -0000 1.5 @@ -1 +1 @@ -3aef9536908deb4194583c3cfd5281b1 ExtUtils-CBuilder-0.06.tar.gz +145c90ea9be4c13a6ad3a5d170413857 ExtUtils-CBuilder-0.07.tar.gz From fedora-extras-commits at redhat.com Mon Jan 17 21:12:24 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:12:24 -0500 Subject: rpms/perl-GDGraph3d/FC-1 .cvsignore, 1.2, 1.3 perl-GDGraph3d.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200501172112.j0HLCOtq017658@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-GDGraph3d/FC-1 In directory cvs.fedora.redhat.com:/tmp/cvs-serv17646/FC-1 Modified Files: .cvsignore perl-GDGraph3d.spec sources Log Message: auto-import perl-GDGraph3d-0.63-0.fdr.2.1 on branch FC-1 from perl-GDGraph3d-0.63-0.fdr.2.1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph3d/FC-1/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:01:02 -0000 1.2 +++ .cvsignore 17 Jan 2005 21:12:22 -0000 1.3 @@ -1 +1 @@ -GDGraph3d-0.56.tar.gz +GD-Graph3d-0.63.tar.gz Index: perl-GDGraph3d.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph3d/FC-1/perl-GDGraph3d.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-GDGraph3d.spec 8 Nov 2004 05:01:02 -0000 1.1 +++ perl-GDGraph3d.spec 17 Jan 2005 21:12:22 -0000 1.2 @@ -1,21 +1,22 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-GDGraph3d -Version: 0.56 -Release: 0.fdr.3.1 +Version: 0.63 +Release: 0.fdr.2.1 Epoch: 0 Summary: 3D graph generation package for Perl Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/GDGraph3d/ -Source0: http://www.cpan.org/authors/id/W/WA/WADG/GDGraph3d-0.56.tar.gz +Source0: http://www.cpan.org/authors/id/W/WA/WADG/GD-Graph3d-0.63.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 BuildRequires: perl(GD), perl(GD::Text), perl(GD::Graph) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Provides: perl-GD-Graph3d = %{epoch}:%{version}-%{release} %description This is the GD::Graph3d extensions module. It provides 3D graphs for @@ -24,7 +25,7 @@ %prep -%setup -q -n GDGraph3d-%{version} +%setup -q -n GD-Graph3d-%{version} %build @@ -50,16 +51,22 @@ %files %defattr(-,root,root,-) -%doc Changes README +%doc Changes %{perl_vendorlib}/GD/ %{_mandir}/man3/*.3* %changelog -* Sun Jul 11 2004 Jose Pedro Oliveira - 0:0.56-0.fdr.3 +* Sat Jan 15 2005 Jose Pedro Oliveira - 0:0.63-0.fdr.2 +- Added versioning to the Provides statement (bug 2371). + +* Sun Jan 9 2005 Jose Pedro Oliveira - 0:0.63-0.fdr.1 +- Update to 0.63. + +* Sun Jul 11 2004 Jose Pedro Oliveira - 0:0.56-0.fdr.3 - Unowned directory: %%{perl_vendorlib}/GD (see bug 1800 comment #1). -* Wed Jun 30 2004 Jose Pedro Oliveira - 0:0.56-0.fdr.2 +* Wed Jun 30 2004 Jose Pedro Oliveira - 0:0.56-0.fdr.2 - Bring up to date with current fedora.us perl spec template. * Sun Oct 12 2003 Ville Skytt?? - 0:0.56-0.fdr.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph3d/FC-1/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:01:02 -0000 1.2 +++ sources 17 Jan 2005 21:12:22 -0000 1.3 @@ -1 +1 @@ -294dabc54c640ee62046932e7c4c6d1c GDGraph3d-0.56.tar.gz +f866dcdd1e7e2056bb946ab7ac3fe37b GD-Graph3d-0.63.tar.gz From fedora-extras-commits at redhat.com Mon Jan 17 21:12:24 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:12:24 -0500 Subject: rpms/perl-GDGraph3d import.log,1.3,1.4 Message-ID: <200501172112.j0HLCOu8017655@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-GDGraph3d In directory cvs.fedora.redhat.com:/tmp/cvs-serv17646 Modified Files: import.log Log Message: auto-import perl-GDGraph3d-0.63-0.fdr.2.1 on branch FC-1 from perl-GDGraph3d-0.63-0.fdr.2.1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph3d/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 8 Nov 2004 05:01:08 -0000 1.3 +++ import.log 17 Jan 2005 21:12:22 -0000 1.4 @@ -1,2 +1,3 @@ perl-GDGraph3d-0_56-0_fdr_3_1:HEAD:perl-GDGraph3d-0.56-0.fdr.3.1.src.rpm:1099890062 perl-GDGraph3d-0_56-0_fdr_3_2:HEAD:perl-GDGraph3d-0.56-0.fdr.3.2.src.rpm:1099890068 +perl-GDGraph3d-0_63-0_fdr_2_1:FC-1:perl-GDGraph3d-0.63-0.fdr.2.1.src.rpm:1105996335 From fedora-extras-commits at redhat.com Mon Jan 17 21:13:14 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:13:14 -0500 Subject: rpms/perl-GDGraph3d import.log,1.4,1.5 Message-ID: <200501172113.j0HLDER5017765@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-GDGraph3d In directory cvs.fedora.redhat.com:/tmp/cvs-serv17756 Modified Files: import.log Log Message: auto-import perl-GDGraph3d-0.63-0.fdr.2.2 on branch FC-2 from perl-GDGraph3d-0.63-0.fdr.2.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph3d/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 17 Jan 2005 21:12:22 -0000 1.4 +++ import.log 17 Jan 2005 21:13:12 -0000 1.5 @@ -1,3 +1,4 @@ perl-GDGraph3d-0_56-0_fdr_3_1:HEAD:perl-GDGraph3d-0.56-0.fdr.3.1.src.rpm:1099890062 perl-GDGraph3d-0_56-0_fdr_3_2:HEAD:perl-GDGraph3d-0.56-0.fdr.3.2.src.rpm:1099890068 perl-GDGraph3d-0_63-0_fdr_2_1:FC-1:perl-GDGraph3d-0.63-0.fdr.2.1.src.rpm:1105996335 +perl-GDGraph3d-0_63-0_fdr_2_2:FC-2:perl-GDGraph3d-0.63-0.fdr.2.2.src.rpm:1105996385 From fedora-extras-commits at redhat.com Mon Jan 17 21:13:14 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:13:14 -0500 Subject: rpms/perl-GDGraph3d/FC-2 .cvsignore, 1.2, 1.3 perl-GDGraph3d.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200501172113.j0HLDE1o017769@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-GDGraph3d/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv17756/FC-2 Modified Files: .cvsignore perl-GDGraph3d.spec sources Log Message: auto-import perl-GDGraph3d-0.63-0.fdr.2.2 on branch FC-2 from perl-GDGraph3d-0.63-0.fdr.2.2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph3d/FC-2/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:01:02 -0000 1.2 +++ .cvsignore 17 Jan 2005 21:13:12 -0000 1.3 @@ -1 +1 @@ -GDGraph3d-0.56.tar.gz +GD-Graph3d-0.63.tar.gz Index: perl-GDGraph3d.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph3d/FC-2/perl-GDGraph3d.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-GDGraph3d.spec 8 Nov 2004 05:01:08 -0000 1.2 +++ perl-GDGraph3d.spec 17 Jan 2005 21:13:12 -0000 1.3 @@ -1,21 +1,22 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-GDGraph3d -Version: 0.56 -Release: 0.fdr.3.2 +Version: 0.63 +Release: 0.fdr.2.2 Epoch: 0 Summary: 3D graph generation package for Perl Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/GDGraph3d/ -Source0: http://www.cpan.org/authors/id/W/WA/WADG/GDGraph3d-0.56.tar.gz +Source0: http://www.cpan.org/authors/id/W/WA/WADG/GD-Graph3d-0.63.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 BuildRequires: perl(GD), perl(GD::Text), perl(GD::Graph) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Provides: perl-GD-Graph3d = %{epoch}:%{version}-%{release} %description This is the GD::Graph3d extensions module. It provides 3D graphs for @@ -24,7 +25,7 @@ %prep -%setup -q -n GDGraph3d-%{version} +%setup -q -n GD-Graph3d-%{version} %build @@ -50,16 +51,22 @@ %files %defattr(-,root,root,-) -%doc Changes README +%doc Changes %{perl_vendorlib}/GD/ %{_mandir}/man3/*.3* %changelog -* Sun Jul 11 2004 Jose Pedro Oliveira - 0:0.56-0.fdr.3 +* Sat Jan 15 2005 Jose Pedro Oliveira - 0:0.63-0.fdr.2 +- Added versioning to the Provides statement (bug 2371). + +* Sun Jan 9 2005 Jose Pedro Oliveira - 0:0.63-0.fdr.1 +- Update to 0.63. + +* Sun Jul 11 2004 Jose Pedro Oliveira - 0:0.56-0.fdr.3 - Unowned directory: %%{perl_vendorlib}/GD (see bug 1800 comment #1). -* Wed Jun 30 2004 Jose Pedro Oliveira - 0:0.56-0.fdr.2 +* Wed Jun 30 2004 Jose Pedro Oliveira - 0:0.56-0.fdr.2 - Bring up to date with current fedora.us perl spec template. * Sun Oct 12 2003 Ville Skytt?? - 0:0.56-0.fdr.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph3d/FC-2/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:01:02 -0000 1.2 +++ sources 17 Jan 2005 21:13:12 -0000 1.3 @@ -1 +1 @@ -294dabc54c640ee62046932e7c4c6d1c GDGraph3d-0.56.tar.gz +f866dcdd1e7e2056bb946ab7ac3fe37b GD-Graph3d-0.63.tar.gz From fedora-extras-commits at redhat.com Mon Jan 17 21:14:54 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:14:54 -0500 Subject: rpms/perl-GDGraph3d import.log,1.5,1.6 Message-ID: <200501172114.j0HLEsQf017880@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-GDGraph3d In directory cvs.fedora.redhat.com:/tmp/cvs-serv17871 Modified Files: import.log Log Message: auto-import perl-GDGraph3d-0.63-2 on branch devel from perl-GDGraph3d-0.63-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph3d/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 17 Jan 2005 21:13:12 -0000 1.5 +++ import.log 17 Jan 2005 21:14:52 -0000 1.6 @@ -2,3 +2,4 @@ perl-GDGraph3d-0_56-0_fdr_3_2:HEAD:perl-GDGraph3d-0.56-0.fdr.3.2.src.rpm:1099890068 perl-GDGraph3d-0_63-0_fdr_2_1:FC-1:perl-GDGraph3d-0.63-0.fdr.2.1.src.rpm:1105996335 perl-GDGraph3d-0_63-0_fdr_2_2:FC-2:perl-GDGraph3d-0.63-0.fdr.2.2.src.rpm:1105996385 +perl-GDGraph3d-0_63-2:HEAD:perl-GDGraph3d-0.63-2.src.rpm:1105996485 From fedora-extras-commits at redhat.com Mon Jan 17 21:14:54 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:14:54 -0500 Subject: rpms/perl-GDGraph3d/devel .cvsignore, 1.2, 1.3 perl-GDGraph3d.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200501172114.j0HLEskg017884@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-GDGraph3d/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17871/devel Modified Files: .cvsignore perl-GDGraph3d.spec sources Log Message: auto-import perl-GDGraph3d-0.63-2 on branch devel from perl-GDGraph3d-0.63-2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph3d/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:01:02 -0000 1.2 +++ .cvsignore 17 Jan 2005 21:14:52 -0000 1.3 @@ -1 +1 @@ -GDGraph3d-0.56.tar.gz +GD-Graph3d-0.63.tar.gz Index: perl-GDGraph3d.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph3d/devel/perl-GDGraph3d.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-GDGraph3d.spec 10 Dec 2004 22:03:08 -0000 1.3 +++ perl-GDGraph3d.spec 17 Jan 2005 21:14:52 -0000 1.4 @@ -1,21 +1,22 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-GDGraph3d -Version: 0.56 -Release: 3 +Version: 0.63 +Release: 2 Epoch: 0 Summary: 3D graph generation package for Perl Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/GDGraph3d/ -Source0: http://www.cpan.org/authors/id/W/WA/WADG/GDGraph3d-0.56.tar.gz +Source0: http://www.cpan.org/authors/id/W/WA/WADG/GD-Graph3d-0.63.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 BuildRequires: perl(GD), perl(GD::Text), perl(GD::Graph) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Provides: perl-GD-Graph3d = %{epoch}:%{version}-%{release} %description This is the GD::Graph3d extensions module. It provides 3D graphs for @@ -24,7 +25,7 @@ %prep -%setup -q -n GDGraph3d-%{version} +%setup -q -n GD-Graph3d-%{version} %build @@ -50,16 +51,22 @@ %files %defattr(-,root,root,-) -%doc Changes README +%doc Changes %{perl_vendorlib}/GD/ %{_mandir}/man3/*.3* %changelog -* Sun Jul 11 2004 Jose Pedro Oliveira - 0:0.56-0.fdr.3 +* Sat Jan 15 2005 Jose Pedro Oliveira - 0:0.63-2 +- Added versioning to the Provides statement (bug 2371). + +* Sun Jan 9 2005 Jose Pedro Oliveira - 0:0.63-0.fdr.1 +- Update to 0.63. + +* Sun Jul 11 2004 Jose Pedro Oliveira - 0:0.56-0.fdr.3 - Unowned directory: %%{perl_vendorlib}/GD (see bug 1800 comment #1). -* Wed Jun 30 2004 Jose Pedro Oliveira - 0:0.56-0.fdr.2 +* Wed Jun 30 2004 Jose Pedro Oliveira - 0:0.56-0.fdr.2 - Bring up to date with current fedora.us perl spec template. * Sun Oct 12 2003 Ville Skytt?? - 0:0.56-0.fdr.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph3d/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:01:02 -0000 1.2 +++ sources 17 Jan 2005 21:14:52 -0000 1.3 @@ -1 +1 @@ -294dabc54c640ee62046932e7c4c6d1c GDGraph3d-0.56.tar.gz +f866dcdd1e7e2056bb946ab7ac3fe37b GD-Graph3d-0.63.tar.gz From fedora-extras-commits at redhat.com Mon Jan 17 21:16:39 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:16:39 -0500 Subject: rpms/perl-ExtUtils-CBuilder import.log,1.13,1.14 Message-ID: <200501172116.j0HLGdnb018003@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder In directory cvs.fedora.redhat.com:/tmp/cvs-serv17994 Modified Files: import.log Log Message: auto-import perl-ExtUtils-CBuilder-0.07-1 on branch devel from perl-ExtUtils-CBuilder-0.07-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/import.log,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- import.log 17 Jan 2005 21:11:10 -0000 1.13 +++ import.log 17 Jan 2005 21:16:37 -0000 1.14 @@ -10,3 +10,4 @@ perl-ExtUtils-CBuilder-0_07-0_fdr_1_rh90:RHL-9:perl-ExtUtils-CBuilder-0.07-0.fdr.1.rh90.src.rpm:1105996146 perl-ExtUtils-CBuilder-0_07-0_fdr_1_1:FC-1:perl-ExtUtils-CBuilder-0.07-0.fdr.1.1.src.rpm:1105996205 perl-ExtUtils-CBuilder-0_07-0_fdr_1_2:FC-2:perl-ExtUtils-CBuilder-0.07-0.fdr.1.2.src.rpm:1105996263 +perl-ExtUtils-CBuilder-0_07-1:HEAD:perl-ExtUtils-CBuilder-0.07-1.src.rpm:1105996590 From fedora-extras-commits at redhat.com Mon Jan 17 21:16:39 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 16:16:39 -0500 Subject: rpms/perl-ExtUtils-CBuilder/devel ExtUtils-CBuilder-0.07-02-link.t.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 perl-ExtUtils-CBuilder.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200501172116.j0HLGdMX018007@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17994/devel Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Added Files: ExtUtils-CBuilder-0.07-02-link.t.patch Log Message: auto-import perl-ExtUtils-CBuilder-0.07-1 on branch devel from perl-ExtUtils-CBuilder-0.07-1.src.rpm ExtUtils-CBuilder-0.07-02-link.t.patch: --- NEW FILE ExtUtils-CBuilder-0.07-02-link.t.patch --- diff -ruN ExtUtils-CBuilder-0.07-orig/t/02-link.t ExtUtils-CBuilder-0.07/t/02-link.t --- ExtUtils-CBuilder-0.07-orig/t/02-link.t 2005-01-13 03:52:30.000000000 +0000 +++ ExtUtils-CBuilder-0.07/t/02-link.t 2005-01-15 01:49:42.018884208 +0000 @@ -20,7 +20,7 @@ { local *FH; open FH, "> $source_file" or die "Can't create $source_file: $!"; - print FH "int main(char **argv) { return 11; }\n"; + print FH "int main(void) { return 11; }\n"; close FH; } ok -e $source_file; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 1 Jan 2005 13:15:00 -0000 1.4 +++ .cvsignore 17 Jan 2005 21:16:37 -0000 1.5 @@ -1 +1 @@ -ExtUtils-CBuilder-0.06.tar.gz +ExtUtils-CBuilder-0.07.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-ExtUtils-CBuilder.spec 1 Jan 2005 13:15:00 -0000 1.6 +++ perl-ExtUtils-CBuilder.spec 17 Jan 2005 21:16:37 -0000 1.7 @@ -1,7 +1,7 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-ExtUtils-CBuilder -Version: 0.06 +Version: 0.07 Release: 1 Epoch: 0 Summary: Compile and link C code for Perl modules @@ -9,7 +9,8 @@ Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/ExtUtils-CBuilder/ -Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.06.tar.gz +Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.07.tar.gz +Patch: ExtUtils-CBuilder-0.07-02-link.t.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -25,6 +26,7 @@ %prep %setup -q -n ExtUtils-CBuilder-%{version} +%patch -p1 %build @@ -56,7 +58,10 @@ %changelog -* Tue Dec 28 2004 Jose Pedro Oliveira - 0:0.06-1 +* Sat Jan 15 2005 Jose Pedro Oliveira - 0:0.07-1 +- Update to 0.07. + +* Tue Dec 28 2004 Jose Pedro Oliveira - 0:0.06-0.fdr.1 - Update to 0.06. * Mon Nov 29 2004 Ville Skytt?? - 0:0.05-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Jan 2005 13:15:00 -0000 1.4 +++ sources 17 Jan 2005 21:16:37 -0000 1.5 @@ -1 +1 @@ -3aef9536908deb4194583c3cfd5281b1 ExtUtils-CBuilder-0.06.tar.gz +145c90ea9be4c13a6ad3a5d170413857 ExtUtils-CBuilder-0.07.tar.gz From fedora-extras-commits at redhat.com Mon Jan 17 22:01:28 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 17:01:28 -0500 Subject: rpms/apt/devel apt-0.5.15cnc6-pymake2.patch, NONE, 1.1 apt-0.5.15cnc6-python-update.patch, NONE, 1.1 apt-0.5.15cnc6-r362.patch, NONE, 1.1 apt-0.5.15cnc6-scriptdir.patch, NONE, 1.1 apt.cron, NONE, 1.1 apt.init, NONE, 1.1 apt.sysconfig, NONE, 1.1 comps2prio.xsl, NONE, 1.1 rpmpriorities.1, 1.2, 1.3 rpmpriorities.2, 1.2, 1.3 rpmpriorities.3, NONE, 1.1 rpmpriorities.Rawhide, NONE, 1.1 apt-0.5.15cnc6-pymake.patch, 1.1, 1.2 apt.spec, 1.4, 1.5 default.conf, 1.1, 1.2 mirror-select.conf, 1.2, 1.3 upgradevirt.lua, 1.1, 1.2 apt-0.5.15cnc6-build-dep-fixdeps.patch, 1.1, NONE apt-0.5.5-rpmdir-symlink.patch, 1.1, NONE rpmpriorities, 1.1, NONE Message-ID: <200501172201.j0HM1SDp018944@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/apt/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv18331 Modified Files: apt-0.5.15cnc6-pymake.patch apt.spec default.conf mirror-select.conf upgradevirt.lua Added Files: apt-0.5.15cnc6-pymake2.patch apt-0.5.15cnc6-python-update.patch apt-0.5.15cnc6-r362.patch apt-0.5.15cnc6-scriptdir.patch apt.cron apt.init apt.sysconfig comps2prio.xsl rpmpriorities.1 rpmpriorities.2 rpmpriorities.3 rpmpriorities.Rawhide Removed Files: apt-0.5.15cnc6-build-dep-fixdeps.patch apt-0.5.5-rpmdir-symlink.patch rpmpriorities Log Message: Per Panu's approval, bring in lots of accumulated work from him, and add some bits from yours truly. apt-0.5.15cnc6-pymake2.patch: --- NEW FILE apt-0.5.15cnc6-pymake2.patch --- --- python/Makefile~ 2004-03-19 14:51:39.000000000 +0200 +++ python/Makefile 2005-01-16 11:55:44.552686258 +0200 @@ -8,8 +8,8 @@ #SWIG = /var/tmp/swig/BUILD/SWIG-1.3.16/swig LUAFLAGS = -DWITH_LUA -PYTHONVER = $(shell python -c "import sys; v=sys.version_info[:2]; print '%d.%d'%v" 2>/dev/null || echo NONE) -PYTHONFLAGS=-I/usr/include/python$(PYTHONVER) +PYTHON = python +PYTHONFLAGS = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_inc; print '-I' + get_python_inc(1)") all: $(MODULES) @@ -25,4 +25,4 @@ rm -f *.cxx distclean: clean - rm -f $(MODULES) *.pyc _*.so + rm -f $(MODULES) *.pyc *.pyo *.so apt-0.5.15cnc6-python-update.patch: --- NEW FILE apt-0.5.15cnc6-python-update.patch --- --- apt-0.5.15cnc6/python/apt.py.pyupdate 2004-08-14 16:35:16.427061350 +0300 +++ apt-0.5.15cnc6/python/apt.py 2004-08-14 16:35:17.747778020 +0300 @@ -1,7 +1,9 @@ # This file was created automatically by SWIG. # Don't modify this file, modify the SWIG interface instead. # This file is compatible with both classic and new-style classes. + import _apt + def _swig_setattr(self,class_type,name,value): if (name == "this"): if isinstance(value, class_type): @@ -25,22 +27,25 @@ except AttributeError: class _object : pass _newclass = 0 +del types -pkgInit = _apt.pkgInit +pkgInit = _apt.pkgInit APT_PKG_MAJOR = _apt.APT_PKG_MAJOR APT_PKG_MINOR = _apt.APT_PKG_MINOR APT_PKG_RELEASE = _apt.APT_PKG_RELEASE + pkgInitConfig = _apt.pkgInitConfig pkgInitSystem = _apt.pkgInitSystem - class pkgCache(_object): __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, pkgCache, name, value) __swig_getmethods__ = {} __getattr__ = lambda self, name: _swig_getattr(self, pkgCache, name) + def __repr__(self): + return "" % (self.this,) DepDepends = _apt.pkgCache_DepDepends DepPreDepends = _apt.pkgCache_DepPreDepends DepSuggests = _apt.pkgCache_DepSuggests @@ -83,171 +88,172 @@ FlagNotAutomatic = _apt.pkgCache_FlagNotAutomatic __swig_setmethods__["HeaderP"] = _apt.pkgCache_HeaderP_set __swig_getmethods__["HeaderP"] = _apt.pkgCache_HeaderP_get - if _newclass:HeaderP = property(_apt.pkgCache_HeaderP_get,_apt.pkgCache_HeaderP_set) + if _newclass:HeaderP = property(_apt.pkgCache_HeaderP_get, _apt.pkgCache_HeaderP_set) __swig_setmethods__["PkgP"] = _apt.pkgCache_PkgP_set __swig_getmethods__["PkgP"] = _apt.pkgCache_PkgP_get - if _newclass:PkgP = property(_apt.pkgCache_PkgP_get,_apt.pkgCache_PkgP_set) + if _newclass:PkgP = property(_apt.pkgCache_PkgP_get, _apt.pkgCache_PkgP_set) __swig_setmethods__["VerFileP"] = _apt.pkgCache_VerFileP_set __swig_getmethods__["VerFileP"] = _apt.pkgCache_VerFileP_get - if _newclass:VerFileP = property(_apt.pkgCache_VerFileP_get,_apt.pkgCache_VerFileP_set) + if _newclass:VerFileP = property(_apt.pkgCache_VerFileP_get, _apt.pkgCache_VerFileP_set) __swig_setmethods__["PkgFileP"] = _apt.pkgCache_PkgFileP_set __swig_getmethods__["PkgFileP"] = _apt.pkgCache_PkgFileP_get - if _newclass:PkgFileP = property(_apt.pkgCache_PkgFileP_get,_apt.pkgCache_PkgFileP_set) + if _newclass:PkgFileP = property(_apt.pkgCache_PkgFileP_get, _apt.pkgCache_PkgFileP_set) __swig_setmethods__["VerP"] = _apt.pkgCache_VerP_set __swig_getmethods__["VerP"] = _apt.pkgCache_VerP_get - if _newclass:VerP = property(_apt.pkgCache_VerP_get,_apt.pkgCache_VerP_set) + if _newclass:VerP = property(_apt.pkgCache_VerP_get, _apt.pkgCache_VerP_set) __swig_setmethods__["ProvideP"] = _apt.pkgCache_ProvideP_set __swig_getmethods__["ProvideP"] = _apt.pkgCache_ProvideP_get - if _newclass:ProvideP = property(_apt.pkgCache_ProvideP_get,_apt.pkgCache_ProvideP_set) + if _newclass:ProvideP = property(_apt.pkgCache_ProvideP_get, _apt.pkgCache_ProvideP_set) __swig_setmethods__["DepP"] = _apt.pkgCache_DepP_set __swig_getmethods__["DepP"] = _apt.pkgCache_DepP_get - if _newclass:DepP = property(_apt.pkgCache_DepP_get,_apt.pkgCache_DepP_set) + if _newclass:DepP = property(_apt.pkgCache_DepP_get, _apt.pkgCache_DepP_set) __swig_setmethods__["StringItemP"] = _apt.pkgCache_StringItemP_set __swig_getmethods__["StringItemP"] = _apt.pkgCache_StringItemP_get - if _newclass:StringItemP = property(_apt.pkgCache_StringItemP_get,_apt.pkgCache_StringItemP_set) + if _newclass:StringItemP = property(_apt.pkgCache_StringItemP_get, _apt.pkgCache_StringItemP_set) __swig_setmethods__["StrP"] = _apt.pkgCache_StrP_set __swig_getmethods__["StrP"] = _apt.pkgCache_StrP_get - if _newclass:StrP = property(_apt.pkgCache_StrP_get,_apt.pkgCache_StrP_set) - def ReMap(*args): return apply(_apt.pkgCache_ReMap,args) - def Sync(*args): return apply(_apt.pkgCache_Sync,args) - def GetMap(*args): return apply(_apt.pkgCache_GetMap,args) - def DataEnd(*args): return apply(_apt.pkgCache_DataEnd,args) - def Hash(*args): return apply(_apt.pkgCache_Hash,args) - def Priority(*args): return apply(_apt.pkgCache_Priority,args) - def FindPkg(*args): return apply(_apt.pkgCache_FindPkg,args) - def FindPackage(*args): return apply(_apt.pkgCache_FindPackage,args) - def Head(*args): return apply(_apt.pkgCache_Head,args) - def PkgIter(*args): return apply(_apt.pkgCache_PkgIter,args) - def FileIter(*args): return apply(_apt.pkgCache_FileIter,args) + if _newclass:StrP = property(_apt.pkgCache_StrP_get, _apt.pkgCache_StrP_set) + def ReMap(*args): return _apt.pkgCache_ReMap(*args) + def Sync(*args): return _apt.pkgCache_Sync(*args) + def GetMap(*args): return _apt.pkgCache_GetMap(*args) + def DataEnd(*args): return _apt.pkgCache_DataEnd(*args) + def Hash(*args): return _apt.pkgCache_Hash(*args) + def Priority(*args): return _apt.pkgCache_Priority(*args) + def FindPkg(*args): return _apt.pkgCache_FindPkg(*args) + def FindPackage(*args): return _apt.pkgCache_FindPackage(*args) + def Head(*args): return _apt.pkgCache_Head(*args) + def PkgIter(*args): return _apt.pkgCache_PkgIter(*args) + def FileIter(*args): return _apt.pkgCache_FileIter(*args) __swig_setmethods__["VS"] = _apt.pkgCache_VS_set __swig_getmethods__["VS"] = _apt.pkgCache_VS_get - if _newclass:VS = property(_apt.pkgCache_VS_get,_apt.pkgCache_VS_set) + if _newclass:VS = property(_apt.pkgCache_VS_get, _apt.pkgCache_VS_set) __swig_getmethods__["CompTypeDeb"] = lambda x: _apt.pkgCache_CompTypeDeb if _newclass:CompTypeDeb = staticmethod(_apt.pkgCache_CompTypeDeb) __swig_getmethods__["CompType"] = lambda x: _apt.pkgCache_CompType if _newclass:CompType = staticmethod(_apt.pkgCache_CompType) __swig_getmethods__["DepType"] = lambda x: _apt.pkgCache_DepType if _newclass:DepType = staticmethod(_apt.pkgCache_DepType) - def __init__(self,*args): - self.this = apply(_apt.new_pkgCache,args) - self.thisown = 1 - def __del__(self, destroy= _apt.delete_pkgCache): + def __init__(self, *args): + _swig_setattr(self, pkgCache, 'this', _apt.new_pkgCache(*args)) + _swig_setattr(self, pkgCache, 'thisown', 1) + def __del__(self, destroy=_apt.delete_pkgCache): try: if self.thisown: destroy(self) except: pass - def __repr__(self): - return "" % (self.this,) class pkgCachePtr(pkgCache): - def __init__(self,this): - self.this = this - if not hasattr(self,"thisown"): self.thisown = 0 - self.__class__ = pkgCache + def __init__(self, this): + _swig_setattr(self, pkgCache, 'this', this) + if not hasattr(self,"thisown"): _swig_setattr(self, pkgCache, 'thisown', 0) + _swig_setattr(self, pkgCache,self.__class__,pkgCache) _apt.pkgCache_swigregister(pkgCachePtr) cvar = _apt.cvar + pkgCache_CompTypeDeb = _apt.pkgCache_CompTypeDeb pkgCache_CompType = _apt.pkgCache_CompType pkgCache_DepType = _apt.pkgCache_DepType - class pkgCacheHeader(_object): __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, pkgCacheHeader, name, value) __swig_getmethods__ = {} __getattr__ = lambda self, name: _swig_getattr(self, pkgCacheHeader, name) + def __repr__(self): + return "" % (self.this,) __swig_setmethods__["Signature"] = _apt.pkgCacheHeader_Signature_set __swig_getmethods__["Signature"] = _apt.pkgCacheHeader_Signature_get - if _newclass:Signature = property(_apt.pkgCacheHeader_Signature_get,_apt.pkgCacheHeader_Signature_set) + if _newclass:Signature = property(_apt.pkgCacheHeader_Signature_get, _apt.pkgCacheHeader_Signature_set) __swig_setmethods__["MajorVersion"] = _apt.pkgCacheHeader_MajorVersion_set __swig_getmethods__["MajorVersion"] = _apt.pkgCacheHeader_MajorVersion_get - if _newclass:MajorVersion = property(_apt.pkgCacheHeader_MajorVersion_get,_apt.pkgCacheHeader_MajorVersion_set) + if _newclass:MajorVersion = property(_apt.pkgCacheHeader_MajorVersion_get, _apt.pkgCacheHeader_MajorVersion_set) __swig_setmethods__["MinorVersion"] = _apt.pkgCacheHeader_MinorVersion_set __swig_getmethods__["MinorVersion"] = _apt.pkgCacheHeader_MinorVersion_get - if _newclass:MinorVersion = property(_apt.pkgCacheHeader_MinorVersion_get,_apt.pkgCacheHeader_MinorVersion_set) + if _newclass:MinorVersion = property(_apt.pkgCacheHeader_MinorVersion_get, _apt.pkgCacheHeader_MinorVersion_set) __swig_setmethods__["Dirty"] = _apt.pkgCacheHeader_Dirty_set __swig_getmethods__["Dirty"] = _apt.pkgCacheHeader_Dirty_get - if _newclass:Dirty = property(_apt.pkgCacheHeader_Dirty_get,_apt.pkgCacheHeader_Dirty_set) + if _newclass:Dirty = property(_apt.pkgCacheHeader_Dirty_get, _apt.pkgCacheHeader_Dirty_set) __swig_setmethods__["HasFileDeps"] = _apt.pkgCacheHeader_HasFileDeps_set __swig_getmethods__["HasFileDeps"] = _apt.pkgCacheHeader_HasFileDeps_get - if _newclass:HasFileDeps = property(_apt.pkgCacheHeader_HasFileDeps_get,_apt.pkgCacheHeader_HasFileDeps_set) + if _newclass:HasFileDeps = property(_apt.pkgCacheHeader_HasFileDeps_get, _apt.pkgCacheHeader_HasFileDeps_set) + __swig_setmethods__["OptionsHash"] = _apt.pkgCacheHeader_OptionsHash_set + __swig_getmethods__["OptionsHash"] = _apt.pkgCacheHeader_OptionsHash_get + if _newclass:OptionsHash = property(_apt.pkgCacheHeader_OptionsHash_get, _apt.pkgCacheHeader_OptionsHash_set) __swig_setmethods__["HeaderSz"] = _apt.pkgCacheHeader_HeaderSz_set __swig_getmethods__["HeaderSz"] = _apt.pkgCacheHeader_HeaderSz_get - if _newclass:HeaderSz = property(_apt.pkgCacheHeader_HeaderSz_get,_apt.pkgCacheHeader_HeaderSz_set) + if _newclass:HeaderSz = property(_apt.pkgCacheHeader_HeaderSz_get, _apt.pkgCacheHeader_HeaderSz_set) __swig_setmethods__["PackageSz"] = _apt.pkgCacheHeader_PackageSz_set __swig_getmethods__["PackageSz"] = _apt.pkgCacheHeader_PackageSz_get - if _newclass:PackageSz = property(_apt.pkgCacheHeader_PackageSz_get,_apt.pkgCacheHeader_PackageSz_set) + if _newclass:PackageSz = property(_apt.pkgCacheHeader_PackageSz_get, _apt.pkgCacheHeader_PackageSz_set) __swig_setmethods__["PackageFileSz"] = _apt.pkgCacheHeader_PackageFileSz_set __swig_getmethods__["PackageFileSz"] = _apt.pkgCacheHeader_PackageFileSz_get - if _newclass:PackageFileSz = property(_apt.pkgCacheHeader_PackageFileSz_get,_apt.pkgCacheHeader_PackageFileSz_set) + if _newclass:PackageFileSz = property(_apt.pkgCacheHeader_PackageFileSz_get, _apt.pkgCacheHeader_PackageFileSz_set) __swig_setmethods__["VersionSz"] = _apt.pkgCacheHeader_VersionSz_set __swig_getmethods__["VersionSz"] = _apt.pkgCacheHeader_VersionSz_get - if _newclass:VersionSz = property(_apt.pkgCacheHeader_VersionSz_get,_apt.pkgCacheHeader_VersionSz_set) + if _newclass:VersionSz = property(_apt.pkgCacheHeader_VersionSz_get, _apt.pkgCacheHeader_VersionSz_set) __swig_setmethods__["DependencySz"] = _apt.pkgCacheHeader_DependencySz_set __swig_getmethods__["DependencySz"] = _apt.pkgCacheHeader_DependencySz_get - if _newclass:DependencySz = property(_apt.pkgCacheHeader_DependencySz_get,_apt.pkgCacheHeader_DependencySz_set) + if _newclass:DependencySz = property(_apt.pkgCacheHeader_DependencySz_get, _apt.pkgCacheHeader_DependencySz_set) __swig_setmethods__["ProvidesSz"] = _apt.pkgCacheHeader_ProvidesSz_set __swig_getmethods__["ProvidesSz"] = _apt.pkgCacheHeader_ProvidesSz_get - if _newclass:ProvidesSz = property(_apt.pkgCacheHeader_ProvidesSz_get,_apt.pkgCacheHeader_ProvidesSz_set) + if _newclass:ProvidesSz = property(_apt.pkgCacheHeader_ProvidesSz_get, _apt.pkgCacheHeader_ProvidesSz_set) __swig_setmethods__["VerFileSz"] = _apt.pkgCacheHeader_VerFileSz_set __swig_getmethods__["VerFileSz"] = _apt.pkgCacheHeader_VerFileSz_get [...15018 lines suppressed...] { (char *)"pkgCacheVerFileIterator_swigregister", pkgCacheVerFileIterator_swigregister, METH_VARARGS }, @@ -18577,11 +20061,13 @@ { (char *)"pkgSystem_Initialize", _wrap_pkgSystem_Initialize, METH_VARARGS }, { (char *)"pkgSystem_ArchiveSupported", _wrap_pkgSystem_ArchiveSupported, METH_VARARGS }, { (char *)"pkgSystem_AddStatusFiles", _wrap_pkgSystem_AddStatusFiles, METH_VARARGS }, + { (char *)"pkgSystem_AddSourceFiles", _wrap_pkgSystem_AddSourceFiles, METH_VARARGS }, { (char *)"pkgSystem_FindIndex", _wrap_pkgSystem_FindIndex, METH_VARARGS }, { (char *)"pkgSystem_Score", _wrap_pkgSystem_Score, METH_VARARGS }, { (char *)"pkgSystem_PreProcess", _wrap_pkgSystem_PreProcess, METH_VARARGS }, { (char *)"pkgSystem_ProcessCache", _wrap_pkgSystem_ProcessCache, METH_VARARGS }, { (char *)"pkgSystem_IgnoreDep", _wrap_pkgSystem_IgnoreDep, METH_VARARGS }, + { (char *)"pkgSystem_OptionsHash", _wrap_pkgSystem_OptionsHash, METH_VARARGS }, { (char *)"delete_pkgSystem", _wrap_delete_pkgSystem, METH_VARARGS }, { (char *)"pkgSystem_swigregister", pkgSystem_swigregister, METH_VARARGS }, { (char *)"Configuration_Find", _wrap_Configuration_Find, METH_VARARGS }, @@ -18653,6 +20139,7 @@ { (char *)"pkgRecordsParser_LongDesc", _wrap_pkgRecordsParser_LongDesc, METH_VARARGS }, { (char *)"pkgRecordsParser_Name", _wrap_pkgRecordsParser_Name, METH_VARARGS }, { (char *)"pkgRecordsParser_GetRec", _wrap_pkgRecordsParser_GetRec, METH_VARARGS }, + { (char *)"pkgRecordsParser_HasFile", _wrap_pkgRecordsParser_HasFile, METH_VARARGS }, { (char *)"delete_pkgRecordsParser", _wrap_delete_pkgRecordsParser, METH_VARARGS }, { (char *)"pkgRecordsParser_swigregister", pkgRecordsParser_swigregister, METH_VARARGS }, { (char *)"pkgAcquireItem_DestFile_get", _wrap_pkgAcquireItem_DestFile_get, METH_VARARGS }, @@ -18779,6 +20266,39 @@ { (char *)"delete_GlobalError", _wrap_delete_GlobalError, METH_VARARGS }, { (char *)"GlobalError_swigregister", GlobalError_swigregister, METH_VARARGS }, { (char *)"_GetErrorObj", _wrap__GetErrorObj, METH_VARARGS }, + { (char *)"LuaCacheControl_Open", _wrap_LuaCacheControl_Open, METH_VARARGS }, + { (char *)"LuaCacheControl_Close", _wrap_LuaCacheControl_Close, METH_VARARGS }, + { (char *)"delete_LuaCacheControl", _wrap_delete_LuaCacheControl, METH_VARARGS }, + { (char *)"LuaCacheControl_swigregister", LuaCacheControl_swigregister, METH_VARARGS }, + { (char *)"Lua_RunInteractive", _wrap_Lua_RunInteractive, METH_VARARGS }, + { (char *)"Lua_RunScript", _wrap_Lua_RunScript, METH_VARARGS }, + { (char *)"Lua_RunScripts", _wrap_Lua_RunScripts, METH_VARARGS }, + { (char *)"Lua_HasScripts", _wrap_Lua_HasScripts, METH_VARARGS }, + { (char *)"Lua_ResetScript", _wrap_Lua_ResetScript, METH_VARARGS }, + { (char *)"Lua_SetGlobal", _wrap_Lua_SetGlobal, METH_VARARGS }, + { (char *)"Lua_ResetGlobals", _wrap_Lua_ResetGlobals, METH_VARARGS }, + { (char *)"Lua_GetGlobalStr", _wrap_Lua_GetGlobalStr, METH_VARARGS }, + { (char *)"Lua_GetGlobalStrList", _wrap_Lua_GetGlobalStrList, METH_VARARGS }, + { (char *)"Lua_GetGlobalNum", _wrap_Lua_GetGlobalNum, METH_VARARGS }, + { (char *)"Lua_GetGlobalBool", _wrap_Lua_GetGlobalBool, METH_VARARGS }, + { (char *)"Lua_GetGlobalPtr", _wrap_Lua_GetGlobalPtr, METH_VARARGS }, + { (char *)"Lua_GetGlobalPkg", _wrap_Lua_GetGlobalPkg, METH_VARARGS }, + { (char *)"Lua_GetGlobalPkgList", _wrap_Lua_GetGlobalPkgList, METH_VARARGS }, + { (char *)"Lua_SetDepCache", _wrap_Lua_SetDepCache, METH_VARARGS }, + { (char *)"Lua_SetCache", _wrap_Lua_SetCache, METH_VARARGS }, + { (char *)"Lua_SetCacheControl", _wrap_Lua_SetCacheControl, METH_VARARGS }, + { (char *)"Lua_SetProblemResolver", _wrap_Lua_SetProblemResolver, METH_VARARGS }, + { (char *)"Lua_SetDontFix", _wrap_Lua_SetDontFix, METH_VARARGS }, + { (char *)"Lua_ResetCaches", _wrap_Lua_ResetCaches, METH_VARARGS }, + { (char *)"Lua_GetDepCache", _wrap_Lua_GetDepCache, METH_VARARGS }, + { (char *)"Lua_GetCache", _wrap_Lua_GetCache, METH_VARARGS }, + { (char *)"Lua_GetCacheControl", _wrap_Lua_GetCacheControl, METH_VARARGS }, + { (char *)"Lua_GetProblemResolver", _wrap_Lua_GetProblemResolver, METH_VARARGS }, + { (char *)"Lua_GetDontFix", _wrap_Lua_GetDontFix, METH_VARARGS }, + { (char *)"new_Lua", _wrap_new_Lua, METH_VARARGS }, + { (char *)"delete_Lua", _wrap_delete_Lua, METH_VARARGS }, + { (char *)"Lua_swigregister", Lua_swigregister, METH_VARARGS }, + { (char *)"_GetLuaObj", _wrap__GetLuaObj, METH_VARARGS }, { (char *)"new_pkgAcquireStatusDumb", _wrap_new_pkgAcquireStatusDumb, METH_VARARGS }, { (char *)"delete_pkgAcquireStatusDumb", _wrap_delete_pkgAcquireStatusDumb, METH_VARARGS }, { (char *)"pkgAcquireStatusDumb_swigregister", pkgAcquireStatusDumb_swigregister, METH_VARARGS }, @@ -18828,20 +20348,21 @@ static swig_type_info _swigt__p_PkgFileIterator[] = {{"_p_PkgFileIterator", 0, "PkgFileIterator *", 0},{"_p_PkgFileIterator"},{"_p_pkgCache__PkgFileIterator"},{0}}; static swig_type_info _swigt__p_pkgCache__PrvIterator[] = {{"_p_pkgCache__PrvIterator", 0, "pkgCache::PrvIterator *", 0},{"_p_pkgCache__PrvIterator"},{"_p_PrvIterator"},{0}}; static swig_type_info _swigt__p_pkgCache__DepIterator[] = {{"_p_pkgCache__DepIterator", 0, "pkgCache::DepIterator *", 0},{"_p_pkgCache__DepIterator"},{"_p_DepIterator"},{0}}; -static swig_type_info _swigt__p_VerFileIterator[] = {{"_p_VerFileIterator", 0, "VerFileIterator const &", 0},{"_p_VerFileIterator"},{"_p_pkgCache__VerFileIterator"},{0}}; +static swig_type_info _swigt__p_VerFileIterator[] = {{"_p_VerFileIterator", 0, "VerFileIterator const *", 0},{"_p_VerFileIterator"},{"_p_pkgCache__VerFileIterator"},{0}}; static swig_type_info _swigt__p_pkgCache__VerIterator[] = {{"_p_pkgCache__VerIterator", 0, "pkgCache::VerIterator *", 0},{"_p_pkgCache__VerIterator"},{"_p_VerIterator"},{0}}; -static swig_type_info _swigt__p_PrvIterator[] = {{"_p_PrvIterator", 0, "PrvIterator const &", 0},{"_p_PrvIterator"},{"_p_pkgCache__PrvIterator"},{0}}; +static swig_type_info _swigt__p_PrvIterator[] = {{"_p_PrvIterator", 0, "PrvIterator const *", 0},{"_p_PrvIterator"},{"_p_pkgCache__PrvIterator"},{0}}; static swig_type_info _swigt__p_pkgCache__PkgIterator[] = {{"_p_pkgCache__PkgIterator", 0, "pkgCache::PkgIterator *", 0},{"_p_pkgCache__PkgIterator"},{"_p_PkgIterator"},{0}}; static swig_type_info _swigt__p_pkgCache__PkgFileIterator[] = {{"_p_pkgCache__PkgFileIterator", 0, "pkgCache::PkgFileIterator *", 0},{"_p_pkgCache__PkgFileIterator"},{"_p_PkgFileIterator"},{0}}; static swig_type_info _swigt__p_VerIterator[] = {{"_p_VerIterator", 0, "VerIterator *", 0},{"_p_VerIterator"},{"_p_pkgCache__VerIterator"},{0}}; -static swig_type_info _swigt__p_PkgIterator[] = {{"_p_PkgIterator", 0, "PkgIterator const &", 0},{"_p_PkgIterator"},{"_p_pkgCache__PkgIterator"},{0}}; +static swig_type_info _swigt__p_PkgIterator[] = {{"_p_PkgIterator", 0, "PkgIterator const *", 0},{"_p_PkgIterator"},{"_p_pkgCache__PkgIterator"},{0}}; static swig_type_info _swigt__p_DepIterator[] = {{"_p_DepIterator", 0, "DepIterator *", 0},{"_p_DepIterator"},{"_p_pkgCache__DepIterator"},{0}}; static swig_type_info _swigt__p_pkgSourceList__const_iterator[] = {{"_p_pkgSourceList__const_iterator", 0, "pkgSourceList::const_iterator *", 0},{"_p_pkgSourceList__const_iterator"},{0}}; static swig_type_info _swigt__p_Configuration__Item[] = {{"_p_Configuration__Item", 0, "Configuration::Item *", 0},{"_p_Configuration__Item"},{"_p_Item"},{0}}; static swig_type_info _swigt__p_pkgCache__Header[] = {{"_p_pkgCache__Header", 0, "pkgCache::Header *", 0},{"_p_pkgCache__Header"},{"_p_Header"},{0}}; -static swig_type_info _swigt__p_Header[] = {{"_p_Header", 0, "Header &", 0},{"_p_Header"},{"_p_pkgCache__Header"},{0}}; +static swig_type_info _swigt__p_Header[] = {{"_p_Header", 0, "Header *", 0},{"_p_Header"},{"_p_pkgCache__Header"},{0}}; static swig_type_info _swigt__p_pkgPolicy[] = {{"_p_pkgPolicy", 0, "pkgPolicy *", 0},{"_p_pkgPolicy"},{0}}; -static swig_type_info _swigt__p_Policy[] = {{"_p_Policy", 0, "Policy &", 0},{"_p_Policy"},{0}}; +static swig_type_info _swigt__p_Policy[] = {{"_p_Policy", 0, "Policy *", 0},{"_p_Policy"},{0}}; +static swig_type_info _swigt__p_Lua[] = {{"_p_Lua", 0, "Lua *", 0},{"_p_Lua"},{0}}; static swig_type_info _swigt__p_Configuration[] = {{"_p_Configuration", 0, "Configuration *", 0},{"_p_Configuration"},{0}}; static swig_type_info _swigt__p_pkgAcqIndexRel[] = {{"_p_pkgAcqIndexRel", 0, "pkgAcqIndexRel *", 0},{"_p_pkgAcqIndexRel"},{0}}; static swig_type_info _swigt__p_pkgAcquire[] = {{"_p_pkgAcquire", 0, "pkgAcquire *", 0},{"_p_pkgAcquire"},{0}}; @@ -18850,13 +20371,16 @@ static swig_type_info _swigt__p_pkgCache__Dependency[] = {{"_p_pkgCache__Dependency", 0, "pkgCache::Dependency *", 0},{"_p_pkgCache__Dependency"},{"_p_Dependency"},{0}}; static swig_type_info _swigt__p_GlobalError[] = {{"_p_GlobalError", 0, "GlobalError *", 0},{"_p_GlobalError"},{0}}; static swig_type_info _swigt__p_pkgAcqIndex[] = {{"_p_pkgAcqIndex", 0, "pkgAcqIndex *", 0},{"_p_pkgAcqIndex"},{0}}; -static swig_type_info _swigt__p_StateCache[] = {{"_p_StateCache", 0, "StateCache &", 0},{"_p_StateCache"},{"_p_pkgDepCache__StateCache"},{0}}; +static swig_type_info _swigt__p_LuaCacheControl[] = {{"_p_LuaCacheControl", 0, "LuaCacheControl *", 0},{"_p_LuaCacheControl"},{0}}; +static swig_type_info _swigt__p_std__vectorTpkgCache__Package_p_t[] = {{"_p_std__vectorTpkgCache__Package_p_t", 0, "std::vector *", 0},{"_p_std__vectorTpkgCache__Package_p_t"},{0}}; +static swig_type_info _swigt__p_StateCache[] = {{"_p_StateCache", 0, "StateCache *", 0},{"_p_StateCache"},{"_p_pkgDepCache__StateCache"},{0}}; static swig_type_info _swigt__p_pkgDepCache__StateCache[] = {{"_p_pkgDepCache__StateCache", 0, "pkgDepCache::StateCache *", 0},{"_p_pkgDepCache__StateCache"},{"_p_StateCache"},{0}}; static swig_type_info _swigt__p_Item[] = {{"_p_Item", 0, "Item const *", 0},{"_p_Configuration__Item"},{"_p_Item"},{0}}; static swig_type_info _swigt__p_void[] = {{"_p_void", 0, "void *", 0},{"_p_void"},{0}}; static swig_type_info _swigt__p_pkgAcquire__Item[] = {{"_p_pkgAcquire__Item", 0, "pkgAcquire::Item *", 0},{"_p_pkgAcqArchive", _p_pkgAcqArchiveTo_p_pkgAcquire__Item},{"_p_pkgAcqFile", _p_pkgAcqFileTo_p_pkgAcquire__Item},{"_p_pkgAcqIndex", _p_pkgAcqIndexTo_p_pkgAcquire__Item},{"_p_pkgAcqIndexRel", _p_pkgAcqIndexRelTo_p_pkgAcquire__Item},{"_p_pkgAcquire__Item"},{0}}; static swig_type_info _swigt__p_MMap[] = {{"_p_MMap", 0, "MMap *", 0},{"_p_MMap"},{0}}; -static swig_type_info _swigt__p_PyObject[] = {{"_p_PyObject", 0, "PyObject *", 0},{"_p_PyObject"},{0}}; +static swig_type_info _swigt__p_std__vectorTchar_const_p_t[] = {{"_p_std__vectorTchar_const_p_t", 0, "std::vector *", 0},{"_p_std__vectorTchar_const_p_t"},{0}}; +static swig_type_info _swigt__p_lua_State[] = {{"_p_lua_State", 0, "lua_State *", 0},{"_p_lua_State"},{0}}; static swig_type_info _swigt__p_pkgRecords__Parser[] = {{"_p_pkgRecords__Parser", 0, "pkgRecords::Parser *", 0},{"_p_pkgRecords__Parser"},{0}}; static swig_type_info _swigt__p_p_pkgCache__Version[] = {{"_p_p_pkgCache__Version", 0, "pkgCache::Version **", 0},{"_p_p_pkgCache__Version"},{"_p_p_Version"},{0}}; static swig_type_info _swigt__p_p_Version[] = {{"_p_p_Version", 0, "Version **", 0},{"_p_p_Version"},{"_p_p_pkgCache__Version"},{0}}; @@ -18867,11 +20391,13 @@ static swig_type_info _swigt__p_p_pkgIndexFile[] = {{"_p_p_pkgIndexFile", 0, "pkgIndexFile **", 0},{"_p_p_pkgIndexFile"},{0}}; static swig_type_info _swigt__p_pkgProblemResolver[] = {{"_p_pkgProblemResolver", 0, "pkgProblemResolver *", 0},{"_p_pkgProblemResolver"},{0}}; static swig_type_info _swigt__p_pkgAcqArchive[] = {{"_p_pkgAcqArchive", 0, "pkgAcqArchive *", 0},{"_p_pkgAcqArchive"},{0}}; +static swig_type_info _swigt__p_std__vectorTstd__string_t[] = {{"_p_std__vectorTstd__string_t", 0, "std::vector *", 0},{"_p_std__vectorTstd__string_t"},{0}}; static swig_type_info _swigt__p_p_char[] = {{"_p_p_char", 0, "char **", 0},{"_p_p_char"},{0}}; static swig_type_info _swigt__p_pkgAcquireStatusDumb[] = {{"_p_pkgAcquireStatusDumb", 0, "pkgAcquireStatusDumb *", 0},{"_p_pkgAcquireStatusDumb"},{0}}; static swig_type_info _swigt__p_pkgCacheFile[] = {{"_p_pkgCacheFile", 0, "pkgCacheFile *", 0},{"_p_pkgCacheFile"},{0}}; static swig_type_info _swigt__p_pkgAcquire__ItemDesc[] = {{"_p_pkgAcquire__ItemDesc", 0, "pkgAcquire::ItemDesc *", 0},{"_p_pkgAcquire__ItemDesc"},{0}}; static swig_type_info _swigt__p_pkgAcquireStatus[] = {{"_p_pkgAcquireStatus", 0, "pkgAcquireStatus *", 0},{"_p_pkgAcquireStatus"},{"_p_pkgAcquireStatusDumb", _p_pkgAcquireStatusDumbTo_p_pkgAcquireStatus},{0}}; +static swig_type_info _swigt__lua_CFunction[] = {{"_lua_CFunction", 0, "lua_CFunction", 0},{"_lua_CFunction"},{0}}; static swig_type_info _swigt__p_pkgDepCache[] = {{"_p_pkgDepCache", 0, "pkgDepCache *", 0},{"_p_pkgDepCache"},{0}}; static swig_type_info _swigt__p_DynamicMMap__Pool[] = {{"_p_DynamicMMap__Pool", 0, "DynamicMMap::Pool *", 0},{"_p_DynamicMMap__Pool"},{0}}; static swig_type_info _swigt__p_pkgPackageManager[] = {{"_p_pkgPackageManager", 0, "pkgPackageManager *", 0},{"_p_pkgPackageManager"},{0}}; @@ -18884,7 +20410,7 @@ static swig_type_info _swigt__p_std__ostream[] = {{"_p_std__ostream", 0, "std::ostream *", 0},{"_p_std__ostream"},{0}}; static swig_type_info _swigt__p_pkgAcqFile[] = {{"_p_pkgAcqFile", 0, "pkgAcqFile *", 0},{"_p_pkgAcqFile"},{0}}; static swig_type_info _swigt__p_pkgSourceList[] = {{"_p_pkgSourceList", 0, "pkgSourceList *", 0},{"_p_pkgSourceList"},{0}}; -static swig_type_info _swigt__p_string[] = {{"_p_string", 0, "string &", 0},{"_p_string"},{0}}; +static swig_type_info _swigt__p_string[] = {{"_p_string", 0, "string *", 0},{"_p_string"},{0}}; static swig_type_info _swigt__p_p_pkgVersioningSystem[] = {{"_p_p_pkgVersioningSystem", 0, "pkgVersioningSystem **", 0},{"_p_p_pkgVersioningSystem"},{0}}; static swig_type_info _swigt__p_pkgSystem[] = {{"_p_pkgSystem", 0, "pkgSystem *", 0},{"_p_pkgSystem"},{0}}; static swig_type_info _swigt__p_p_pkgSystem[] = {{"_p_p_pkgSystem", 0, "pkgSystem **", 0},{"_p_p_pkgSystem"},{0}}; @@ -18892,8 +20418,8 @@ static swig_type_info _swigt__p_VerFile[] = {{"_p_VerFile", 0, "VerFile *", 0},{"_p_VerFile"},{"_p_pkgCache__VerFile"},{0}}; static swig_type_info _swigt__p_pkgCache__VerFile[] = {{"_p_pkgCache__VerFile", 0, "pkgCache::VerFile *", 0},{"_p_pkgCache__VerFile"},{"_p_VerFile"},{0}}; static swig_type_info _swigt__p_pkgAcquire__MethodConfig[] = {{"_p_pkgAcquire__MethodConfig", 0, "pkgAcquire::MethodConfig *", 0},{"_p_pkgAcquire__MethodConfig"},{0}}; -static swig_type_info _swigt__p_pkgCache__Package[] = {{"_p_pkgCache__Package", 0, "pkgCache::Package *", 0},{"_p_pkgCache__Package"},{"_p_Package"},{0}}; static swig_type_info _swigt__p_Package[] = {{"_p_Package", 0, "Package *", 0},{"_p_Package"},{"_p_pkgCache__Package"},{0}}; +static swig_type_info _swigt__p_pkgCache__Package[] = {{"_p_pkgCache__Package", 0, "pkgCache::Package *", 0},{"_p_pkgCache__Package"},{"_p_Package"},{0}}; static swig_type_info _swigt__p_unsigned_char[] = {{"_p_unsigned_char", 0, "unsigned char *", 0},{"_p_unsigned_char"},{0}}; static swig_type_info _swigt__p_pkgRecords[] = {{"_p_pkgRecords", 0, "pkgRecords *", 0},{"_p_pkgRecords"},{0}}; static swig_type_info _swigt__p_pkgAcquire__Worker[] = {{"_p_pkgAcquire__Worker", 0, "pkgAcquire::Worker *", 0},{"_p_pkgAcquire__Worker"},{0}}; @@ -18922,6 +20448,7 @@ _swigt__p_Header, _swigt__p_pkgPolicy, _swigt__p_Policy, +_swigt__p_Lua, _swigt__p_Configuration, _swigt__p_pkgAcqIndexRel, _swigt__p_pkgAcquire, @@ -18930,13 +20457,16 @@ _swigt__p_pkgCache__Dependency, _swigt__p_GlobalError, _swigt__p_pkgAcqIndex, +_swigt__p_LuaCacheControl, +_swigt__p_std__vectorTpkgCache__Package_p_t, _swigt__p_StateCache, _swigt__p_pkgDepCache__StateCache, _swigt__p_Item, _swigt__p_void, _swigt__p_pkgAcquire__Item, _swigt__p_MMap, -_swigt__p_PyObject, +_swigt__p_std__vectorTchar_const_p_t, +_swigt__p_lua_State, _swigt__p_pkgRecords__Parser, _swigt__p_p_pkgCache__Version, _swigt__p_p_Version, @@ -18947,11 +20477,13 @@ _swigt__p_p_pkgIndexFile, _swigt__p_pkgProblemResolver, _swigt__p_pkgAcqArchive, +_swigt__p_std__vectorTstd__string_t, _swigt__p_p_char, _swigt__p_pkgAcquireStatusDumb, _swigt__p_pkgCacheFile, _swigt__p_pkgAcquire__ItemDesc, _swigt__p_pkgAcquireStatus, +_swigt__lua_CFunction, _swigt__p_pkgDepCache, _swigt__p_DynamicMMap__Pool, _swigt__p_pkgPackageManager, @@ -18972,8 +20504,8 @@ _swigt__p_VerFile, _swigt__p_pkgCache__VerFile, _swigt__p_pkgAcquire__MethodConfig, -_swigt__p_pkgCache__Package, _swigt__p_Package, +_swigt__p_pkgCache__Package, _swigt__p_unsigned_char, _swigt__p_pkgRecords, _swigt__p_pkgAcquire__Worker, @@ -19091,6 +20623,7 @@ PyDict_SetItemString(d,(char*)"cvar", SWIG_globals); SWIG_addvarlink(SWIG_globals,(char*)"_error",_wrap__error_get, _wrap__error_set); + SWIG_addvarlink(SWIG_globals,(char*)"_lua",_wrap__lua_get, _wrap__lua_set); SWIG_addvarlink(SWIG_globals,(char*)"pkgVersion",_wrap_pkgVersion_get, _wrap_pkgVersion_set); SWIG_addvarlink(SWIG_globals,(char*)"pkgLibVersion",_wrap_pkgLibVersion_get, _wrap_pkgLibVersion_set); SWIG_addvarlink(SWIG_globals,(char*)"pkgOS",_wrap_pkgOS_get, _wrap_pkgOS_set); apt-0.5.15cnc6-r362.patch: --- NEW FILE apt-0.5.15cnc6-r362.patch --- Index: lua/Makefile.in =================================================================== --- lua/Makefile.in (revision 316) +++ lua/Makefile.in (revision 362) @@ -1809,13 +1809,13 @@ distclean-generic: -rm -f $(CONFIG_CLEAN_FILES) -rm -f luac/$(DEPDIR)/$(am__dirstamp) + -rm -f luac/$(am__dirstamp) + -rm -f lua/$(am__dirstamp) + -rm -f lua/$(DEPDIR)/$(am__dirstamp) + -rm -f local/$(am__dirstamp) -rm -f local/$(DEPDIR)/$(am__dirstamp) - -rm -f local/$(am__dirstamp) -rm -f lib/$(am__dirstamp) -rm -f lib/$(DEPDIR)/$(am__dirstamp) - -rm -f luac/$(am__dirstamp) - -rm -f lua/$(am__dirstamp) - -rm -f lua/$(DEPDIR)/$(am__dirstamp) maintainer-clean-generic: @echo "This command is intended for maintainers to use" Index: contrib/log/log.lua =================================================================== --- contrib/log/log.lua (revision 0) +++ contrib/log/log.lua (revision 362) @@ -0,0 +1,80 @@ +-- This script will log the changes being introduced by +-- the transaction which is going to be run, and is based +-- on an idea of Panu Matilainen. It must be plugged +-- in the slots Scripts::PM::Pre/Post. +-- +-- Author: Gustavo Niemeyer + +if confget("APT::Log::Enable/b", "false") == "false" then + return +end + +confset("Dir::Log", "/var/log", true) +confset("Dir::Log::transaction", "apt.log", true) +filename = confget("Dir::Log::transaction/f", "/var/log/apt.log") + +if script_slot == "Scripts::PM::Pre" then + file = io.open(filename, "a+") + if not file then + print("error: can't open log file at "..filename) + return + end + local removing = {} + local installing = {} + local reinstalling = {} + local downgrading = {} + local upgrading = {} + for i, pkg in ipairs(pkglist()) do + if statkeep(pkg) then + -- Do nothing + elseif statreinstall(pkg) then + table.insert(reinstalling, + string.format("ReInstalling %s %s\n", + pkgname(pkg), + verstr(pkgvercur(pkg)))) + elseif statremove(pkg) then + table.insert(removing, + string.format("Removing %s %s\n", + pkgname(pkg), + verstr(pkgvercur(pkg)))) + elseif statnewinstall(pkg) then + table.insert(installing, + string.format("Installing %s %s\n", + pkgname(pkg), + verstr(pkgverinst(pkg)))) + elseif statdowngrade(pkg) then + table.insert(downgrading, + string.format("Downgrading %s %s to %s\n", + pkgname(pkg), + verstr(pkgvercur(pkg)), + verstr(pkgverinst(pkg)))) + elseif statupgrade(pkg) then + table.insert(upgrading, + string.format("Upgrading %s %s to %s\n", + pkgname(pkg), + verstr(pkgvercur(pkg)), + verstr(pkgverinst(pkg)))) + end + end + file:write("Transaction starting at ", os.date(), "\n") + local function write(index, str) + file:write(str) + end + table.foreach(removing, write) + table.foreach(installing, write) + table.foreach(reinstalling, write) + table.foreach(downgrading, write) + table.foreach(upgrading, write) + file:close() +elseif script_slot == "Scripts::PM::Post" then + if transaction_success then + word = "succeeded" + else + word = "failed" + end + file = io.open(filename, "a+") + file:write("Transaction ", word, " at ", os.date(), "\n") + file:close() +end + +-- vim:ts=4:sw=4:et Index: contrib/log/log.conf =================================================================== --- contrib/log/log.conf (revision 0) +++ contrib/log/log.conf (revision 362) @@ -0,0 +1,8 @@ + +APT::Log::Enable "true"; + +Dir::Log "/var/log"; +Dir::Log::transaction "apt.log"; + +Scripts::PM::Pre:: "log.lua"; +Scripts::PM::Post:: "log.lua"; Index: contrib/log/README =================================================================== --- contrib/log/README (revision 0) +++ contrib/log/README (revision 362) @@ -0,0 +1,11 @@ +This script will log the changes being introduced by +the transaction which is going to be run, and is based +on an idea of Panu Matilainen. + +This script must be plugged in the slots: + + Scripts::PM::Pre + Scripts::PM::Post + +Then, when some transaction is run, it will dump information +about it in /var/log/apt.log, or in the configured file. Index: contrib/apt-wrapper/apt.1.xml =================================================================== --- contrib/apt-wrapper/apt.1.xml (revision 316) +++ contrib/apt-wrapper/apt.1.xml (revision 362) @@ -3,20 +3,27 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + + rpm + 1 + " +> + %aptent; - ]> - Richard - Bos + Debian apt development team + + Conectiva apt-rpm development team + &apt-product; - 20 February 2004 + 24 June 2004 2004 Richard Bos @@ -64,7 +71,7 @@ Actions - A full list of actions that are supported by apt: + Actions supported by apt: add, autoclean, build-dep, @@ -76,9 +83,13 @@ dump, dumpavail, gencaches, + groupinstall, + groupnames, + groupremove, ident, install, list-extras, + list-nodeps, moo, pkgnames, policy, @@ -90,6 +101,7 @@ script, search, show, [...8045 lines suppressed...] msgid "Sub-process %s returned an error code (%u)" msgstr "Unterprozesss %s gab Fehlercode zur??ck (%u)" -#: apt-pkg/contrib/fileutl.cc:376 apt-pkg/rpm/rpmpm.cc:621 +#: apt-pkg/contrib/fileutl.cc:376 apt-pkg/rpm/rpmpm.cc:626 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Unter-Prozess %s stieg unerwartet aus" @@ -1671,7 +1672,7 @@ msgstr "k??nnte RPMFileHandler nicht zur??ckspulen" #: apt-pkg/rpm/rpmhandler.cc:160 apt-pkg/rpm/rpmhandler.cc:167 -#: apt-pkg/rpm/rpmpm.cc:680 apt-pkg/rpm/rpmpm.cc:685 +#: apt-pkg/rpm/rpmpm.cc:685 apt-pkg/rpm/rpmpm.cc:690 #, fuzzy, c-format msgid "Failed reading file %s" msgstr "Fehler beim Ausf??hren von Script %s" @@ -1743,7 +1744,7 @@ "RPM::Allow-Duplicated-Warning \"false\";\n" msgstr "" -#: apt-pkg/rpm/rpmlistparser.cc:685 +#: apt-pkg/rpm/rpmlistparser.cc:680 msgid "Bad NotAutomatic flag" msgstr "" @@ -1800,67 +1801,67 @@ msgid "Failure running script %s" msgstr "Fehler beim Ausf??hren von Script %s" -#: apt-pkg/rpm/rpmpm.cc:309 +#: apt-pkg/rpm/rpmpm.cc:312 msgid "Unknown pkgRPMPM operation." msgstr "" -#: apt-pkg/rpm/rpmpm.cc:544 +#: apt-pkg/rpm/rpmpm.cc:549 msgid "Executing RPM (" msgstr "F??hre RPM aus (" -#: apt-pkg/rpm/rpmpm.cc:584 +#: apt-pkg/rpm/rpmpm.cc:589 #, fuzzy msgid "Could not exec " msgstr "Konnte Lock %s nicht bekommen" -#: apt-pkg/rpm/rpmpm.cc:599 +#: apt-pkg/rpm/rpmpm.cc:604 #, fuzzy msgid "Couldn't wait for subprocess" msgstr "Konnte Pipe f??r %s nicht ??ffnen" -#: apt-pkg/rpm/rpmpm.cc:615 +#: apt-pkg/rpm/rpmpm.cc:620 #, c-format msgid "Sub-process %s recieved a segmentation fault." msgstr "Unterprozess %s empfing Segmentation-Fault." -#: apt-pkg/rpm/rpmpm.cc:625 apt-pkg/rpm/rpmpm.cc:873 +#: apt-pkg/rpm/rpmpm.cc:630 apt-pkg/rpm/rpmpm.cc:878 #, fuzzy msgid "Done." msgstr "Fertig" -#: apt-pkg/rpm/rpmpm.cc:676 +#: apt-pkg/rpm/rpmpm.cc:681 #, fuzzy, c-format msgid "Failed opening %s" msgstr "Problem beim ??ffnen von %s" -#: apt-pkg/rpm/rpmpm.cc:689 apt-pkg/rpm/rpmpm.cc:713 +#: apt-pkg/rpm/rpmpm.cc:694 apt-pkg/rpm/rpmpm.cc:718 #, c-format msgid "Failed adding %s to transaction %s" msgstr "" -#: apt-pkg/rpm/rpmpm.cc:765 apt-pkg/rpm/rpmpm.cc:775 +#: apt-pkg/rpm/rpmpm.cc:770 apt-pkg/rpm/rpmpm.cc:780 #, fuzzy msgid "Could not open RPM database" msgstr "k??nnte RPM-Datenbank nicht ??ffnen" -#: apt-pkg/rpm/rpmpm.cc:812 apt-pkg/rpm/rpmpm.cc:825 +#: apt-pkg/rpm/rpmpm.cc:817 apt-pkg/rpm/rpmpm.cc:830 msgid "Transaction set check failed" msgstr "" -#: apt-pkg/rpm/rpmpm.cc:845 +#: apt-pkg/rpm/rpmpm.cc:850 #, c-format msgid "Ordering failed for %d packages" msgstr "" -#: apt-pkg/rpm/rpmpm.cc:849 +#: apt-pkg/rpm/rpmpm.cc:854 msgid "Committing changes..." msgstr "" -#: apt-pkg/rpm/rpmpm.cc:865 +#: apt-pkg/rpm/rpmpm.cc:870 msgid "Error while running transaction" msgstr "" -#: apt-pkg/rpm/rpmpm.cc:871 +#: apt-pkg/rpm/rpmpm.cc:876 #, fuzzy msgid "Some errors occurred while running transaction" msgstr "Fehler w??hrend der Verarbeitung von %s (NewVersion1) aufgetreten" @@ -1875,12 +1876,16 @@ msgid "error parsing source list %s" msgstr "Fehler beim Parsen der Paketliste %s" -#: apt-pkg/rpm/rpmsystem.cc:410 apt-pkg/pkgcachegen.cc:714 +#: apt-pkg/rpm/rpmsystem.cc:411 apt-pkg/pkgcachegen.cc:714 #: apt-pkg/pkgcachegen.cc:741 apt-pkg/pkgcachegen.cc:783 #: apt-pkg/pkgcachegen.cc:788 apt-pkg/pkgcachegen.cc:992 msgid "Reading Package Lists" msgstr "Lese Paketlisten" +#: apt-pkg/rpm/rpmshowprogress.h:121 apt-pkg/rpm/rpmshowprogress.h:123 +msgid "Preparing..." +msgstr "" + #: apt-pkg/acquire.cc:61 #, c-format msgid "Lists directory %spartial is missing." @@ -2246,37 +2251,37 @@ msgid "Malformed line %lu in source list %s (Absolute dist)" msgstr "Misbildete Zeile %lu in Quellliste %s (Absolute dist)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:119 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Misbildete Zeile %lu in Quellliste %s (dist parse)" -#: apt-pkg/sourcelist.cc:206 apt-pkg/sourcelist.cc:230 +#: apt-pkg/sourcelist.cc:209 apt-pkg/sourcelist.cc:233 #, c-format msgid "Vendor block %s is invalid" msgstr "Vendor-Block %s ist ung??ltig" -#: apt-pkg/sourcelist.cc:314 +#: apt-pkg/sourcelist.cc:317 #, c-format msgid "Line %u too long in source list %s." msgstr "Zeile %u zu lang in Quellliste %s." -#: apt-pkg/sourcelist.cc:334 +#: apt-pkg/sourcelist.cc:337 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Misbildete Zeile %u in Quellliste %s (type)" -#: apt-pkg/sourcelist.cc:338 +#: apt-pkg/sourcelist.cc:341 #, c-format msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Unbekannter Typ '%s' in Zeile %u in Quellliste %s" -#: apt-pkg/sourcelist.cc:347 apt-pkg/sourcelist.cc:350 +#: apt-pkg/sourcelist.cc:350 apt-pkg/sourcelist.cc:353 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Misbildete Zeile %u in Quellliste %s (vendor id)" -#: apt-pkg/sourcelist.cc:364 +#: apt-pkg/sourcelist.cc:367 #, c-format msgid "Unknown vendor ID '%s' in line %u of source list %s" msgstr "Unbekannte Vendor-ID '%s' in Zeile %u der Quellliste %s" @@ -2295,7 +2300,7 @@ msgid "Unable to parse package file %s (2)" msgstr "Ausserstande Paketdatei %s (2) zu parsen" -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:202 msgid "" "Please use apt-cdrom to make this CD recognized by APT. apt-get update " "cannot be used to add new CDs" @@ -2303,16 +2308,16 @@ "Bitte verwenden Sie apt-cdrom um diese CD von APT erkennen zu lassen, apt-" "get update kann nicht dazu verwendet werden new CDs hinzuzuf??gen" -#: methods/cdrom.cc:177 methods/cdrom.cc:215 +#: methods/cdrom.cc:210 methods/cdrom.cc:248 msgid "Wrong CD" msgstr "Falsche CD" -#: methods/cdrom.cc:210 +#: methods/cdrom.cc:243 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" -#: methods/cdrom.cc:233 methods/file.cc:82 +#: methods/cdrom.cc:266 methods/file.cc:82 msgid "File not found" msgstr "Datei nicht gefunden" apt-0.5.15cnc6-scriptdir.patch: --- NEW FILE apt-0.5.15cnc6-scriptdir.patch --- --- apt-0.5.15cnc6/contrib/apt-groupinstall/apt-groupinstall.conf.scriptdir 2004-08-14 20:08:50.588071969 +0300 +++ apt-0.5.15cnc6/contrib/apt-groupinstall/apt-groupinstall.conf 2004-08-14 20:09:02.784455510 +0300 @@ -11,7 +11,7 @@ // For RH-based systems Scripts::Groupinstall::Backend "groupinstall-backend-comps.py"; // For Synaptic task-support -Synaptic::taskHelperProg "/usr/lib/apt/scripts/groupinstall-backend-comps.py"; +Synaptic::taskHelperProg "/usr/share/apt/scripts/groupinstall-backend-comps.py"; // For Suse systems //Scripts::Groupinstall::Backend "groupinstall-backend-suse"; --- apt-0.5.15cnc6/apt-pkg/luaiface.cc.scriptdir 2004-08-14 16:36:06.888236043 +0300 +++ apt-0.5.15cnc6/apt-pkg/luaiface.cc 2004-08-14 16:36:06.974217598 +0300 @@ -76,7 +76,7 @@ Lua::Lua() : DepCache(0), Cache(0), CacheControl(0), Fix(0), DontFix(0) { - _config->CndSet("Dir::Bin::scripts", "/usr/lib/apt/scripts"); + _config->CndSet("Dir::Bin::scripts", "/usr/share/apt/scripts"); const luaL_reg lualibs[] = { {"base", luaopen_base}, --- NEW FILE apt.cron --- #!/bin/sh [ ! -f /var/lock/subsys/apt ] && exit 0 [ -f /etc/sysconfig/apt ] && . /etc/sysconfig/apt [ $CHECK_ONLY == "yes" ] && OPTS="$OPTS --check-only" [ $PRESERVE_CONFIG == "yes" ] && OPTS="$OPTS -o rpm::preserve-config=true" OPTS="$OPTS $EXTRA_OPTIONS" /usr/bin/apt-get -q update && /usr/bin/apt-get -q -y $OPTS dist-upgrade --- NEW FILE apt.init --- #!/bin/bash # # apt This shell script enables the automatic updates by APT # # Author: Seth Vidal # Modified for APT by Panu Matilainen # # chkconfig: - 50 01 # # description: Enable daily run of apt, a program updater. # processname: apt-get # config: /etc/apt/ # # source function library . /etc/rc.d/init.d/functions lockfile=/var/lock/subsys/apt RETVAL=0 start() { echo -n $"Enabling nightly apt update: " touch "$lockfile" && success || failure RETVAL=$? echo } stop() { echo -n $"Disabling nightly apt update: " rm -f "$lockfile" && success || failure RETVAL=$? echo } restart() { stop start } case "$1" in start) start ;; stop) stop ;; restart|force-reload) restart ;; reload) ;; condrestart) [ -f "$lockfile" ] && restart ;; status) if [ -f $lockfile ]; then echo $"Nightly apt update is enabled." RETVAL=0 else echo $"Nightly apt update is disabled." RETVAL=3 fi ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart}" exit 1 esac exit $RETVAL --- NEW FILE apt.sysconfig --- # Actually perform updates or only check what's available [yes|no] CHECK_ONLY=no # Hold back packages with modified configuration files [yes|no] PRESERVE_CONFIG=no # Any extra parameters you want to pass to dist-upgrade EXTRA_OPTIONS= --- NEW FILE comps2prio.xsl --- Essential: Index: rpmpriorities.1 =================================================================== RCS file: rpmpriorities.1 diff -N rpmpriorities.1 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ rpmpriorities.1 17 Jan 2005 22:01:26 -0000 1.3 @@ -0,0 +1,36 @@ +Essential: + grub + termcap + ed + kbd + iproute + libtermcap + libgcc + setserial + file + rpm + sysklogd + losetup + kudzu + glibc + shadow-utils + coreutils + bash + iputils + vim-minimal + passwd + cpio + raidtools + SysVinit + authconfig + hdparm + hotplug + readline + util-linux + basesystem + setup + e2fsprogs + procps + initscripts + filesystem + fedora-release Index: rpmpriorities.2 =================================================================== RCS file: rpmpriorities.2 diff -N rpmpriorities.2 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ rpmpriorities.2 17 Jan 2005 22:01:26 -0000 1.3 @@ -0,0 +1,36 @@ +Essential: + grub + termcap + ed + kbd + iproute + libtermcap + libgcc + setserial + file + rpm + sysklogd + losetup + kudzu + glibc + shadow-utils + coreutils + bash + iputils + vim-minimal + passwd + cpio + raidtools + SysVinit + authconfig + hdparm + hotplug + readline + util-linux + basesystem + setup + e2fsprogs + procps + initscripts + filesystem + fedora-release --- NEW FILE rpmpriorities.3 --- Essential: grub termcap ed kbd iproute libtermcap libgcc setserial file rpm sysklogd losetup kudzu glibc shadow-utils coreutils bash iputils vim-minimal passwd cpio raidtools SysVinit authconfig hdparm hotplug readline util-linux basesystem setup e2fsprogs procps initscripts filesystem fedora-release udev --- NEW FILE rpmpriorities.Rawhide --- Essential: grub termcap ed kbd iproute libtermcap libgcc setserial file rpm sysklogd losetup kudzu glibc shadow-utils coreutils bash iputils vim-minimal passwd cpio raidtools SysVinit authconfig hdparm hotplug readline util-linux basesystem setup e2fsprogs procps initscripts filesystem fedora-release apt-0.5.15cnc6-pymake.patch: Index: apt-0.5.15cnc6-pymake.patch =================================================================== RCS file: /cvs/extras/rpms/apt/devel/apt-0.5.15cnc6-pymake.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- apt-0.5.15cnc6-pymake.patch 8 Nov 2004 04:04:37 -0000 1.1 +++ apt-0.5.15cnc6-pymake.patch 17 Jan 2005 22:01:26 -0000 1.2 @@ -14,7 +14,7 @@ _%.so: %_wrap.cxx - $(CC) -shared -I.. $(PYTHONFLAGS) $(LUAFLAGS) -L../bin -L../build/bin -lapt-pkg -o $@ $< -+ $(CC) -shared -I.. -I../include $(PYTHONFLAGS) $(LUAFLAGS) -L../apt-pkg/.libs -lapt-pkg -o $@ $< ++ $(CC) -shared -fPIC -I.. -I../include $(PYTHONFLAGS) $(LUAFLAGS) -L../apt-pkg/.libs -lapt-pkg -o $@ $< apt_wrap.cxx: apt.i - $(SWIG) $(SWIGFLAGS) -c++ -I.. $(LUAFLAGS) -python $< Index: apt.spec =================================================================== RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- apt.spec 10 Nov 2004 03:05:28 -0000 1.4 +++ apt.spec 17 Jan 2005 22:01:26 -0000 1.5 @@ -1,16 +1,23 @@ # needed for rpmpriorities and mirror-select.conf: %{!?fcrel:%define fcrel %(cut -d' ' -f4 /etc/fedora-release )} -# the python bindings only work with python >= 2.something -%define pythonver %(echo $(python2 -c "import sys; v=sys.version_info[:2]; print '%d.%d'%v" 2>/dev/null)) +%{!?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 + +# subversion revision for svn snapshots +%define svnver r362 # we need to work around various missing builddeps in rpm :-/ -%{!?rpmver:%define rpmver %(rpm --version | cut -d' ' -f3)} +%{!?rpmver:%define rpmver %(rpm --version | cut -d' ' -f3 | cut -d. -f1-2)} Summary: Debian's Advanced Packaging Tool with RPM support. Name: apt Version: 0.5.15cnc6 -Release: 11 +Release: 12.%{svnver} Epoch: 0 Group: System Environment/Base URL: https://moin.conectiva.com.br/AptRpm @@ -27,12 +34,21 @@ Source3: vendors.list Source4: apt_preferences -# rpmpriorities generated from comps.xml base group -Source5: rpmpriorities - -# Sources 50-99 are for Lua-scripts -Source50: gpg-checker.lua -Source51: gpg-import.lua +# rpmpriorities generated + manually tweaked from comps.xml core group +Source5: rpmpriorities.1 +Source6: rpmpriorities.2 +Source6: rpmpriorities.3 +Source18: rpmpriorities.Rawhide +Source19: comps2prio.xsl + +# nightly updater scripts & config +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 Source53: mirror-select.lua Source54: upgradevirt.lua @@ -61,35 +77,46 @@ Source250: fedora-vendor.list BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Provides: apt-mirrorselect + # Others 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 BuildRequires: beecrypt-devel BuildRequires: elfutils-devel -BuildRequires: python-devel >= 0:%{pythonver} +# TODO: verify the required minimum version +BuildRequires: python-devel >= 0:2.2 BuildRequires: rpm-devel, zlib-devel, bzip2-devel, libstdc++-devel, gettext BuildRequires: docbook-utils, perl, readline-devel, ncurses-devel # for version detection to work BuildRequires: fedora-release +%if %{generate_rpmpriorities} +BuildRequires: %{_bindir}/xsltproc, %{comps} +%endif -%if "%{rpmver}" >= "4.3.1" +%if "%{rpmver}" == "4.3" BuildRequires: libselinux-devel %endif # Fix some issues in python binding build Patch1: apt-0.5.15cnc6-pymake.patch -# Fix segfault in rpm-dir with dangling symlinks -Patch2: apt-0.5.5-rpmdir-symlink.patch +Patch5: apt-0.5.15cnc6-pymake2.patch +# Update to current svn snapshot: svn diff -r316:%{svnver} +Patch2: apt-0.5.15cnc6-%{svnver}.patch # Make rpm manifest usage configurable Patch3: apt-0.5.15cnc5-manifest-limit.patch -# Docbook build fist, send upstream +# Docbook build fixes, send upstream Patch4: apt-0.5.15cnc6-docbook.patch -# Make build-dep check for broken dependencies -Patch5: apt-0.5.15cnc6-build-dep-fixdeps.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-0.5.15cnc6-scriptdir.patch +# Update python bindings +Patch8: apt-0.5.15cnc6-python-update.patch %description A port of Debian's apt tools for RPM based distributions. @@ -110,19 +137,39 @@ Summary: Python bindings for libapt-pkg Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: %{_bindir}/python%{pythonver} +Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %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} = %{epoch}:%{version}-%{release} +Requires: rhpl, 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. + + %prep %setup -q %patch1 -p1 -b .pymake -%patch2 -p1 -b .rpmdir +%patch2 -p0 -b .svnsnap %patch3 -p1 -b .manifest %patch4 -p0 -b .docbook -%patch5 -p0 -b .build-dep-fix +%patch5 -p0 -b .pymake2 %patch6 -p1 -b .rdonly +%patch7 -p1 -b .scriptdir +%patch8 -p1 -b .pyupdate # fix docs to reference correct paths perl -pi -e \ @@ -130,17 +177,28 @@ s|/usr/share/doc/apt/|%{_docdir}/%{name}-%{version}/|' \ doc/apt.ent doc/fr/apt.ent.fr +install -pm 644 %{SOURCE19} comps2prio.xsl + %build -# disabling build dep tracking ought to make rpm-building a bit faster %configure --disable-dependency-tracking SGML_CATALOG_FILES=$(ls -1 %{_sysconfdir}/sgml/sgml-docbook-3.1* | head -n 1) \ -make %{?_smp_mflags} NOISY=1 +make %{?_smp_mflags} + +# prevent re-generation of the python wrapper, requires a patched swig :( +#touch python/apt.py python/apt_wrap.cxx +cp python/apt.py python/apt.py.pyupdate +cp python/apt_wrap.cxx python/apt_wrap.cxx.pyupdate +make -C python %{?_smp_mflags} PYTHON="%{__python}" +%{__python} -c "import py_compile; py_compile.compile('python/apt.py')" + +%if %{generate_rpmpriorities} +%{_bindir}/xsltproc -o rpmpriorities comps2prio.xsl %{comps} +%else +cp -p $RPM_SOURCE_DIR/rpmpriorities.%{fcrel} rpmpriorities +%endif -touch python/apt.py python/apt_wrap.cxx -make -C python %{?_smp_mflags} -python -c "import py_compile; py_compile.compile('python/apt.py')" %install rm -rf $RPM_BUILD_ROOT @@ -154,10 +212,8 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/gensrclist mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/state/apt/lists/partial - # The config files mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/scripts 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 @@ -165,7 +221,7 @@ 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 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/rpmpriorities +install -p -m 644 rpmpriorities $RPM_BUILD_ROOT/%{_sysconfdir}/apt/ # install config parts for cnf in %{SOURCE150} %{SOURCE151}; do @@ -183,15 +239,28 @@ done # Lua scripts -mkdir -p $RPM_BUILD_ROOT%{_libdir}/apt/scripts -for script in %{SOURCE50} %{SOURCE51} %{SOURCE52} %{SOURCE53} %{SOURCE54}; do - install -p -m 755 $script $RPM_BUILD_ROOT%{_libdir}/apt/scripts/ +mkdir -p $RPM_BUILD_ROOT%{scriptdir} +for script in %{SOURCE52} %{SOURCE53} %{SOURCE54}; do + install -p -m 755 $script $RPM_BUILD_ROOT%{scriptdir} done - # The python bindings -mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages/ -install -p -m 755 python/apt.py* python/_apt.so $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages/ +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}/ +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 + +# GPG checker from contrib +install -p -m 755 contrib/gpg-check/*.lua $RPM_BUILD_ROOT/%{scriptdir}/ + +# 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 755 contrib/apt-groupinstall/apt-groupinstall.conf $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf.d/ # nuke .la files rm -f $RPM_BUILD_ROOT%{_libdir}/*.la @@ -199,6 +268,7 @@ # don't require python, lua etc because of stuff in doc/contrib find contrib/ -type f |xargs chmod 0644 + %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 @@ -208,11 +278,19 @@ 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" > %{_sysconfdir}/apt/apt.conf fi +/sbin/chkconfig --add apt %postun -p /sbin/ldconfig @@ -222,13 +300,14 @@ %files -f %{name}.lang %defattr(-, root, root) -%doc AUTHORS* COPYING* ABOUT* TODO doc/examples/ contrib/ +%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 %config(noreplace) %{_sysconfdir}/apt/apt.conf @@ -237,8 +316,11 @@ # NOTE: no noreplace on these 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 +%config %{_sysconfdir}/cron.daily/apt.cron %{_bindir}/apt-cache %{_bindir}/apt-cdrom @@ -250,11 +332,13 @@ %{_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 - %files devel %defattr(-, root, root) %{_includedir}/apt-pkg/* @@ -263,9 +347,26 @@ %files python %defattr(-, root, root) -%{_libdir}/python%{pythonver}/site-packages/* +%{python_sitearch}/_apt.so +%{python_sitearch}/apt.py +%{python_sitearch}/apt.pyc +%ghost %{python_sitearch}/apt.pyo + +%files groupinstall +%defattr(-, root, root) +%{_sysconfdir}/apt/apt.conf.d/apt-groupinstall.conf +%{scriptdir}/apt-groupinstall.lua +%{scriptdir}/groupinstall-backend-comps.py + %changelog +* Mon Jan 17 2005 Ville Skytt?? - 0:0.5.15cnc6-12.r362 +- Clean up -python packaging, make everything honor %%{__python}. +- Build with dependency tracking disabled. +- "Revert" rpmpriorities and libselinux build-dep stuff to Panu's version. +- Add experimental auto-generation of rpmpriorities, but don't use it yet. +- Fix up mirror-select.conf creation. + * Wed Nov 10 2004 Michael Schwendt 0.5.15cnc6-11 - TODO: Somebody with access to www.fedora.us would need to update Source151 (mirror-select.conf) and update it for FC3. @@ -273,6 +374,78 @@ and fixed the inaccurate conditional BR libselinux-devel which could be made unconditional). +* Tue Nov 09 2004 Panu Matilainen 0.5.15cnc6-0.fdr.19.r362 +- add rpmpriorities for fc3 + +* Tue Sep 14 2004 Panu Matilainen +- don't check rpm's sublevel for selinux-devel requirement + +* Wed Aug 18 2004 Panu Matilainen 0.5.15cnc6-0.fdr.18.r362 +- revision r362 +- add rpmprioties file for rawhide + +* Sat Aug 14 2004 Panu Matilainen 0.5.15cnc6-0.fdr.18.r361 +- update to revision r361 +- automated updates from cron are now configurable through /etc/sysconfig/apt +- provide apt-mirrorselect so repo-configs can depend on it +- preliminary fixes for x86_64: + - put scripts to /usr/share/apt/scripts instead of /usr/lib + - build python bindings with -fPIC + +* Thu Aug 12 2004 Panu Matilainen 0.5.15cnc6-0.fdr.17.r360 +- update to revision r360 +- revert back to print() in upgradevirt kernel-module-warning (see #1524/c18) + +* Wed Aug 11 2004 Panu Matilainen 0.5.15cnc6-0.fdr.17.r358 +- update to revision r358 + +* Tue Jul 13 2004 Panu Matilainen 0.5.15cnc6-0.fdr.17.r355 +- update to revision r355 for native SELinux support + +* Fri Jul 9 2004 Panu Matilainen 0.5.15cnc6-0.fdr.16.r354 +- fix a typo in apt.cron + +* Fri Jul 9 2004 Panu Matilainen 0.5.15cnc6-0.fdr.15.r354 +- don't run kernel-module magic if no kernel was installed in (dist-)upgrade +- improve description a bit +- update to svn r354 (improved virtual package handling in apt-cache) + +* Mon Jul 5 2004 Panu Matilainen 0.5.15cnc6-0.fdr.14.r353 +- add optional script to automatically update from cron +- use updated gpg checker (with progress reporting) from contrib +- add new subpackage for groupinstall (to avoid dependening on comps and rhpl + for core apt) +- update to revision 353 from upstream for various bugfixes and enhancements, + drop merged patches +- remove NOISY=1 from make, hasn't done anything in ages.. + +* Thu Jun 17 2004 Panu Matilainen 0.5.15cnc6-0.fdr.13 +- fix grubby handling wrt non-UP kernels +- never change default kernel if the current default is non-linux system +- include upstream patch to allow setting custom md5cache path for genbasedir + +* Tue Jun 15 2004 Panu Matilainen 0.5.15cnc6-0.fdr.12 +- don't fiddle with grubby unless a new kernel was actually installed +- include kernel-sourcecode in allow-duplicated +- include rpmpriorities for fc2 final + +* Fri May 14 2004 Panu Matilainen +- use rpm's ordering algorithm, not apt's internal + +* Mon May 10 2004 Panu Matilainen +- remove ash from rpmpriorities (#1562) +- updated version of upgradevirt.lua (#1514) + +* Tue May 04 2004 Panu Matilainen +- set APT::Cache::AllNames to false to make "apt-cache pkgnames" less scary + +* Thu Apr 29 2004 Panu Matilainen +- check for rpm 4.3.1 + +* Fri Apr 09 2004 Panu Matilainen +- remove kernel from rpmpriorities, allow-duplicated packages don't work + nicely with any higher than standard priority which is the default anyway + * Fri Apr 09 2004 Panu Matilainen 0.5.15cnc6-0.fdr.11 - revert the ctrl-c workaroound, the "cure" is worse than the disease Index: default.conf =================================================================== RCS file: /cvs/extras/rpms/apt/devel/default.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- default.conf 8 Nov 2004 04:04:37 -0000 1.1 +++ default.conf 17 Jan 2005 22:01:26 -0000 1.2 @@ -13,15 +13,20 @@ Show-Upgraded "true"; Show-Versions "true"; }; - + Cache + { + AllNames "false"; + } }; RPM { + // Use rpm's ordering, not apt's (which is incorrect for FHL/FC upgrades) + Order "true"; // 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|source))?(-(unsupported-modules))?$"; "^gpg-pubkey$"; }; + Allow-Duplicated { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|source|sourcecode))?(-(unsupported-modules))?$"; "^gpg-pubkey$"; }; // XXX: not used currently //Allow-Duplicated-Upgrade { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|source))?(-(unsupported-modules))?$"; }; // "Upgrade" allow-duplicated packages as well @@ -47,7 +52,7 @@ Init { "gpg-import.lua"; }; PM { - Pre { "gpg-checker.lua"; }; + Pre { "gpg-check.lua"; }; Post { "upgradevirt.lua"; }; }; AptGet @@ -56,6 +61,7 @@ DistUpgrade {"upgradevirt.lua"; }; Install::SelectPackage { "upgradevirt.lua"; }; Install::PreResolve { "upgradevirt.lua"; }; + Install::TranslateArg { "upgradevirt.lua"; }; }; Synaptic { Index: mirror-select.conf =================================================================== RCS file: /cvs/extras/rpms/apt/devel/mirror-select.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mirror-select.conf 8 Nov 2004 04:04:43 -0000 1.2 +++ mirror-select.conf 17 Jan 2005 22:01:26 -0000 1.3 @@ -3,5 +3,5 @@ Scripts::AptGet::Help::Command:: "mirror-select.lua"; Dir::Etc::sourceparts::mirrorsource "mirror-select.list"; Dir::State::mirrors "mirrors.list"; -Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/fedora.us-fc2-mirrors.list"; -Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/macromedia-fc2-mirrors.list"; +Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/fedora.us-fcFCREL-mirrors.list"; +Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/macromedia-fcFCREL-mirrors.list"; Index: upgradevirt.lua =================================================================== RCS file: /cvs/extras/rpms/apt/devel/upgradevirt.lua,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- upgradevirt.lua 8 Nov 2004 04:04:37 -0000 1.1 +++ upgradevirt.lua 17 Jan 2005 22:01:26 -0000 1.2 @@ -1,6 +1,5 @@ --- rpm::upgrade-kernel only for backwards compatibility -if confget("RPM::Upgrade-Virtual/b", "false") == "false" and confget("RPM::Upgrade-Kernel/b", "false") == "false" then +if confget("RPM::Upgrade-Virtual/b", "false") == "false" then return end @@ -10,18 +9,41 @@ function get_kerneltype() for i, ktype in ipairs(knames) do if string.find(posix.uname("%r"), ktype) then - return "kernel-"..ktype + return ktype end end -- it's either unknown type or normal UP system - return "kernel" + return "" +end + +-- get package name +function get_kernelname() + suffix = get_kerneltype() + if suffix == "" then + return "kernel" + else + return "kernel-"..suffix + end end -- if grubby is available set default kernel to version function set_default(version) - vmlinuz = '/boot/vmlinuz-'..version - if posix.access('/sbin/grubby', 'x') and posix.access(vmlinuz, 'f') then - os.execute('/sbin/grubby --set-default='..vmlinuz) + if not posix.access('/sbin/grubby', 'x') then + return + end + grubby = io.popen("LANG=C /sbin/grubby --default-kernel") + for line in grubby.lines(grubby) do + -- don't touch the default if it's not a linux system + if string.find(line, "vmlinuz") then + ktype = get_kerneltype() + vmlinuz = '/boot/vmlinuz-'..version..ktype + if posix.access(vmlinuz, 'f') then + print(_("Setting "..vmlinuz.." as new default kernel.")) + os.execute('/sbin/grubby --set-default='..vmlinuz) + else + aptwarning(_("Unable to set new default kernel "..vmlinuz)) + end + end end end @@ -33,6 +55,7 @@ return end + seenpkgs = {} pkgs = pkglist() for i, pkg in ipairs(pkgs) do -- oh fun.. loop through all installed packages and see there are @@ -46,9 +69,10 @@ inst = pkgfind(prov.name.."-"..new_version) if inst then markinstall(inst) - else - print("WARNING: "..prov.name.." not available for kernel "..new_version.."!") + elseif not seenpkgs[prov.name] == true then + print(_("WARNING: "..prov.name.." not available for kernel "..new_version.."!")) end + seenpkgs[prov.name] = true end end end @@ -91,10 +115,10 @@ -- mark installed virtualized packages for "upgrade" function mark_upgrade(name, pkg) - ktype = get_kerneltype() - if pkg.inst then + kname = get_kernelname() + if pkg.inst and not pkgvercur(pkg.pkg) then markinstall(pkg.pkg) - if name == ktype then + if name == kname and not pkgvercur(pkg.pkg) then confset('Kernel::New-Version', verstr(pkg.ver)) end end @@ -102,14 +126,14 @@ -- find the latest version of given virtual pkg for installation function mark_install(virtualpkg) - ktype = get_kerneltype() + kname = get_kernelname() pkgs = find_instonly_pkgs() for name in pkgs do if name == virtualpkg then selected = pkgs[name].pkg end end - if virtualpkg == ktype then + if virtualpkg == kname and not pkgvercur(pkgs[virtualpkg].pkg) then confset('Kernel::New-Version', verstr(pkgs[virtualpkg].ver)) end end @@ -132,13 +156,13 @@ mark_install(virtualname) return elseif script_slot == 'Scripts::AptGet::Install::PreResolve' then - ktype = get_kerneltype() + kname = get_kernelname() if not confexists('Kernel::New-Version') then for i, pkg in ipairs(pkglist()) do idx = string.find(pkgname(pkg), "#") if statinstall(pkg) and idx then name = string.sub(pkgname(pkg), 1, idx-1) - if ktype == name then + if kname == name and not pkgvercur(pkg) then confset('Kernel::New-Version', verstr(pkgvercand(pkg))) end end @@ -147,15 +171,28 @@ if confexists('Kernel::New-Version') then upgrade_kernel_modules(confget('Kernel::New-Version')) end +-- if there's no virtual provide without the version in the name +-- we need to match it here instead of selectpackage +elseif script_slot == 'Scripts::AptGet::Install::TranslateArg' then + modprefix = confgetlist('Kernel::Module-Prefix') + for i, prefix in ipairs(modprefix) do + if string.find(argument, prefix, 1, true) then + translated = argument.."-"..posix.uname("%r") + end + end + return elseif script_slot == 'Scripts::AptGet::Upgrade' or script_slot == 'Scripts::AptGet::DistUpgrade' then pkgs = find_instonly_pkgs() table.foreach(pkgs, mark_upgrade) - upgrade_kernel_modules(confget('Kernel::New-Version')) + if confexists('Kernel::New-Version') then + upgrade_kernel_modules(confget('Kernel::New-Version')) + end elseif script_slot == 'Scripts::PM::Post' then - if confget('Kernel::Set-Default/b', "false") == "true" then + if confget('Kernel::Set-Default/b', "false") == "true" and + confexists('Kernel::New-Version') then set_default(confget('Kernel::New-Version')) end end --- vim:ts=4 +-- vim:ts=4:sw=4 --- apt-0.5.15cnc6-build-dep-fixdeps.patch DELETED --- --- apt-0.5.5-rpmdir-symlink.patch DELETED --- --- rpmpriorities DELETED --- From fedora-extras-commits at redhat.com Mon Jan 17 22:11:53 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 17 Jan 2005 17:11:53 -0500 Subject: rpms/fedora-rpmdevtools/devel .cvsignore, 1.4, 1.5 fedora-rpmdevtools.spec, 1.4, 1.5 sources, 1.4, 1.5 rpminfo, 1.1, NONE Message-ID: <200501172211.j0HMBrgf019028@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/fedora-rpmdevtools/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv19022 Modified Files: .cvsignore fedora-rpmdevtools.spec sources Removed Files: rpminfo Log Message: Update to 0.3.0. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 Nov 2004 04:17:52 -0000 1.4 +++ .cvsignore 17 Jan 2005 22:11:51 -0000 1.5 @@ -1 +1 @@ -fedora-rpmdevtools-0.2.0.tar.bz2 +fedora-rpmdevtools-0.3.0.tar.bz2 Index: fedora-rpmdevtools.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/fedora-rpmdevtools.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fedora-rpmdevtools.spec 10 Dec 2004 22:03:02 -0000 1.4 +++ fedora-rpmdevtools.spec 17 Jan 2005 22:11:51 -0000 1.5 @@ -1,8 +1,8 @@ %define emacs_sitestart_d %{_datadir}/emacs/site-lisp/site-start.d -%define xemacs_sitestart_d %{_libdir}/xemacs/xemacs-packages/lisp/site-start.d %{_datadir}/xemacs/site-packages/lisp/site-start.d +%define xemacs_sitestart_d %{_prefix}/lib/xemacs/xemacs-packages/lisp/site-start.d %{_prefix}/lib64/xemacs/site-packages/lisp/site-start.d %{_datadir}/xemacs/site-packages/lisp/site-start.d Name: fedora-rpmdevtools -Version: 0.2.0 +Version: 0.3.0 Release: 1 Epoch: 0 Summary: Fedora RPM Development Tools @@ -10,8 +10,8 @@ Group: Development/Tools License: GPL URL: http://www.fedora.us/ +# rpminfo upstream: http://people.redhat.com/twoerner/rpminfo/bin/ Source0: %{name}-%{version}.tar.bz2 -Source1: http://people.redhat.com/twoerner/rpminfo/bin/rpminfo BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -61,17 +61,15 @@ install -pm 755 fedora-pkgannfmt $RPM_BUILD_ROOT%{_bindir} install -pm 755 fedora-rmdevelrpms $RPM_BUILD_ROOT%{_bindir} install -pm 755 fedora-rpmchecksig $RPM_BUILD_ROOT%{_bindir} -install -pm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/fedora-rpminfo +install -pm 755 rpminfo $RPM_BUILD_ROOT%{_bindir}/fedora-rpminfo install -pm 755 fedora-extract $RPM_BUILD_ROOT%{_bindir} install -pm 755 fedora-diffarchive $RPM_BUILD_ROOT%{_bindir} install -pm 755 fedora-rpmvercmp $RPM_BUILD_ROOT%{_bindir} install -pm 755 fedora-wipebuildtree $RPM_BUILD_ROOT%{_bindir} -# Deprecated, will be removed in the next "major" release (0.3.0?) -install -pm 755 fedora-unrpm $RPM_BUILD_ROOT%{_bindir} -install -pm 755 fedora-diffrpm $RPM_BUILD_ROOT%{_bindir} -install -dm 755 $RPM_BUILD_ROOT%{_libdir}/rpm -install -pm 755 check-buildroot check-rpaths* $RPM_BUILD_ROOT%{_libdir}/rpm +install -dm 755 $RPM_BUILD_ROOT%{_prefix}/lib/rpm +install -pm 755 check-buildroot check-rpaths* \ + $RPM_BUILD_ROOT%{_prefix}/lib/rpm install -dm 755 $RPM_BUILD_ROOT%{_datadir}/fedora/devgpgkeys install -pm 644 spectemplate*.spec template.init \ @@ -127,10 +125,18 @@ %config(noreplace) %{_sysconfdir}/fedora %{_datadir}/fedora %{_bindir}/fedora-* -%{_libdir}/rpm/check-* +%{_prefix}/lib/rpm/check-* %changelog +* Tue Jan 18 2005 Ville Skytt?? - 0:0.3.0-1 +- Remove 0.fdr. prefixes and epoch 0's from all spec templates. +- Add try-restart action to init script template. +- Remove deprecated fedora-diffrpm and fedora-unrpm. +- Install check-* to %%{_prefix}/lib/rpm instead of %%{_libdir}/rpm (bug 2351). +- Check both %%{_prefix}/lib and %%{_prefix}/lib64 in the xemacs trigger. +- Update rpminfo to 2004-07-07-01 and include it in the tarball. + * Thu Oct 7 2004 Ville Skytt?? - 0:0.2.0-0.fdr.1 - New generalized replacements for fedora-unrpm and fedora-diffrpm: fedora-extract and fedora-diffarchive. Index: sources =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Nov 2004 04:17:52 -0000 1.4 +++ sources 17 Jan 2005 22:11:51 -0000 1.5 @@ -1 +1 @@ -0482cf7d222d7c3d6dfb1cf419e54991 fedora-rpmdevtools-0.2.0.tar.bz2 +18e7e0d9cdb6830ec919907343a32907 fedora-rpmdevtools-0.3.0.tar.bz2 --- rpminfo DELETED --- From fedora-extras-commits at redhat.com Tue Jan 18 16:17:09 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 18 Jan 2005 11:17:09 -0500 Subject: rpms/liferea/devel liferea.spec, 1.6, 1.6.2.1 sources, 1.4, 1.4.2.1 liferea.desktop, 1.1, 1.1.2.1 Message-ID: <200501181617.j0IGH9dK002865@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/liferea/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv2859 Modified Files: Tag: liferea-0_9_0-testing liferea.spec sources liferea.desktop Log Message: Test update to liferea-0.9.0-0.fdr.1.src.rpm from Brian + update desktop file. Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -r1.6 -r1.6.2.1 --- liferea.spec 12 Jan 2005 20:05:46 -0000 1.6 +++ liferea.spec 18 Jan 2005 16:17:07 -0000 1.6.2.1 @@ -1,13 +1,13 @@ Name: liferea -Version: 0.6.4 -Release: 1.b +Version: 0.9.0 +Release: 1 Epoch: 0 Summary: An RSS/RDF feed reader. Group: Applications/Internet License: GPL URL: http://liferea.sourceforge.net/ -Source0: http://download.sourceforge.net/liferea/liferea-0.6.4b.tar.gz +Source0: http://download.sourceforge.net/liferea/liferea-0.9.0.tar.gz Source2: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -31,7 +31,7 @@ %prep -%setup -q -n %{name}-%{version}b +%setup -q -n %{name}-%{version} %build @@ -83,6 +83,9 @@ %changelog +* Fri Jan 14 2005 Brian Pepple - 0:0.9.0-1 +- Updated to 0.9.0. + * Wed Jan 12 2005 Brian Pepple - 0:0.6.4-1.b - Updated to 0.6.4b. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/sources,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- sources 12 Jan 2005 20:05:46 -0000 1.4 +++ sources 18 Jan 2005 16:17:07 -0000 1.4.2.1 @@ -1 +1 @@ -d45086ee3fc098cc9ca146bece0ddf9f liferea-0.6.4b.tar.gz +903a4e3db696ac11d1013e104428d57b liferea-0.9.0.tar.gz Index: liferea.desktop =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.desktop,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- liferea.desktop 8 Nov 2004 04:49:13 -0000 1.1 +++ liferea.desktop 18 Jan 2005 16:17:07 -0000 1.1.2.1 @@ -4,11 +4,13 @@ Name[de]=Liferea Feed Reader Name[cs]=Liferea Feed Reader Name[es]=Liferea, lector de titulares RSS +Name[fr]=Liferea, lecteur de flux GenericName=Feed Reader Comment=Download and view feeds Comment[de]=Anzeigen von News-Feeds Comment[cs]=Stahov??n?? a ??ten?? ??l??nk?? -Comment[es]=Lea fuentes de noticias mediante titulares RSS y XML +Comment[es]=Lector de titulares RSS Liferea +Comment[fr]=T??l??charge et visualise des flux Exec=liferea Icon=liferea.png StartupNotify=false From fedora-extras-commits at redhat.com Tue Jan 18 17:37:56 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 18 Jan 2005 12:37:56 -0500 Subject: rpms/cd-discid/devel cd-discid.spec,1.1,1.2 Message-ID: <200501181737.j0IHbu1N003704@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/cd-discid/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv3696 Modified Files: cd-discid.spec Log Message: Honor optflags, improve description, fix manpage perms (#145345). Index: cd-discid.spec =================================================================== RCS file: /cvs/extras/rpms/cd-discid/devel/cd-discid.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cd-discid.spec 15 Jan 2005 08:19:20 -0000 1.1 +++ cd-discid.spec 18 Jan 2005 17:37:54 -0000 1.2 @@ -1,7 +1,7 @@ Summary: utility to get CDDB discid information Name: cd-discid Version: 0.9 -Release: 1 +Release: 2 Group: Applications/Multimedia License: GPL Source: http://www.hispalinux.es/~data/files/cd-discid/cd-discid_%{version}.orig.tar.gz @@ -9,21 +9,21 @@ %description cd-discid is a backend utility to get CDDB discid information from a CD-ROM -disc. It was originally designed for cdgrab, but can be used for any purpose -requiring CDDB data. +disc. It was originally designed for cdgrab (now abcde), but can be used for +any purpose requiring CDDB data. %prep %setup -q %build -make cd-discid +make CFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} install -m 0755 cd-discid $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 -install -m 0444 cd-discid $RPM_BUILD_ROOT%{_mandir}/man1 +install -m 0644 cd-discid $RPM_BUILD_ROOT%{_mandir}/man1 %clean rm -rf $RPM_BUILD_ROOT @@ -35,6 +35,11 @@ %{_mandir}/man1/* %changelog +* Mon Jan 17 2005 Ville Skytt?? - 0.9-2 +- Honor $RPM_OPT_FLAGS. +- Improve description. +- "Fix" man page permissions. + * Wed Apr 14 2004 Nils Philippsen - version 0.9 From fedora-extras-commits at redhat.com Tue Jan 18 17:40:40 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 18 Jan 2005 12:40:40 -0500 Subject: rpms/abcde/devel abcde.spec,1.1,1.2 Message-ID: <200501181740.j0IHeeFe003747@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/abcde/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv3741 Modified Files: abcde.spec Log Message: Add dependencies, fix up Debianisms, include more docs (#145344). Index: abcde.spec =================================================================== RCS file: /cvs/extras/rpms/abcde/devel/abcde.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- abcde.spec 15 Jan 2005 08:17:24 -0000 1.1 +++ abcde.spec 18 Jan 2005 17:40:38 -0000 1.2 @@ -1,7 +1,7 @@ Summary: A Better CD Encoder Name: abcde Version: 2.2.0 -Release: 1 +Release: 2 License: GPL & Artistic Group: Applications/Multimedia Source: http://www.hispalinux.es/~data/files/abcde_%{version}.orig.tar.gz @@ -11,7 +11,7 @@ URL: http://www.hispalinux.es/~data/abcde.php BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: cd-discid +Requires: cd-discid vorbis-tools flac cdparanoia wget speex %description abcde is a frontend command-line utility (actually, a shell script) that @@ -23,6 +23,7 @@ %patch0 -p1 -b .vi %patch1 -p1 -b .inst %patch2 -p1 -b .genre +sed -i 's/normalize-audio/normalize/g' abcde* %install rm -rf $RPM_BUILD_ROOT @@ -33,12 +34,17 @@ %files %defattr (-, root, root, -) -%doc changelog COPYING README TODO +%doc changelog COPYING README TODO FAQ examples %config(noreplace) %{_sysconfdir}/abcde.conf %{_bindir}/* %{_mandir}/man1/* %changelog +* Mon Jan 17 2005 Ville Skytt?? - 2.2.0-2 +- Add vorbis-tools, flac, cdparanoia, wget, and speex dependencies. +- Weed out some Debianisms from default external tool names. +- Include more docs. + * Fri Jan 14 2005 Nils Philippsen - version 2.2.0 From fedora-extras-commits at redhat.com Tue Jan 18 18:31:09 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 18 Jan 2005 13:31:09 -0500 Subject: rpms/synaptic/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 synaptic.spec, 1.5, 1.6 Message-ID: <200501181831.j0IIV9MD004672@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/synaptic/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv4666 Modified Files: .cvsignore sources synaptic.spec Log Message: Update to 0.55.3 from Panu. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/synaptic/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 05:25:25 -0000 1.3 +++ .cvsignore 18 Jan 2005 18:31:07 -0000 1.4 @@ -1 +1 @@ -synaptic-0.51.tar.gz +synaptic-0.55.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/synaptic/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 05:25:25 -0000 1.3 +++ sources 18 Jan 2005 18:31:07 -0000 1.4 @@ -1 +1 @@ -8592c5b29225431d4b16afbaf2d506ca synaptic-0.51.tar.gz +cc548050f1da9207e815de284b7aee39 synaptic-0.55.3.tar.gz Index: synaptic.spec =================================================================== RCS file: /cvs/extras/rpms/synaptic/devel/synaptic.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- synaptic.spec 10 Dec 2004 22:03:11 -0000 1.5 +++ synaptic.spec 18 Jan 2005 18:31:07 -0000 1.6 @@ -3,12 +3,11 @@ Summary: Graphical frontend for APT package manager. Name: synaptic -Version: 0.51 +Version: 0.55.3 Release: 1 -Epoch: 0 License: GPL Group: Applications/System -Source: http://savannah.nongnu.org/download/synaptic/%{name}-%{version}.tar.gz +Source: http://savannah.nongnu.org/download/synaptic/synaptic-%{version}.tar.gz URL: http://www.nongnu.org/synaptic/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: usermode-gtk @@ -97,11 +96,30 @@ %{_sbindir}/%{name} %{_datadir}/applications/*.desktop %{_datadir}/%{name} +%{_datadir}/pixmaps/%{name}.png %{_datadir}/gnome/help/%{name} %{_datadir}/omf/%{name} %{_mandir}/man8/%{name}.8* %changelog +* Tue Nov 09 2004 Panu Matilainen 0.55.3-1 +- update to 0.55.3 + +* Tue Nov 02 2004 Panu Matilainen 0.55-0.fdr.1 +- update to 0.55 + +* Sun Oct 03 2004 Panu Matilainen 0.53.4-0.fdr.1 +- update to 0.53.4 + +* Mon Aug 16 2004 Panu Matilainen 0.53-0.fdr.1 +- update to 0.53 final + +* Thu Aug 12 2004 Panu Matilainen 0.53-0.fdr.0.pre3.1 +- update to 0.53pre3 + +* Tue Jul 06 2004 Panu Matilainen 0.52-0.fdr.1 +- update to 0.52 + * Wed Jun 23 2004 Panu Matilainen 0.51-0.fdr.1 - update to 0.51 - require yelp From fedora-extras-commits at redhat.com Tue Jan 18 18:54:17 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 18 Jan 2005 13:54:17 -0500 Subject: rpms/dillo/devel .cvsignore, 1.3, 1.4 dillo.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200501181854.j0IIsHCq004799@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/dillo/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv4793 Modified Files: .cvsignore dillo.spec sources Log Message: Update to 0.8.4, fixes CAN-2005-0012 (#144953). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dillo/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:13:59 -0000 1.3 +++ .cvsignore 18 Jan 2005 18:54:15 -0000 1.4 @@ -1 +1 @@ -dillo-0.8.2.tar.bz2 +dillo-0.8.4.tar.bz2 Index: dillo.spec =================================================================== RCS file: /cvs/extras/rpms/dillo/devel/dillo.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dillo.spec 10 Dec 2004 22:03:02 -0000 1.4 +++ dillo.spec 18 Jan 2005 18:54:15 -0000 1.5 @@ -1,5 +1,5 @@ Name: dillo -Version: 0.8.2 +Version: 0.8.4 Release: 1 Epoch: 0 Summary: Very small and fast GUI web browser @@ -7,7 +7,7 @@ Group: Applications/Internet License: GPL URL: http://www.dillo.org/ -Source0: http://www.dillo.org/download/dillo-0.8.2.tar.bz2 +Source0: http://www.dillo.org/download/dillo-0.8.4.tar.bz2 Source1: %{name}.desktop Patch0: dillo-0.8.0-nodebug.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -29,7 +29,7 @@ %patch0 %build -%configure --disable-dependency-tracking --enable-cookies --enable-ipv6 +%configure --disable-dependency-tracking --enable-ipv6 make %{?_smp_mflags} %install @@ -58,13 +58,19 @@ %{_libdir}/%{name} %changelog +* Tue Jan 18 2005 Ville Skytt?? - 0:0.8.4-1 +- Update to 0.8.4, fixes CAN-2005-0012 (#144953). + * Tue Sep 7 2004 Ville Skytt?? - 0:0.8.2-0.fdr.1 - Update to 0.8.2. - Disable dependency tracking to speed up the build. + * Thu Jun 20 2004 Nils O. Sel??sdal - 0:0.8.1-0.fdr.1 - 0.8.1 release + * Mon Apr 19 2004 Nils O. Sel??sdal - 0:0.8.0-0.fdr.3 - Require wget for https support. + * Thu Feb 12 2004 Ville Skytt?? - 0:0.8.0-0.fdr.2 - Use "make install DESTDIR" instead of the %%makeinstall macro to avoid buildroot traces in installed files. Index: sources =================================================================== RCS file: /cvs/extras/rpms/dillo/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:13:59 -0000 1.3 +++ sources 18 Jan 2005 18:54:15 -0000 1.4 @@ -1 +1 @@ -4322f339aa4a4a2a4ba9a11444df9c67 dillo-0.8.2.tar.bz2 +ebf17d6cca1fccc8bc80acdf05e736a3 dillo-0.8.4.tar.bz2 From fedora-extras-commits at redhat.com Tue Jan 18 19:10:14 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 18 Jan 2005 14:10:14 -0500 Subject: rpms/psi import.log,1.9,1.10 Message-ID: <200501181910.j0IJAEJk005619@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/psi In directory cvs.fedora.redhat.com:/tmp/cvs-serv5610 Modified Files: import.log Log Message: auto-import psi-0.9.3-0.fdr.1.2 on branch FC-2 from psi-0.9.3-0.fdr.1.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/psi/import.log,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- import.log 12 Jan 2005 21:11:58 -0000 1.9 +++ import.log 18 Jan 2005 19:10:12 -0000 1.10 @@ -6,3 +6,4 @@ psi-0_9_2-0_fdr_2_1:FC-1:psi-0.9.2-0.fdr.2.1.src.rpm:1099890830 psi-0_9_2-0_fdr_2_2:HEAD:psi-0.9.2-0.fdr.2.2.src.rpm:1099890840 psi-0_9_3-1:HEAD:psi-0.9.3-1.src.rpm:1105564278 +psi-0_9_3-0_fdr_1_2:FC-2:psi-0.9.3-0.fdr.1.2.src.rpm:1106075377 From fedora-extras-commits at redhat.com Tue Jan 18 19:10:14 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 18 Jan 2005 14:10:14 -0500 Subject: rpms/psi/FC-2 crystal_roster.jisp, NONE, 1.1 crystal_system.jisp, NONE, 1.1 .cvsignore, 1.4, 1.5 psi.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200501181910.j0IJAElT005623@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/psi/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv5610/FC-2 Modified Files: .cvsignore psi.spec sources Added Files: crystal_roster.jisp crystal_system.jisp Log Message: auto-import psi-0.9.3-0.fdr.1.2 on branch FC-2 from psi-0.9.3-0.fdr.1.2.src.rpm --- NEW FILE crystal_roster.jisp --- PK  ?]??? ?"????)^x?]E???B?? ??RJ???@????ik????P?1&??D{v!V???|?|???= ?G(??x??9>.u&MhL?? ? juUkw?????Em.??g[)8p ???????K???a??UYk4?-?4e?lH?  ?I8DI????e(A?H?U?EZ? Z?(??jT- 2raFv??r?[?3N9???s?s?ia?h????????{??m &?w? p????~0???cEQ [F??2T???????`y??u"y?,@???1?4?@@?m?k8?????}k|U????'$?[M0  )%  $i$6 ?cv?I???d????]4d9x!???&?{? ?"bv??^Tl?n6?e??n *"Z??P???Jg?iY??????|?????m??? ]??F????0==??? ???  i??$4J?$??c?3???]DvH?????|??=:??? H)?%ala??GP(rXm"Jmh???a,?"?No??.????>&r?I??@3??Z??u??????eIfffXZZj?RJ???.?o4?Uap?Q??.9m????M;?k?D+p+4,???st???eW?c?vNa`?X?0Q1I,??d?z??U?a~?Y????c??9??7Q?????%NcdP^???C???U??E?pGVF?  -??E!H??`??]??????mC?8???Lf?a7????????_??|??P( ??k?Z????????1 ?J?B?? pe?????d???Z_?s?~??w?8??J|s?v?M??BJy?40T??x8?*?>?-?8?4D??QVVh?:E?XDy????<@4??????4:?O?i??6=:??n?.?4???]??Z?V???D??f??#j??{??GD?eb?.?6ckk?/??m??7?xq??&????n?1M????????t?h?S??? )? ?B ?.4??KHLH?nD ??@???d???;??O=P?????????? X4 ??lb??l????? -?[? ?80? v?9sN2??U??V???\a??u????3?4\cf8???k??q`????????"?_???nx.????z>??fqZ??Y  ???b??q????x?T?l4M?L????a?? ?g???[???B?=z#?C?z????qy`?f!?i?Nx|UV??=W????lz2?o??? ?)^?0???(?j???#???? ?j??va1?/???#??????|Ty??S????9!? ?d??@@ o?????R)??H)Q??????????;7.W>?+??[??^f??1??D???????j??m?3@?? ?f???N?l?`6?=???? 13#Wm???z?s???C???_TKyvD? kF.. G%?`/?\/ ??Y??Lk?d?M ry?C?X?sobr???'d?-?H?? ?`??? 3??b???h?z??n:~???|??[Ec??O??????}??L??????OV??#?R?V???i??? }4?????????k??}trt$g?-.???2?n?'?F,?O!)&N?(}?yne???????????s?? ?o>)?(?-?B?0?D?d at m?D???>?????(( ???(??!?4??dt{?`u??'?{??? j????O1; ^x?e????? h??q??M???r??????=2?????&??u?kd??$;P??P7??g???T?$?????????????KH?????:v?????ho????????D\??v???% ?$????Dg?A ?8?kV??>?N??)r??5O?}S?? ?? J##a????7?J???????Bq?FNK?]2?4?}B????U^??]??VI1x?X2?3?m??0Ug?n?_?{6f+N??D?0?9???7fw??& ?7???*NM]?[???lGJ"?s{??!??pg?-+?eH?/???(v?Uy?%??)??s????X?????? ??h?e9?ncf??????b=h^?4?@?|??Of?Ka??6P?K????+{??}???? q?8?? ???uL?I??k ?iX\???vT#\vUw??}"?l??|1??\?S??Z<*"???@?wU?H??paKLQY>+ddO@????????? v&?M???g?@??`??? ??k??x? ?u:8)???4?z?mI??M'?6???m????-ch??Run?)??d[h???m??? /?$??N???pl j???G????G???2W?????????W[ QP?4?????r??e?#q?Z??????!?hv????????g\???Ul?Z??a??@:?????q?W9$E? ?? P? ?4"?????^?4:????+(????s?'???x???J??s??-"?S(?6???i?? ?E?P??~u}?' K???`@[??~??K?R??}t?RE?EcS0??\?RPmE??/?Jq?.A?`BBXY????oJ?e?k?~???=J?"n8?w?$ ??~???????p??N?{5?7? ???C??t_m H??3?Z??? }?@???N????o????????????y?G?????]??B??,?Z?BK??H???? t!FZ??O#?PK ??&7???7\f?/??????LIpX?'q?7=0L??"^~?????Z??j????<x?tr ????Z`?=Q??iX`8w??)??@?r????9????{??98??~??\z}+f??????(??^??A???C?>?yG1n?&?z13Y?-R6??1????&??@??58??(?c????? S]]]?mK?3??8N?7vu????b:??k?x??=jtY`ss?s^4`)??,x?3??g?mP?T4_>???N?????"?v?]5?8g8 ? y3?|??'#%[?]?????}????jU?y*P?UsP??N9???1????:ZbI?L?\U?fu???V???:?????5\R?????? O???xY?-?\?3O???t?M??L??T?????????%v{?;G6a|^I5l??????_??oZm?p{?\???{?H?4:??\-U ??k)??@???zhc?.r?)x??>?;?N???q??u?????8? ?????>??D??=^=&9?\?$??,=???????????e\y|]\4g8?????+f??????????????u[4????????/:?;?M????y???HC8? c????????b2Y??$!?@??????V?p?P _??RsG{?????&?NU???????????G??????9????_I?%???2??PA?4??z?3?^M?MN??<<??P3"?Fi]`z?w4?<;?p??????????8*!dk?l7u????u??p??.????r????0$???k?a???>%????Zxz??|?#A???&j???????cC????8?*????t/5????o??' bz??`0?{??2-4???T:???^?K??}?X? ??bp???:?l?y?GS??9?]??TY8???'?k6w???Q A ?s? ?,??!?^?y??1%tP?{?O?? ?l???B????2?B??2~???O?>??!|9??4?e?n?a?C ????i??S?SE]?h???E?n?W????]?] Z???7??S???m dm ?C??G?RY$?{X????u?? ???=?t??/????G?? ?? ??zH?'\?wn???}?x?Q?f??FM?? ??M?????????????????? ?y?/0???M?5??{????? Y?Kt?G?r?:???8?3Z}?O?}????R?_??/??#6r??n"O???p&B???g\??A?{???8 ?N???`?XT????=???~??h?{*?????jN?????\??????f!?y1A?b'W???4???t?????js? ?????EAX???????^ ?P??w?&?P?????O)?[D? ZH]&???[??A??e)??!??$?????c8??n?$???qc?\????u???>V at W~2????W?????,l?3? ;???+Z?)0?`?????a3?<%????p??(|??P?CC>s?c???A?jW??? m:F?5v7?bJC2?Yb??e,?>?rt??U?47:??W???????????6;?w?????h=4??jt?y1{?V??????Zd1Xz#?E?$?{???"?|`?V???~?????V??? ?w?nry;??j{? _/GK??,?????????RY?R????f?f?????????X?vX??????"iQG C?o.??y?f??R?_?_?????????m?7? (fh?a?B=?5V?b????Ow????b??H??????.?[??^?|?bdie??0Y??xi??gm?b??~???.??K,????????rk^?x?,?z?"??U?@[bbr????K??|?kZBZB8;??R'%.q!???mj??kaa??i?_?????E??K?2P??k??xd?I~=???f??G?^??v?{$ ???P?P_???&~??lA9??t????U??[? ^!?9!? N???????7o????a??vg?O?,?|??MS????[9T ?JOO?????B?,???!???P[??|M????}?!v:%j%jo???$????D?&??}????8>k@?K??z*??%?Gz?6??????U"X??.1?^?bb5?>;?b3???????H?????8?c?[??l???T?????+?j7???9?\?P??21?P??C??W$??io??fI?o?L?9bv?}?nR?j??V5Jjx??d?u?? ????KBGe/GH[?J?'J????(@?$?xZ??+o4?M]??O??60??<,/????) + K??S-S-o?c ??Z??W ?`X???B=?'?S?????<\?C????"K?6'h?Q?6z?Ss 5??? "2??/?QA??Jx:?d???E?(?G???&k??H ?h&J????????H?#?f??i???m??Q at b???5????aa!?$? ?i??kF?????????W7???? U/?U????$ ? Ux?W{,???:??-s5?H?+???djs66??????????j???H?d?aN?N????:???n?.?~X?Yz?pB?????e?w?"? y??b??(:.???Db???^??=???????O(QSO?E??ia???p@???WiW?ai????X??&r???.?h7???&?????zb?(?KJ??a?>>??GI?I?E???X?Y???Z?-[SB??*??.,l???a`??w'???-fb`p???Y?K???????Z????????2?I???35^??IgI???Jc????q??%??$?,?jSx?2h?#?h?b?b??!+V+??e??LW?y?'Q??l4?c5?M]??C?K1?kW??OtlH?+g??????[??_?-U??%0m3n??????2??~3?i?)d? ??W??q? ?????-w??n?(r??y?\7Us5&l??s?E>K???>?f?B0}~?l?Y?c?????I7?'_?????t??????0[?@\;F?kx?}???aQ?u~)??,,tj??g^?&?8?R?M?;?;99?:???;N??|_&!}???????|&?B$????G?b??V??????W/^9?????s?????#??f~?8*? 1G?m_?? ??GF??s?s? ??3??l}?????^pq%??????2???u<4?T?1????z?NV????6?????{Ow?+Z&-????vpk??r?'?l?mo?????B[]i????Cn?{????w??}}???-??Ez????u???^0???y???????????ZQ\S??????u???J-???S?_?Qj?xy??#??q? ~x??1?Q~w5#L??v&???@?w?(?+?F7n??;?e6?(??e?????SM?p?D#A'Ba?'\1!g??kMW?F,r??8???(????i?+?g?-I??O??v}??M??Qn? c?????$5?&,\!i(????O?? 8?v???>?ah??????,b?a!?R(K??k?????W??? ???(U(U?\A??$P{Z| ??S???Z~?A????Xr??O???1V?Z?>hV?LRG?h?h??B?v???!O?? f6??Fg`o??? y?:WA&Mv??]????)?f????a?ai?&0???L??V??ZP???fF?Hnw??)?????( ????F?5?????@?}L??????X????cH???>??9n:?y??d??A???y????%, ??!?????k??r:U??????]y?? ?L&N?q?????EK?I?t?D????V.?a-??$????j mL?^??O?ul?\Ym?w???=?^?3!?+f?+??=Q???#c`?0>6??"?'??a?s??'??- at 9?',iY h??r?O?O?W[{??<?m/=W?5 X???0?70p????b???$z????_?Gy?J??A? ???3"E$??]?f_x-??&?&M?y?H?4~???I ???Y????????X??&?$Y2??s??e?X??????LC?@Vosu.??2???.Xe??????K???c??0Sv?y?x??-l????`?1?g?a?A_??r?????>?u???????zz???T???s??2??n?}???t??k?Rg[?X;?ej?6??I/1{xk??o$????|???#)>]@????i??E?Wd??????*?ST?dHd????)?ibU??< ?unpVa?@B??Z h ??????????N?gV???e?1?"B??bTN "16?ili?'??m ??????>?(???3*o{~?H7?UX4\?i) ?]W??W?R? QQ`?Q???????;??????????p??n????.r???a?J.??x????z.>??c?u???????u ??]%]%5??????Z?4??M ?,r???V|x??Q?q?z???6b?c?c???????on&/y?E?? ??j?Mt.????,????jx? ???? ???P2 ??L?i???'{b6<?)j?d????4??IX??$3??bSE????R?z?C???????N,?LKL??s??*oD3????r?^y?8A???0???l1em7z???????$ R??qS?>?+ ?,}'i??????3b??y?????Q???iQ??L/??ix?6Xm??U????u??f??????q??6?5SD??4??q????L4u0?HJm ?????V??I?6?????0Og????}Kvf)???:??[???k?O?c[?aB ??b?}????????s?G?##C?`{????7?n?g???rlo??R??QY????(?n5??v??P/C?&??????L??oJ??w)f????q??-??8???V2 ???B(??#? ???=W??2?Y???V?? ? ??YYYp??????????X??o?S???{?zm/ ?:9bi??Q?1?[jg| ??? ????W??????> ???????C?&?????D&Wb_3???????????,????Q?eH`???9m?IEv ???? N=?o????c???.??~?xS?|`/?A?jv> |&`9??myG=i`?W????-???es at l??? ?? v`?2????R??X?? w??a???????td?jG7??&1???OvY43?_??pp*??0????6^O?e ?"+.?h?????9?,.???d\?"$??`%?L8? ??eg???????gJ?fk?R??K? b[??""??ej*?V???^-Y?0???TV?6Y??&????????@??\ ??y??]51???j~?{??VI?.???M?n????tnIv?R?;?a ?:?`??.??qG?57?u??1???K?G?? ^nG+nR*WM?????? ??????E?????8}?}` (T ?o?=4??q?%???? ?Y??M??r;???#t;<*A??l?V???W???p????M?X?cc_??M???? ? `??@  ??????????f???V??,D?AJ?????t?Ff?V??n?57????=W?s?????s????=?s9??K??x????F??3?V??*??N???yi???????N9?8? @h ??????z=jqdo????mz??#?'o??sHg????0?K??-F$M?5?!??????mj????L0???9=/??=]????$jL?{???????L?edPR:????????Qw;???G?R???i?}I?=???F?ao?Sl??zc?>"?????E??Xr???w 4?p???Wp????_?z?"??:?sB????o?Ha4D??   ??? ???p??v????? ?gl?@ i?$v"??A5???????B??? ?.?}????@?&???iGI:Z?D??OK??????V???+????????R?W????????????t6??^???C5:f?&\i???&''[?o?    ????? .CYx??f????????? ?olj?[??aP?5f??d*???????? 2? =.+]Q&p????3?  ??V_Y???t???F?E ????d????????@'108???:?????7?@??  ?&JF????????GJ?n'+?p\?q?^j-???? ?.L&{?G?Tg?X?e?Qk:V ?r ?m??0?/5????C?4}}tJ/2????w????? U?+?*???Xh?}??k??C??#?7??s ???  ????1|??f7P?9p(@ ?L` ?v?????Hn?????S??????+?S]?,?D|6????M????8?i???8??1`l ??t/?I???Z?B??????%%M??????[?"???????"R r*b%l8*ej??(??!!)F?X?\?$ J 7?! ??H$?;q???Tlt%? %???5jt  ???h ????9???~?|?? ?p????? ????????|f`??FQ @X ???5????@?# ^?????????'T  c?0????Se2?Q?a??kd??|?J.??p?? n???_????? e?????'?y?B?o?w?? ???G??E0l???C?H9????KJJ????1??i?[+?0V???w??????]:fu?p??AL???$kr``j&+OX?1?=?? ??'Hm???,??8??b ?-??A???6t???^???X????z???A???????0?5 "{1?[?`y#tL?????????t??l?8We??[m??:?????]??@m???UN?/?5?iH?]?e???T?%?????y?J  4??Ci???#E'?`D @  ???k>?CH???K?"????cX {t>$8?)??2?? ?4???t?????K????t8?????9G?}f2?n?|?>?aDB???d????t:=??L??]????~? ^G,v?6???/I?b6?.55?X?m??? P?T ??pP???4b?X?R???2?\?bY??? ?????????M&JE???fhny?????? @????h4J#?1???t?T?-9? ?#@?O?j? zo??  ?`???O4J@^R?V(??"m?R?_?5?)h?? ns?w?? ?r? 1?Q? ??{_? d?:b ?%????"???V*?'???j?=g?_??X?FZ]????PR??a|??  ?R?????}$??L'?$?$wf?=.?4?Z?9??w??=??;?????H$O&?N?R???d?"?`??b??R?koL?a,.?RW???1$R???lv????p\??Rc??????????z?|???(?bz????$od????????[????????n?GG?eTU)??o??;????splq-??N&?t.??|?a?U?d,??C??-?u??e??dd2??]P  ????9??| ????7?????(?NO?8????&???zG????????xA??????|??jt??Q at u?\N????1?????????????p??iE???wp??psX???1???N Zz ?p?@??(?c(??r9V?* ?(?;???"???<(??_??(?@?q???I?d?M]%8??$?#???6???@??2? : ???.??^? C?D?1GD?0??41???VG?H???b`HQ:?g??b??9?*?o?1??@??[f??-}?(?M$??/+Eisd?t???KI} B?y???e??7?+?^???????,?q???7z?????]L5???0u??{????aJ??g?9|??????g???$8gv??x6???c(?]?  iW?|?????7???-?? 3^|????;ou???D!Rl?.?v?6X???E??????g??c???L????~?t?V?]????}?l~?2?_7r????h??????t????&??S???]??????`?^?&g???? ?gK????,z?'?? ??????????? M.??EEm`?A?? ?_>??g??????  &2??p ~??!??`??k?WPq??c??@?P ??o4a??[?A??2?`6??x?(w:}???e  ?l??R C???~?{V???5;??4i?P?q??7???? ?????m????/???? )?L?j???x???_??m?*  ??S!?f! ??m????i@????3?????J?E?GqE? ? ??N?=???8?q??N?f?]???A?{^Q????@???? ?\? ?ZhP??z=U??5@l5S?????'g??:??x???? [??h?f6??v??6???????,??eg?`???A??Z9???p'??n????Z?????? ;??????  ?*g??(?? r??<.?c?*?????$\??? )???&??LE????????^?#????-????S??O&?>?????^)??   ???u???? `466.???z????UHV?????_{???????????(((H? LH??????=???I@??????s????????????%Se????)????????S???{?????y??wK??a????????\??????7???????`@????t?? o|2s??????? ????3???kL???w?????? ^`?!n#!!?3&6??yp?O?????|?y??E&?uIL???_??????7o??????????>P?? nnn? M??g?????@??i?;qJc??  ???????( 3;;?????y!A?lZd2i??FP??A??Z??????????z ?s????2?]?U}??vS???U?$?wf??q@?,<_???y)????? ???<?~????p?e???????????s???????  ?????EKR'?S???fviQ?S` ? ??????O???i>?[?A??2?`6??x?(w:}???e   \`?V?x[????6XY%?lh?TiU+??eb?G??: ??0E?J???u at YE???S~$???@N???????? ????I?????}???s??????,M?KZ?{?~????EW?#??????y5u??K??????#????&??-`%?/??`?|????O??}????+?K??^??X?R????'??-]Xszp]:?ze??w?[?UG??G&'` ????????W=????C??=t???;j?2?!(?????t???5B??!????????z???"???vp?T??n??????[?FM]?!??{???:~h??W??%?.19?????[vm[???p0?]?????q????? ????!? IN? ?????^?[??-FH?6?? ????|???E?"????i??????~????????? ??C?u???g? !k?7?^onT ???! ? x{sc~?? ??]p????g?????K??;???[z??AoII???9v???? ?h ?B?????Q__?i]??^?????6??? `| ????#??????????//?4???f?????8>??c?9?6u?????y???q??D?Q???PMM 48.?7?#?? ?@!6*???hjjv1?z??0?r???>?=XT P p ???;?K?p~V eR????n?????I?? ???} ?~?u ?u??  ??`???3??!???iN??T???`pp})8?????z? ?2?N? T??R ?? ?;?d??? ?H?|?   ??K??m9???N??H??5?s)Y_?"??????Q???~??O?????f?#?????????U/??He?BX?fK?????????? ?Nn???'?7????IO?D?_?z?????~????????#?)A??z???)????m;?~?? ??=Z????{[?oQ'?n???+???}v?e7?}???.?@??>? ?fJtvR|????? ?9????1Q?u?.??????o??????l??o??? ?? ?S??&?????P??6j????Hzk~?3?q |L???<???Z?O??#L?????????\?G*D[? C1???mX2[?Z ?^?+*2??"??xg,@!w|$?????w?!L?3?ly5???W$#? `?}o? ?NHSRi?H?s$???Z|????????nN??q^?k? 4?K??{0???KI 3???t???,?a9?4??TU)m ? M*~?uE"(mJ ?K?k????&?????x????e?????????o^p pU??4????B h???'?fG??r???0,??TE?*`T?)?ciBH5??UI??|????5/>d???????O1?{??\p?Q`xi4??d0?B%?????&?0aU?J???~?oM?HO3?Rq?????9*??z_d??? 70????|?$?[3?AG?1~???Z -?? ?'?6????Hc=f?@?L??p&?+?7?{|>?+??Gr???? ?1???n"?I?? ?=`&F?u?K2f? ???? ???:????1;' ?T????$?? ?. \!????qO?1Y?9%`E??x ?j\BV'n??\@Aru?0 ?m?F,k??*8A s????An?\@???j|?L??L4??K?????XDu?????Bq???|???^ ? "???k??_??*9???-@,j??H?? ???f_?^??T?l?g??,T@o?p?_q?iG?8?-?? ??@M???kn???Y????$??????????/|??s??\>???????????????"8????z?_? ? $x????? ?Q???A83Z???R?X?????Lzq??????0??x????3w??9??$La??u[`??|??_|???;v?m????o????S?|?}??g?yf ?? ??? ???c?5????????t???$ ???3k?9????}?????N??????F=1jA@?u>=\?U]SI??C?????f?8??1?4 ??4??65??Z\s?7????@????}?kO?\????o?????? 4?X?Ff? ???????m?.[Hq42W??/;????O???? ??k?????[?5???^*??9?????[a?7??o??A?M7?t??-[A?g&?9???/??O[?? Hz???????? +? ?? , ?=?f??N??*?:< [ /RGtMv?u???rm_^??!-?P?9}??w??]Fdn??????#?K|?S?z????~??x1????&?9?? Qd[???n??n!bnc+????i83?? ;2??C?_??-+????|??bm??O=?????????? ?????7???:?>%?SN9??? ???????? ????E?&?Q ci??? ?D??P?9???N!S??xB? ???UL?y???Z????;?????y]???3??a?g?7 06??d?A?? ?GQ t7j?B?H$??????!=NWY?? ??'a9f?4.Fq&?HB?O??_???????w?[??^d?$Q^G"?J???N ????"?`?K??B?9O????F"???K^ ?L?j??*????:U????>?????O?8??K?=?r?E?`s??wl?6_~q ?N?j???9?Y????2?y?S???M??9?I?:O,?2?U?_??????>?`?Z3s??K?|~q??T.???=???? ?_~?}|??,?&v)???N????-????n?P??f?E???R.?`ma$???T:q?????6O?1[????+??[???"c??Kc??.???;Q???9?????0??[?r??N???@oL? ???9???)i??Y???bs?w??? R?"??J?`????Rz?Ld,?r?????G`?\???( R`???^rX5?#?f????95 qqq???????J?r?|oR??u>???????}y?\?t08C\?????ZV??DF? {}~L?A!????k?s?f_C???????%&&??? ?x??a??L??N?I.?CJlm9^v8??????y??Z%??BH?>@?(??"?b?+? ?B?7???v??? ?q6}r?uZ??Jg?h ????,?F?z??]xrr?>??x?>???G?V???2 \9?+?? ?1?hr?Wuw????b???N???s_W?????????5p.Jc?'?+?&????????px?#?6??0t?>A0Y???m?wb???? ?? ? 2u;M?zL??([?-????L?=B?e??????f88??%??)?)?K?b ?????????Z??a???)??x???R/???(????u?'??F??6X??H???~V?? 5?2O  X.@???_c??1C?e?Z?_ ?z??{?eI?J|&`???I:????_r%I.???"d#S =c*??n??A ????????A-?G5X?z?as?V?S??&?t??IP4?3?A??}Z? h1:??bt ?vdS?U??#S???N?)?#?]???a]cj??y?+6|??A?h?l?????H??;?7????? ?2"?!?? b? 6????,?v?????q??C?*??WC???/V?_?? ?&-G??IQ?T?!}?  ,??"?l! K???? ??4?0?D?DA+??1?L??QI??q)qM?R??A?1&? 5????(?8?sm|???????o9?|?"B??4?l? ??v?6d j?? ??????????????I????G?? ?W{?*n0A??raN< KJ?7?I??M??tj??v'??(???!?}D??? +>?A?4??yDZ"w?5:=????????hO8c???9%=%I(?RA???]T G??mx???C??k???v???95 ??p8?.?r?/?oQ????????A}&F? ??s?g???kF$?y?Q?a????????\????????0?Ob??D?Mt?@?? ???CE???@?M???????N<!???/??c??+??W??? ??\ g?Z?S?-LB??9 ???PS???m?r_e6F?5????5P?U\ z????h?L??6 ??.C?r???{?H??9???*.?M{?a4 u?Td??qf??bY? ???$:a?  3d*U?c:8 ?5R@?`In!$?u??:??s????? @t??^??#9???????{?}IJ???R????3?U?q)?x?KS#;;?O?Pg?`???KI`$.-CuO?? ,!3$ ! ?u??v???x????_s???]?vI??y?;v?n8R7??????Y?Z??H??? ?c???q6!??= ??H?$??99H5?H ??1????B???n?RH@??????? ??90i???B`?)?$??20M??53? @ K??2Q??x?z??F??DY??~?????? '??R?3?:????qH? (?z?????(???ge???H??Fi??????p_3wN @????a??iT???XJ???7???M#rrH???:D"LF`??N:?L^? `??+????/?? ?42q:=2????h?????D? W???I?fd(?)SX?????`:G?!?W4_x???w? ?.???(? C&?@?@??]??g{??`G 1??????  "??iF???WDPc?P???????H??  @?i???ry?t??N?8_!?A` ???????1shh?????.*K?T??ELc?Fe ?T?%?A???t??|?8x?d??7?????@ZOg? ??????l?? dH?????6@?y ?: M?{?U??q`?f?? ~?F_u?  ??w?????~??? A~?d?????W/8?E?a????@  Q????#????????? @C?\?{ f` ?S??e8?????_F?` ?r ????????~??? (?? 4 M????;???? ?^?%"d mi? ????? ???}gxv? ???>?zv?T@?Ar  O80???? h??? ????? ? @??????????_???7778????l (I?????????3??????  HB!H$j???LF2:???? ??????v?#e?? ?Q'?15e?bp?$}}??0v??MR?&?????u`?|^????,??4 P&??Sj??m??L?V? ?W? ?E???*??wff?<v???!?:??c? ????5?Z?c?=?????a???????i?~!TrMWN?:^???????,d4tz??x?????J??h_g?=?{E??S!?_ 1?R??G???\?c??[ ??29v???X?:?`???O??B?X@SJ uz?>G??zh????|?;? ???J7????A&? 1;??&?????Pj??*??????LNL??????ek???L?k9MM5??m?D??w???o]??L??   ?u?? Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/psi/FC-2/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 Nov 2004 05:14:00 -0000 1.4 +++ .cvsignore 18 Jan 2005 19:10:12 -0000 1.5 @@ -1,15 +1,19 @@ -psi-0.9.2.tar.bz2 -psi-icons.tar.bz2 psi_ca.qm.bz2 psi_cs.qm.bz2 -psi_de.qm.bz2 psi_el.qm.bz2 psi_es.qm.bz2 -psi_fr.qm.bz2 psi_it.qm.bz2 psi_mk.qm.bz2 +psi_se.qm.bz2 +psi-0.9.3.tar.bz2 +psi_de.qm.bz2 +psi_ee.qm.bz2 +psi_et.qm.bz2 +psi_fi.qm.bz2 +psi_fr.qm.bz2 psi_nl.qm.bz2 psi_pl.qm.bz2 -psi_se.qm.bz2 +psi_ru.qm.bz2 psi_sk.qm.bz2 +psi_sw.qm.bz2 psi_zh.qm.bz2 Index: psi.spec =================================================================== RCS file: /cvs/extras/rpms/psi/FC-2/psi.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- psi.spec 8 Nov 2004 05:14:00 -0000 1.5 +++ psi.spec 18 Jan 2005 19:10:12 -0000 1.6 @@ -1,33 +1,32 @@ # Psi has no KDE-specific feature yet, but it's in the TODO list %{!?_without_kde:%define with_kde 1} -Name: psi -Version: 0.9.2 -Release: 0.fdr.2.2 -Summary: Jabber client using QT3 +Name: psi +Version: 0.9.3 +Release: 0.fdr.1.2 +Summary: Jabber client using QT3 Epoch: 0 -License: GPL -Group: Applications/Internet -URL: http://psi.affinix.com/ -Source0: http://dl.sf.net/psi/psi-0.9.2.tar.bz2 -Source1: %name-icons.tar.bz2 +License: GPL +Group: Applications/Internet +URL: http://psi.affinix.com/ +Source0: http://dl.sf.net/psi/psi-0.9.3.tar.bz2 Source2: psi-uicwrapper.sh Patch1: psi-0.9.2-strip.patch Patch2: psi-0.9.2-mach-build.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel >= 1:3.1.1 -#BuildRequires: qt-designer >= 1:3.1.1 BuildRequires: XFree86-devel BuildRequires: zlib-devel BuildRequires: desktop-file-utils +BuildRequires: qca-devel %if 0%{?with_kde} BuildRequires: kdelibs-devel %endif -Requires: sox +Requires: sox Requires: gnupg -Requires: qca-tls # Language packs Source50: psi_pl.qm.bz2 @@ -35,9 +34,9 @@ Source52: psi_fr.qm.bz2 #Source53: psi_eo.qm.bz2 #Source54: psi_sr at Latn.qm.bz2 -#Source55: psi_fi.qm.bz2 +Source55: psi_fi.qm.bz2 Source56: psi_cs.qm.bz2 -#Source57: psi_ru.qm.bz2 +Source57: psi_ru.qm.bz2 Source58: psi_de.qm.bz2 Source59: psi_es.qm.bz2 Source60: psi_mk.qm.bz2 @@ -48,7 +47,9 @@ Source65: psi_se.qm.bz2 Source66: psi_ca.qm.bz2 Source67: psi_zh.qm.bz2 - +Source68: psi_sw.qm.bz2 +Source69: psi_ee.qm.bz2 +Source70: psi_et.qm.bz2 # Emoticonsets Source100: Chibi.jisp @@ -63,12 +64,14 @@ Source109: Ninja.jisp Source110: webmessenger.jisp - # Rostericonsets Source130: weather.jisp Source131: icqG.jisp Source132: gaduGaduG.jisp -#Source133: neos.jisp +Source133: http://www.cs.kuleuven.ac.be/~remko/psi/crystal/crystal_roster.jisp + +# System iconsets +Source160: http://www.cs.kuleuven.ac.be/~remko/psi/crystal/crystal_system.jisp %description @@ -86,23 +89,9 @@ %description -n %name-i18n This package adds internationalization to Psi. -Supported languages are: -- Polish (pl) -- French (fr) -- Spanish (es) -- Macedonian (mk) -- Dutch (nl) -- Slovak (sk) -- Cesky (cs) -- Catalan (ca) -- German (de) -- Simplified Chinese (zh) -- Italiano (it) -- Greek (el) -- Svenska (se) If you want to add a translation from http://psi.affinix.com, just put the .qm file in %_datadir/%name (you'll have to do -this as root) +this as root), and restart psi. %package -n %name-icons Summary: Additional icons for Psi @@ -119,7 +108,7 @@ %prep -%setup -q -a 1 +%setup -q # (ugly) hack to enable debuginfo subrpm %patch1 -p1 -b .strip # needed to build with mach @@ -133,8 +122,8 @@ %endif ./configure \ - --prefix=%{_prefix} \ - --bindir=%{_bindir} \ + --prefix=%{_prefix} \ + --bindir=%{_bindir} \ --libdir=%{_datadir}/%name \ --qtdir=$QTDIR @@ -161,9 +150,9 @@ %__bzip2 -dck %{SOURCE52} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_fr.qm #%__bzip2 -dck %{SOURCE53} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_eo.qm #%__bzip2 -dck %{SOURCE54} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_sr at Latn.qm -#%__bzip2 -dck %{SOURCE55} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_fi.qm +%__bzip2 -dck %{SOURCE55} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_fi.qm %__bzip2 -dck %{SOURCE56} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_cs.qm -#%__bzip2 -dck %{SOURCE57} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_ru.qm +%__bzip2 -dck %{SOURCE57} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_ru.qm %__bzip2 -dck %{SOURCE58} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_de.qm %__bzip2 -dck %{SOURCE59} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_es.qm %__bzip2 -dck %{SOURCE60} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_mk.qm @@ -174,6 +163,9 @@ %__bzip2 -dck %{SOURCE65} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_se.qm %__bzip2 -dck %{SOURCE66} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_ca.qm %__bzip2 -dck %{SOURCE67} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_zh.qm +%__bzip2 -dck %{SOURCE68} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_sw.qm +%__bzip2 -dck %{SOURCE69} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_ee.qm +%__bzip2 -dck %{SOURCE69} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_et.qm ## Install iconsets install -p %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/ @@ -191,7 +183,9 @@ install -p %{SOURCE130} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/ install -p %{SOURCE131} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/ install -p %{SOURCE132} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/ -#install -p %{SOURCE133} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/ +install -p %{SOURCE133} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/ + +install -p %{SOURCE160} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/system/ # Menu perl -pi -e 's/Icon=psi/Icon=psi.png/' $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/%{name}.desktop @@ -204,11 +198,8 @@ $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/%{name}.desktop # icon -install -p -D -m 644 %{name}48.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%name.png -install -p -D -m 644 %{name}32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%name.png -install -p -D -m 644 %{name}16.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%name.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -ln -s ../icons/hicolor/48x48/apps/%name.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%name.png +ln -s ../icons/hicolor/48x48/apps/psi.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%name.png %clean @@ -236,6 +227,26 @@ %changelog +* Sun Jan 09 2005 Aurelien Bompard 0:0.9.3-0.fdr.1 +- version 0.9.3 final + +* Mon Jan 03 2005 Aurelien Bompard 0:0.9.3-0.fdr.0.3.test2 +- version 0.9.3-test2 + +* Thu Nov 25 2004 Aurelien Bompard 0:0.9.3-0.fdr.0.2.test1 +- Drop hardcoded requirement on qca-tls, it should be a plugin + +* Mon Nov 22 2004 Aurelien Bompard 0:0.9.3-0.fdr.0.1.test1 +- update to 0.9.3test1 +- use the provided icon in the menu and drop Source1. +- add crystal iconset +- added Russian and Eesti translations + +* Sat Sep 18 2004 Aurelien Bompard 0:0.9.2-0.fdr.3 +- add patch for typing notification +- add crystal iconset +- update translations (adding kiswahili and Eesti) + * Fri Jun 11 2004 Aurelien Bompard 0:0.9.2-0.fdr.2 - split qca-tls out of this package and require it - fix build on FC1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/psi/FC-2/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Nov 2004 05:14:00 -0000 1.4 +++ sources 18 Jan 2005 19:10:12 -0000 1.5 @@ -1,15 +1,19 @@ -e29f90aea7d839f2a70e4a6e77e95a70 psi-0.9.2.tar.bz2 -d8d5faecb51ea9b7e814e75b3cfa15f2 psi-icons.tar.bz2 1689645b1e2bf181c6fc2d68f070cf0d psi_ca.qm.bz2 69f88fc4768d963bed4cd3ebfbb75a28 psi_cs.qm.bz2 -8cf8142dc0f00b3169d9ba8fdd4793a5 psi_de.qm.bz2 da61ff1ec70cf90357d78f6c81d0ad86 psi_el.qm.bz2 c831c0924c363e8bac42aab577f6982d psi_es.qm.bz2 -8b525df4dce83f5115d92bca5526ca26 psi_fr.qm.bz2 022996fd1f35f26a777f07d667071421 psi_it.qm.bz2 3e1ac01eaf5451f1b1d0968b2f911983 psi_mk.qm.bz2 -084cf4d01df12cd44a3b02e58f75c30a psi_nl.qm.bz2 -02f712f564a07b8fbd3beae0107cc19f psi_pl.qm.bz2 8cc619e6752d6c4db5093eca5d458f0a psi_se.qm.bz2 -e0c9220a54d2622478599cb94c1c38b8 psi_sk.qm.bz2 -5399ddcc710b216c2b816162b7c2f0ba psi_zh.qm.bz2 +d20f3bb530235a246bc2d92308089744 psi-0.9.3.tar.bz2 +52611e036dd0b7cb2ecadcf16eeb9632 psi_de.qm.bz2 +2e19193ebcfd59f80badf011714a2c82 psi_ee.qm.bz2 +2e19193ebcfd59f80badf011714a2c82 psi_et.qm.bz2 +74053f86b57bd74be4b2866dd02b730d psi_fi.qm.bz2 +dd8f83f3c3fc1c20d094f6570acaad4b psi_fr.qm.bz2 +a0cc2e82074a2be17c5ad0004747ac43 psi_nl.qm.bz2 +d3418d4383e47f37f7fedbbc9591db6c psi_pl.qm.bz2 +5e701ee8f56b01c65f3097f5ba13f63c psi_ru.qm.bz2 +784e291e51e4746b602e182ab9ec3ac2 psi_sk.qm.bz2 +a5570c823cfbe33ee602110b89cf4e16 psi_sw.qm.bz2 +38629928c813dc54fc04b38de5e6dcee psi_zh.qm.bz2 From fedora-extras-commits at redhat.com Tue Jan 18 19:11:53 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 18 Jan 2005 14:11:53 -0500 Subject: rpms/taglib import.log,1.4,1.5 Message-ID: <200501181911.j0IJBrqQ005741@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/taglib In directory cvs.fedora.redhat.com:/tmp/cvs-serv5731 Modified Files: import.log Log Message: auto-import taglib-1.3.1-0.fdr.1.2 on branch FC-2 from taglib-1.3.1-0.fdr.1.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/taglib/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 8 Nov 2004 05:24:36 -0000 1.4 +++ import.log 18 Jan 2005 19:11:51 -0000 1.5 @@ -1,3 +1,4 @@ taglib-1_1-0_fdr_5_1:HEAD:taglib-1.1-0.fdr.5.1.src.rpm:1099891467 taglib-1_1-0_fdr_5_2:HEAD:taglib-1.1-0.fdr.5.2.src.rpm:1099891473 taglib-1_3-0_fdr_1_2:HEAD:taglib-1.3-0.fdr.1.2.src.rpm:1099891476 +taglib-1_3_1-0_fdr_1_2:FC-2:taglib-1.3.1-0.fdr.1.2.src.rpm:1106075504 From fedora-extras-commits at redhat.com Tue Jan 18 19:11:53 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 18 Jan 2005 14:11:53 -0500 Subject: rpms/taglib/FC-2 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 taglib.spec, 1.3, 1.4 Message-ID: <200501181911.j0IJBrEG005745@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/taglib/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv5731/FC-2 Modified Files: .cvsignore sources taglib.spec Log Message: auto-import taglib-1.3.1-0.fdr.1.2 on branch FC-2 from taglib-1.3.1-0.fdr.1.2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/taglib/FC-2/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 05:24:36 -0000 1.3 +++ .cvsignore 18 Jan 2005 19:11:51 -0000 1.4 @@ -1 +1 @@ -taglib-1.3.tar.gz +taglib-1.3.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/taglib/FC-2/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 05:24:36 -0000 1.3 +++ sources 18 Jan 2005 19:11:51 -0000 1.4 @@ -1 +1 @@ -54fe2a3abf0cf77130207846b0ce6ef4 taglib-1.3.tar.gz +f5c7c71513ba51b240864d7475a199c0 taglib-1.3.1.tar.gz Index: taglib.spec =================================================================== RCS file: /cvs/extras/rpms/taglib/FC-2/taglib.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- taglib.spec 8 Nov 2004 05:24:36 -0000 1.3 +++ taglib.spec 18 Jan 2005 19:11:51 -0000 1.4 @@ -1,13 +1,13 @@ -Name: taglib -Version: 1.3 +Name: taglib +Version: 1.3.1 Release: 0.fdr.1.2 -Epoch: 0 +Epoch: 0 Summary: Audio Meta-Data Library Group: System Environment/Libraries License: LGPL URL: http://ktown.kde.org/~wheeler/taglib/ -Source: http://developer.kde.org/~wheeler/files/src/taglib-1.3.tar.gz +Source: http://developer.kde.org/~wheeler/files/src/taglib-1.3.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -34,12 +34,13 @@ %build -%configure +%configure --disable-rpath make %{?_smp_mflags} # Doc -cd taglib-api +pushd taglib-api doxygen taglib.doxygen +popd %install rm -rf $RPM_BUILD_ROOT @@ -47,8 +48,8 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -fr examples/.deps rm -fr examples/Makefile* +rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la -find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %files %defattr(-,root,root) @@ -74,6 +75,15 @@ %changelog +* Mon Jan 10 2005 Aurelien Bompard 0:1.3.1-0.fdr.1 +- version 1.3.1 +- drop patch0 +- don't nuke every .la files, only the useless ones +- spec improvements thanks to Rex Dieter + +* Thu Nov 04 2004 Aurelien Bompard 0:1.3-0.fdr.2 +- add apeitem.h to the include files in -devel + * Mon Oct 04 2004 Aurelien Bompard 0:1.3-0.fdr.1 - version 1.3 From fedora-extras-commits at redhat.com Tue Jan 18 19:13:34 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 18 Jan 2005 14:13:34 -0500 Subject: rpms/taglib/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 taglib.spec, 1.5, 1.6 taglib-1.3-apeitem.patch, 1.1, NONE Message-ID: <200501181913.j0IJDYQh005864@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/taglib/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv5852/devel Modified Files: .cvsignore sources taglib.spec Removed Files: taglib-1.3-apeitem.patch Log Message: auto-import taglib-1.3.1-1 on branch devel from taglib-1.3.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/taglib/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 05:24:36 -0000 1.3 +++ .cvsignore 18 Jan 2005 19:13:31 -0000 1.4 @@ -1 +1 @@ -taglib-1.3.tar.gz +taglib-1.3.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/taglib/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 05:24:36 -0000 1.3 +++ sources 18 Jan 2005 19:13:31 -0000 1.4 @@ -1 +1 @@ -54fe2a3abf0cf77130207846b0ce6ef4 taglib-1.3.tar.gz +f5c7c71513ba51b240864d7475a199c0 taglib-1.3.1.tar.gz Index: taglib.spec =================================================================== RCS file: /cvs/extras/rpms/taglib/devel/taglib.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- taglib.spec 10 Dec 2004 22:03:11 -0000 1.5 +++ taglib.spec 18 Jan 2005 19:13:31 -0000 1.6 @@ -1,14 +1,13 @@ -Name: taglib -Version: 1.3 -Release: 2 -Epoch: 0 +Name: taglib +Version: 1.3.1 +Release: 1 +Epoch: 0 Summary: Audio Meta-Data Library Group: System Environment/Libraries License: LGPL URL: http://ktown.kde.org/~wheeler/taglib/ -Source: http://developer.kde.org/~wheeler/files/src/taglib-1.3.tar.gz -Patch0: taglib-1.3-apeitem.patch +Source: http://developer.kde.org/~wheeler/files/src/taglib-1.3.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -32,16 +31,16 @@ %prep %setup -q -%patch0 -p0 -b .apeitem %build -%configure +%configure --disable-rpath make %{?_smp_mflags} # Doc -cd taglib-api +pushd taglib-api doxygen taglib.doxygen +popd %install rm -rf $RPM_BUILD_ROOT @@ -49,8 +48,8 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -fr examples/.deps rm -fr examples/Makefile* +rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la -find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %files %defattr(-,root,root) @@ -76,6 +75,12 @@ %changelog +* Mon Jan 10 2005 Aurelien Bompard 0:1.3.1-1 +- version 1.3.1 +- drop patch0 +- don't nuke every .la files, only the useless ones +- spec improvements thanks to Rex Dieter + * Thu Nov 04 2004 Aurelien Bompard 0:1.3-0.fdr.2 - add apeitem.h to the include files in -devel --- taglib-1.3-apeitem.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jan 18 19:13:34 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 18 Jan 2005 14:13:34 -0500 Subject: rpms/taglib import.log,1.5,1.6 Message-ID: <200501181913.j0IJDYGO005861@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/taglib In directory cvs.fedora.redhat.com:/tmp/cvs-serv5852 Modified Files: import.log Log Message: auto-import taglib-1.3.1-1 on branch devel from taglib-1.3.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/taglib/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 18 Jan 2005 19:11:51 -0000 1.5 +++ import.log 18 Jan 2005 19:13:31 -0000 1.6 @@ -2,3 +2,4 @@ taglib-1_1-0_fdr_5_2:HEAD:taglib-1.1-0.fdr.5.2.src.rpm:1099891473 taglib-1_3-0_fdr_1_2:HEAD:taglib-1.3-0.fdr.1.2.src.rpm:1099891476 taglib-1_3_1-0_fdr_1_2:FC-2:taglib-1.3.1-0.fdr.1.2.src.rpm:1106075504 +taglib-1_3_1-1:HEAD:taglib-1.3.1-1.src.rpm:1106075601 From fedora-extras-commits at redhat.com Tue Jan 18 19:30:07 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 18 Jan 2005 14:30:07 -0500 Subject: common cvs-import.sh,1.3,1.4 Message-ID: <200501181930.j0IJU7PA006142@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/common In directory cvs.fedora.redhat.com:/tmp/cvs-serv6133/common Modified Files: cvs-import.sh Log Message: Make *.jisp go to lookaside cache. Index: cvs-import.sh =================================================================== RCS file: /cvs/extras/common/cvs-import.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cvs-import.sh 12 Dec 2004 20:37:01 -0000 1.3 +++ cvs-import.sh 18 Jan 2005 19:30:05 -0000 1.4 @@ -307,7 +307,7 @@ case $f in *.tar | *gz | *.bz2 | *.Z | *.zip | *.ZIP | \ *.ttf | *.bin | *.tbz | *.pdf | *.rpm | \ - *.jar | *.war | *.db | *.cpio ) + *.jar | *.war | *.db | *.cpio | *.jisp ) UPLOADFILES="$UPLOADFILES $f" if [ -n "$(grep $f sources 2>/dev/null)" ] ; then # this file existed before with a different md5sum From fedora-extras-commits at redhat.com Tue Jan 18 19:30:07 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 18 Jan 2005 14:30:07 -0500 Subject: rpms/psi/FC-2 sources, 1.5, 1.6 Chibi.jisp, 1.1, NONE KMess-Cartoon-1.0.jisp, 1.1, NONE Ninja.jisp, 1.1, NONE apple_ichat-1.0.jisp, 1.1, NONE crystal_roster.jisp, 1.1, NONE crystal_system.jisp, 1.1, NONE gaduGaduG.jisp, 1.1, NONE icqG.jisp, 1.1, NONE kreativ_squareheads.jisp, 1.1, NONE shinyicons.jisp, 1.1, NONE tlen.pl-3.73.jisp, 1.1, NONE trill-extra-smileys.jisp, 1.1, NONE trill-extra-symbols.jisp, 1.1, NONE weather.jisp, 1.1, NONE webmessenger.jisp, 1.1, NONE yahoo_messenger.jisp, 1.1, NONE Message-ID: <200501181930.j0IJU788006146@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/psi/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv6133/psi/FC-2 Modified Files: sources Removed Files: Chibi.jisp KMess-Cartoon-1.0.jisp Ninja.jisp apple_ichat-1.0.jisp crystal_roster.jisp crystal_system.jisp gaduGaduG.jisp icqG.jisp kreativ_squareheads.jisp shinyicons.jisp tlen.pl-3.73.jisp trill-extra-smileys.jisp trill-extra-symbols.jisp weather.jisp webmessenger.jisp yahoo_messenger.jisp Log Message: Make *.jisp go to lookaside cache. Index: sources =================================================================== RCS file: /cvs/extras/rpms/psi/FC-2/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 18 Jan 2005 19:10:12 -0000 1.5 +++ sources 18 Jan 2005 19:30:05 -0000 1.6 @@ -17,3 +17,19 @@ 784e291e51e4746b602e182ab9ec3ac2 psi_sk.qm.bz2 a5570c823cfbe33ee602110b89cf4e16 psi_sw.qm.bz2 38629928c813dc54fc04b38de5e6dcee psi_zh.qm.bz2 +259f0351152852d8091b092440557bab apple_ichat-1.0.jisp +6d98db4a5fab3c5909a422d983ed336f Chibi.jisp +14f8bdbea1873b2972d56726c4c011cf crystal_roster.jisp +ee56b25a85ec3ddef64339e177f7028d crystal_system.jisp +a4aada51bbf57c17c2bfda5ba52717ec gaduGaduG.jisp +9d8b4be36909c235657d61698846aee1 icqG.jisp +459d5feae7cf05210f10ffd8df9ac93f KMess-Cartoon-1.0.jisp +f1760382d3aea32199aeb7303493a9ea kreativ_squareheads.jisp +cbe6f581bf32a2cb56e8bf5871db639d Ninja.jisp +9ec2c600f390dc725e4793383ff50ec2 shinyicons.jisp +099c70f9ca25623c89e3ba5b44af2e6d tlen.pl-3.73.jisp +6a3065d33b072e15decbfb3673028df6 trill-extra-smileys.jisp +b743f3f65dfe526b6d730044031d5c78 trill-extra-symbols.jisp +be98902383c572fd3cd6876a6940a73e weather.jisp +0a2ce25ab4506d563bf65da372c9f8f4 webmessenger.jisp +747a785fdaae8dc5a5ee78a3253035ab yahoo_messenger.jisp --- Chibi.jisp DELETED --- --- KMess-Cartoon-1.0.jisp DELETED --- --- Ninja.jisp DELETED --- --- apple_ichat-1.0.jisp DELETED --- --- crystal_roster.jisp DELETED --- --- crystal_system.jisp DELETED --- --- gaduGaduG.jisp DELETED --- --- icqG.jisp DELETED --- --- kreativ_squareheads.jisp DELETED --- --- shinyicons.jisp DELETED --- --- tlen.pl-3.73.jisp DELETED --- --- trill-extra-smileys.jisp DELETED --- --- trill-extra-symbols.jisp DELETED --- --- weather.jisp DELETED --- --- webmessenger.jisp DELETED --- --- yahoo_messenger.jisp DELETED --- From fedora-extras-commits at redhat.com Tue Jan 18 20:45:28 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 18 Jan 2005 15:45:28 -0500 Subject: rpms/imlib2/devel imlib2.spec,1.7,1.8 Message-ID: <200501182045.j0IKjSnK007089@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/imlib2/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv7083 Modified Files: imlib2.spec Log Message: Upload source tarball and really include the libtool archives! Index: imlib2.spec =================================================================== RCS file: /cvs/extras/rpms/imlib2/devel/imlib2.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- imlib2.spec 17 Jan 2005 09:43:09 -0000 1.7 +++ imlib2.spec 18 Jan 2005 20:45:26 -0000 1.8 @@ -1,7 +1,7 @@ Summary: A graphic library for file loading, saving, rendering, and manipulation Name: imlib2 Version: 1.2.0 -Release: 3 +Release: 4 Epoch: 0 License: BSD Group: System Environment/Libraries @@ -76,7 +76,7 @@ rm -f __doc/Makefile* rm -f \ - $RPM_BUILD_ROOT%{_libdir}/imlib2/{loaders,filters}/*.*a \ + $RPM_BUILD_ROOT%{_libdir}/imlib2/{loaders,filters}/*.a \ $RPM_BUILD_ROOT%{_bindir}/{color_spaces,imlib2,*test} # ship .la files due to a bug in kdelibs (see changelog): @@ -105,8 +105,10 @@ %{_datadir}/imlib2/data/ %dir %{_libdir}/imlib2/filters/ %{_libdir}/imlib2/filters/*.so +%{_libdir}/imlib2/filters/*.la %dir %{_libdir}/imlib2/loaders/ %{_libdir}/imlib2/loaders/*.so +%{_libdir}/imlib2/loaders/*.la %files devel %defattr(-,root,root,-) @@ -120,13 +122,16 @@ # ----------------------------------------------------------------------------- %changelog -* Fri Jan 14 2005 Thorsten Leemhuis - 0:1.2.0-4 +- Really include libtool archives to fix fedora.us bug #2284. + +* Fri Jan 14 2005 Thorsten Leemhuis - 0:1.2.0-3 - Move filters and loaders back into main package where they belong -* Mon Jan 10 2005 Thorsten Leemhuis - 0:1.2.0-2 - Don't ship *.?.a in {_libdir}/imlib/filters/ and loaders/ -* Sun Jan 09 2005 Thorsten Leemhuis - 0:1.2.0-1 - Ship .la files ue to a bug in kdelibs; see https://bugzilla.fedora.us/show_bug.cgi?id=2284 http://bugzilla.redhat.com/bugzilla/142244 @@ -140,7 +145,7 @@ - use configure param --x-libraries={_prefix}/X11R6/{_lib} and patch to fix "cannot find -lX11" -* Thu Dec 30 2004 Thorsten Leemhuis - 0:1.1.2-2 - Disable mmx on x86_64 (fixes Build error) - Add explicit libdir=_libdir to make calls to avoid install errors on x86_64 - Add --with-pic configure option (taken from Matthias Saou's package) From fedora-extras-commits at redhat.com Tue Jan 18 22:42:26 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 18 Jan 2005 17:42:26 -0500 Subject: rpms/liferea/devel sources, 1.4.2.1, 1.4.2.2 liferea.spec, 1.6.2.1, 1.6.2.2 liferea.desktop, 1.1.2.1, NONE Message-ID: <200501182242.j0IMgQDL008735@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/liferea/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv8727 Modified Files: Tag: liferea-0_9_0-testing sources liferea.spec Removed Files: Tag: liferea-0_9_0-testing liferea.desktop Log Message: Update testing branch to 0.9.0b from Brian. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/sources,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -u -r1.4.2.1 -r1.4.2.2 --- sources 18 Jan 2005 16:17:07 -0000 1.4.2.1 +++ sources 18 Jan 2005 22:42:24 -0000 1.4.2.2 @@ -1 +1 @@ -903a4e3db696ac11d1013e104428d57b liferea-0.9.0.tar.gz +2781b3ae500e089497fcbee97bf73441 liferea-0.9.0b.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -u -r1.6.2.1 -r1.6.2.2 --- liferea.spec 18 Jan 2005 16:17:07 -0000 1.6.2.1 +++ liferea.spec 18 Jan 2005 22:42:24 -0000 1.6.2.2 @@ -1,14 +1,13 @@ Name: liferea Version: 0.9.0 -Release: 1 +Release: 1.b Epoch: 0 Summary: An RSS/RDF feed reader. Group: Applications/Internet License: GPL URL: http://liferea.sourceforge.net/ -Source0: http://download.sourceforge.net/liferea/liferea-0.9.0.tar.gz -Source2: %{name}.desktop +Source0: http://download.sourceforge.net/liferea/liferea-0.9.0b.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel @@ -31,7 +30,7 @@ %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{version}b %build @@ -48,7 +47,7 @@ desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ - %{SOURCE2} + %{name}.desktop %clean @@ -83,6 +82,10 @@ %changelog +* Tue Jan 18 2005 Brian Pepple - 0:0.9.0-1.b +- Updated to 0.9.0b. +- Remove seperate desktop file. + * Fri Jan 14 2005 Brian Pepple - 0:0.9.0-1 - Updated to 0.9.0. --- liferea.desktop DELETED --- From fedora-extras-commits at redhat.com Thu Jan 20 10:42:44 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 20 Jan 2005 05:42:44 -0500 Subject: rpms/thttpd/devel thttpd.spec,1.4,1.5 Message-ID: <200501201042.j0KAgifx006892@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/thttpd/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv6886 Modified Files: thttpd.spec Log Message: Fix for log files > 2GB. Index: thttpd.spec =================================================================== RCS file: /cvs/extras/rpms/thttpd/devel/thttpd.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- thttpd.spec 16 Nov 2004 18:49:15 -0000 1.4 +++ thttpd.spec 20 Jan 2005 10:42:42 -0000 1.5 @@ -6,7 +6,7 @@ Summary: Tiny, turbo, throttleable lightweight http server Name: thttpd Version: 2.25b -Release: %{?prever:0.%{prever}.}4 +Release: %{?prever:0.%{prever}.}5 License: BSD Group: System Environment/Daemons URL: http://www.acme.com/software/thttpd/ @@ -42,7 +42,8 @@ %{!?_with_indexes: %{__perl} -pi -e 's/#define GENERATE_INDEXES/#undef GENERATE_INDEXES/g' config.h} %{!?_with_showversion: %{__perl} -pi -e 's/#define SHOW_SERVER_VERSION/#undef SHOW_SERVER_VERSION/g' config.h} %{!?_with_expliciterrors: %{__perl} -pi -e 's/#define EXPLICIT_ERROR_PAGES/#undef EXPLICIT_ERROR_PAGES/g' config.h} -%{__make} %{?_smp_mflags} WEBDIR=%{webroot}/html CGIBINDIR=%{webroot}/cgi-bin +%{__make} %{?_smp_mflags} WEBDIR=%{webroot}/html CGIBINDIR=%{webroot}/cgi-bin \ + CCOPT="%{optflags} -D_FILE_OFFSET_BITS=64" %install @@ -140,6 +141,9 @@ %changelog +* Thu Jan 20 2005 Matthias Saou 2.25b-5 +- Compile with -D_FILE_OFFSET_BITS=64 to support > 2GB log files. + * Tue Nov 16 2004 Matthias Saou 2.25b-4 - Bump release to provide Extras upgrade path. - Re-brand Fedora where it was freshrpms previously. From fedora-extras-commits at redhat.com Sat Jan 22 11:50:34 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 22 Jan 2005 06:50:34 -0500 Subject: rpms/perl-MailTools/devel .cvsignore, 1.3, 1.4 perl-MailTools.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200501221150.j0MBoYYI014957@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-MailTools/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv14951 Modified Files: .cvsignore perl-MailTools.spec sources Log Message: Update to 1.66. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 05:05:20 -0000 1.3 +++ .cvsignore 22 Jan 2005 11:50:32 -0000 1.4 @@ -1 +1 @@ -MailTools-1.64.tar.gz +MailTools-1.66.tar.gz Index: perl-MailTools.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/devel/perl-MailTools.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-MailTools.spec 10 Dec 2004 22:03:08 -0000 1.5 +++ perl-MailTools.spec 22 Jan 2005 11:50:32 -0000 1.6 @@ -2,13 +2,13 @@ Summary: MailTools module for Perl Name: perl-MailTools -Version: 1.64 +Version: 1.66 Release: 1 Epoch: 0 License: Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/MailTools/ -Source0: http://www.cpan.org/authors/id/M/MA/MARKOV/MailTools-1.64.tar.gz +Source0: http://www.cpan.org/authors/id/M/MA/MARKOV/MailTools-1.66.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -52,6 +52,9 @@ %changelog +* Sat Jan 22 2005 Ville Skytt?? - 0:1.66-1 +- Update to 1.66. + * Wed Aug 18 2004 Ville Skytt?? - 0:1.64-0.fdr.1 - Update to 1.64, patch applied upstream. - Bring up to date with current fedora.us Perl spec template. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 05:05:20 -0000 1.3 +++ sources 22 Jan 2005 11:50:32 -0000 1.4 @@ -1 +1 @@ -e417665e33aa1e9b00642c300e92ed06 MailTools-1.64.tar.gz +fe2dcdb1b58bd7cfc6f92559e6dcc7f7 MailTools-1.66.tar.gz From fedora-extras-commits at redhat.com Sat Jan 22 11:53:17 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 22 Jan 2005 06:53:17 -0500 Subject: rpms/perl-MIME-tools/devel .cvsignore, 1.2, 1.3 perl-MIME-tools.spec, 1.5, 1.6 sources, 1.2, 1.3 Message-ID: <200501221153.j0MBrH5J015000@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-MIME-tools/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv14994 Modified Files: .cvsignore perl-MIME-tools.spec sources Log Message: Update to 5.417. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-MIME-tools/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:04:35 -0000 1.2 +++ .cvsignore 22 Jan 2005 11:53:15 -0000 1.3 @@ -1 +1 @@ -MIME-tools-5.411a-RP-Patched-02.tar.gz +MIME-tools-5.417.tar.gz Index: perl-MIME-tools.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MIME-tools/devel/perl-MIME-tools.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-MIME-tools.spec 10 Dec 2004 22:03:08 -0000 1.5 +++ perl-MIME-tools.spec 22 Jan 2005 11:53:15 -0000 1.6 @@ -1,19 +1,21 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-MIME-tools -Version: 5.411 -Release: 6 +Version: 5.417 +Release: 1 Epoch: 0 Summary: Modules for parsing and creating MIME entities in Perl Group: Development/Libraries License: Artistic URL: http://search.cpan.org/dist/MIME-tools/ -Source0: http://www.mimedefang.org/static/MIME-tools-5.411a-RP-Patched-02.tar.gz +Source0: http://www.cpan.org/authors/id/D/DS/DSKOLL/MIME-tools-5.417.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-broot-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(IO::Stringy), perl(MIME::Base64), perl-MailTools +BuildRequires: perl(IO::Stringy) perl(MIME::Base64) >= 2.20 perl-MailTools +BuildRequires: perl >= 1:5.6.1 perl(MIME::QuotedPrint) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description MIME-tools is a collection of Perl5 MIME:: modules for parsing, @@ -23,28 +25,32 @@ %prep -%setup -q -n MIME-tools-%{version}a-RP-Patched-02 +%setup -q -n MIME-tools-%{version} chmod 644 examples/* # avoid dependencies %build -CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS" +%{__perl} Makefile.PL INSTALLDIRS=vendor +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install \ - PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \ - INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib} -find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \ - -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';' +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 ';' +rm -f $RPM_BUILD_ROOT%{perl_vendorlib}/set-version.pl chmod -R u+w $RPM_BUILD_ROOT/* %check || : -make test +if %{__perl} -MMIME::QuotedPrint \ + -e 'exit ($MIME::QuotedPrint::VERSION < 3.03)' ; then + make test +else + # Expected failures: 4, 5 and 7-11 of t/Misc.t + make test || : +fi %clean @@ -53,12 +59,28 @@ %files %defattr(-,root,root,-) -%doc COPYING README README-OR-DIE docs examples +%doc ChangeLog COPYING README README-OR-DIE examples %{perl_vendorlib}/MIME %{_mandir}/man3/MIME::*.3* %changelog +* Sat Jan 22 2005 Ville Skytt?? - 0:5.417-1 +- Update to 5.417. + +* Wed Jan 5 2005 Ville Skytt?? - 0:5.416-0.fdr.1 +- Update to 5.416. + +* Thu Oct 28 2004 Ville Skytt?? - 0:5.415-0.fdr.1 +- Update to 5.415. + +* Thu Oct 7 2004 Ville Skytt?? - 0:5.414-0.fdr.1 +- Update to 5.414. + +* Wed Sep 15 2004 Ville Skytt?? - 0:5.413-0.fdr.1 +- Update to 5.413, includes the mimedefang patches. +- Bring up to date with current fedora.us Perl spec template. + * Sat Feb 7 2004 Ville Skytt?? - 0:5.411-0.fdr.6.a - Install into vendor dirs. - BuildRequire perl-MailTools (bug 373). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-MIME-tools/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:04:35 -0000 1.2 +++ sources 22 Jan 2005 11:53:15 -0000 1.3 @@ -1 +1 @@ -9e726e08980647fe717dbceb8146106f MIME-tools-5.411a-RP-Patched-02.tar.gz +a92299db8729f0f7886ada6e3539b265 MIME-tools-5.417.tar.gz From fedora-extras-commits at redhat.com Sat Jan 22 13:32:13 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 22 Jan 2005 08:32:13 -0500 Subject: rpms/hddtemp/FC-2 hddtemp.db, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200501221332.j0MDWDvU016660@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/hddtemp/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv16639/FC-2 Modified Files: .cvsignore sources Added Files: hddtemp.db Log Message: Move hddtemp.db from lookaside cache to CVS for reproducible builds. It's an upstream text file whose name doesn't change between revisions. --- NEW FILE hddtemp.db --- # # DATABASE VERSION 03C (01/01/2004) # # Insert a regular expression for support of the model or the serie of your hard drive. # If you don't know what to put in the second field, put the number # that appears most often for your brand :o) # A value of zero meens that we know that the drive doesn't have # a temperature sensor (you can set the unit to C or F). # ############################################################################ # The following list was found at (http://www.almico.com/sfhardware.php) # If your drive is in the list send me a mail. # # Manufacturer Model Size Notes # FUJITSU FUJITSU MPF3102AH 10.0GB # FUJITSU FUJITSU MPG3204AH E 20.0GB # FUJITSU FUJITSU MPG3307AT 30.0GB # FUJITSU FUJITSU MPG3409AH 40.0GB # FUJITSU FUJITSU MPG3409AH EF 40.0GB # HITACHI HITACHI_DK23CA-10 9.8GB # HITACHI HITACHI_DK23CA-15 14.7GB # HITACHI HITACHI_DK23CA-30 29.3GB # MAXTOR MAXTOR 4K020H1 19.9GB # SAMSUNG SAMSUNG SV3012H 29.4GB # SEAGATE ST310210A 10.0GB # SEAGATE ST310211A 9.8GB # SEAGATE ST310215A 10.0GB # SEAGATE ST315320A 14.9GB # SEAGATE ST320410A 19.6GB # SEAGATE ST320413A 19.6GB # SEAGATE ST320420A 19.9GB # SEAGATE ST330610A 29.3GB # SEAGATE ST330620A 29.3GB # SEAGATE ST330621A 29.3GB # SEAGATE ST330630A 29.9GB # SEAGATE ST340016A 39.1GB # SEAGATE ST340810ACE 39.1GB # SEAGATE ST380020ACE 78.2GB # SEAGATE ST380021A 78.2GB # WESTERN DIGITAL WDC AC210200D 10.0GB # WESTERN DIGITAL WDC AC29100D 8.9GB # WESTERN DIGITAL WDC AC420400D 19.9GB # WESTERN DIGITAL WDC WD102AA 10.0GB # ################################################# ######################################## ############# Fujitsu drives ######################################## "FUJITSU MHM2100AT" 0 C "Fujitsu MHM2100AT" "FUJITSU MHN2200AT" 194 C "Fujitsu MHN2200AT" "FUJITSU MHN2300AT" 194 C "Fujitsu MHN2300AT" "FUJITSU MHR2020AT" 194 C "Fujitsu MHR2020AT" "FUJITSU MHR2030AT" 194 C "Fujitsu MHR2030AT" "FUJITSU MHS2030AT" 194 C "Fujitsu MHS2030AT" "FUJITSU MHS2040AT" 194 C "Fujitsu MHS2040AT" "FUJITSU MHS2060AT" 194 C "Fujitsu MHS2060AT (Apple PowerBook G4)" "FUJITSU MHT2030AT" 194 C "Fujitsu MHT2030AT" "FUJITSU MHT2040AT" 194 C "Fujitsu MHT2040AT" "FUJITSU MPF3204AH" 194 C "Fujitsu MPF3204AH" "FUJITSU MPG3204AT.*" 194 C "Fujitsu MPG3204AT" "FUJITSU MPG3307AT" 194 C "Fujitsu MPG3307AT" "FUJITSU MPG3409AT.*" 194 C "Fujitsu MPG3409AT E" "FUJITSU MPG3409AH.*" 194 C "Fujitsu MPG3409AH E" "FUJITSU MPG3204AH" 194 C "Fujitsu MPG3204AH" ######################################## ############# Hitachi drives ######################################## "HITACHI_DK228A-65" 0 C "Hitachi DK228A-65" "HITACHI_DK23CA-20" 194 C "Hitachi DK23CA-20" "HITACHI_DK23CA-30B" 194 C "Hitachi DK23CA-30B" "HITACHI_DK23CA-75" 194 C "Hitachi DK23CA-75" "HITACHI_DK23DA-[234]0" 194 C "Hitachi DK23DA series" "HITACHI_DK23EA-[346]0" 194 C "Hitachi DK23EA series" "HITACHI_DK23FB-60" 194 C "Hitachi DK23FB60" "HTS726060M9AT00" 194 C "Hitachi Travelstar 60GB" ######################################## ############# IBM drives ######################################## # DJSA serie is using F0h command to report temperature and also have # SMART capabilties but it was reported not to work. # "DJSA-2(30|32|10|20|05)" 0 C "IBM Travelstar 20GN, 32GH, 30GT series" "IBM-DARA-212000" 0 C "IBM Travelstar 12GN" "IBM-DTTA-35*" 0 C "IBM Deskstar 16GP serie" # according to specifications they do not seems to have sensor # but I prefer waiting for a report #"IBM-DTTA-37*" 0 C "IBM Deskstar 14GXP serie" "IBM-DJNA-35.*" 231 C "IBM Deskstar 25 GP serie" "IBM-DJNA-37.*" 231 C "IBM Deskstar 22 GXP serie" "IBM-DHEA-(34330|36480)" 0 C "IBM Deskstar 5 serie" "IBM-DHEA-(34331|36481|38451)" 0 C "IBM Deskstar 8 serie" "IBM-DPTA-37.*" 231 C "IBM Deskstar 34GXP serie" "IBM-DPTA-35.*" 231 C "IBM Deskstar 37GP serie" "IBM-DTLA-30[57]0[123467][05]" 194 C "IBM Deskstar 40GV & 75GXP series" "IC25N0[1234]0ATCS04-0" 194 C "IBM Travelstar 40GN serie" "IC25N0[24]0ATC[SX]05-0" 194 C "IBM Travelstar 40GNX serie" "IC25N0(15|20|30)ATDA04-0" 194 C "IBM Travelstar 30GN serie" "IC25T048ATDA05-0" 194 C "IBM Travelstar 48GH serie" "IC25T060ATC[SX]05-0" 194 C "IBM Travelstar 60GH serie" "IC35L0[12346]0AVER07" 194 C "IBM Deskstar 60GXP serie" "IC35L[01][02468]0AVV[AN]07*" 194 C "IBM Deskstar 120GXP serie" "IC35L[01][23689]0AVV207*" 194 C "IBM Deskstar 180GXP serie" ######################################## ############# Maxtor drives ######################################## #"Maxtor 2B0[012][04568]H1" ??? C "Maxtor Fireball 541DX" "Maxtor 2F020J0" 194 C "Maxtor 2F020J0" "Maxtor 2F030J0" 194 C "Maxtor 2F030J0" # which one must I trust ? #"Maxtor 4D040H2" 9 C "Maxtor DiamondMax D540X-4D" #"Maxtor 4D040H2" 0 C "Maxtor 4D040H2" #"Maxtor 4D080H4" 12 C "Maxtor DiamondMax D540X-4D" #"Maxtor 4D080H4" 9 C "Maxtor DiamondMax D540X-4D" "MAXTOR 4K0[468]0H[234]" 194 C "Maxtor DiamondMax D540X serie" "Maxtor 4[RA](16|12|08|06)0[LJ]0" 194 C "Maxtor DiamondMax 16" "Maxtor 51024U2" 0 C "Maxtor DiamondMax Plus 40" "Maxtor 5A250J0" 194 C "Maxtor Maxline 2 250GB 5400RPM" "Maxtor 5T0[24]0H[24]" 0 C "Maxtor DiamondMax Plus 60" "Maxtor 6E0[234]0L0" 194 C "Maxtor DiamondMax Plus 8" "MAXTOR 6L0[2468]0[LJ][1234]" 194 C "Maxtor DiamondMax Plus D740X family" "Maxtor 6Y(06|08|12|16|20)0[LPM]0" 194 C "Maxtor DiamondMax Plus 9" "Maxtor 94098U8" 11 C "Maxtor DiamondMax 40 94098U8" ######################################## ############# Quantum drives ######################################## "QUANTUM FIREBALLP AS40.0" 0 C "Quantum Fireball AS40" "QUANTUM FIREBALL CX10.2A" 0 C "Quantum Fireball CX10.2A" #"QUANTUM FIREBALLlct10 20" 4 C "Quantum Fireball CT10 20GB" # I suspect the QUANTUM FIREBALL_TM2110A to have a sensor in field 9... # "QUANTUM FIREBALL_TM2110A" 9 C "Quantum Fireball TM2110A" ######################################## ############# Samsung drives ######################################## # somenone reported a problem with the SP8004H which reports a temperature # 10?C below the ambient temperature "SAMSUNG SW0434A" 0 C "Samsung SW0434A" "SAMSUNG SP(2001|4002|6003|8004|40A2)H" 194 C "Samsung SpinPoint P40 serie" "SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)N" 194 C "Samsung SpinPoint P80 serie" "SAMSUNG SV0432A" 0 C "Samsung SV0432A" "SAMSUNG SV3002H" 0 C "Samsung SpinPoint V30 serie" "SAMSUNG SV(2001|4002|6003|8004)H" 194 C "Samsung SpinPoint V40 serie" #"SAMSUNG SV(0221|0602|0813|1204)H" 9 C "Samsung SpinPoint V60 serie" #"SAMSUNG SV1204H" 194 C "Samsung 120G" "SAMSUNG SV(0401|0802|1203|1604)N" 194 C "Samsung SpinPoint V80 serie" ######################################## ############# Seagate drives ######################################## "Seagate Technology 1275MB - ST31276A" 0 C "Seagate ST31276A" "ST3412A" 0 C "Seagate ST3412A" "ST38641A" 0 C "Seagate ST38641A" "ST310210A" 0 C "Seagate ST310210A" "ST310211A" 194 C "Seagate ST310211A" "ST310220A" 0 C "Seagate ST310220A" # SEAGATE ST313021A 13.0GB "ST313021A" 0 C "Seagate U8 ST313021A" "ST310240A" 0 C "Seagate Medalist 10240 Ultra ATA-3" "ST315320A" 194 C "Seagate ST315320A" "ST320423A" 0 C "Seagate U10 20423, Ultra ATA/66" "ST320011A" 194 C "Seagate ST320011A" "ST320014A" 194 C "Seagate ST320014A (5400 rpm, 20Gb)" "ST320410A" 194 C "Seagate ST320410A" "ST320413A" 194 C "Seagate ST320413A" "ST320414A" 194 C "Seagate ST320414A" "ST320420A" 194 C "Seagate Barracuda II ST320420A" "ST330620A" 194 C "Seagate ST330620A" "ST330621A" 194 C "Seagate ST330621A" "ST330630A" 194 C "Seagate Barracuda ST330630A" "ST340014A" 194 C "Seagate Barracuda 7200.7 40Gb" "ST340016A" 194 C "Seagate ST340016A" "ST340810A" 194 C "Seagate U Series 40810 (40Gb, Ultra ATA/100, 5400 rpm)" "ST340823A" 194 C "Seagate U Series 5 40823" "ST340824A" 194 C "Seagate Barracuda III" "ST360015A" 194 C "Seagate Barracuda V ST360015A" "ST360020A" 194 C "Seagate U Series 60020" "ST360021A" 194 C "Seagate Barracuda IV ST360021A" "ST380011A" 194 C "Seagate Barracuda 7200.7 80GB" "ST380013AS" 194 C "Seagate Barracuda 7200.7 80GB (Serial ATA)" "ST380020A" 194 C "Seagate U Series 80020 (80Gb, Ultra ATA/100, 5400 rpm)" "ST380021A" 194 C "Seagate Barracuda IV ST380021A" "ST380023A" 194 C "Seagate Barracuda V ST380023A" "ST39111A" 194 C "Seagate ST39111A (from Sun Ultra)" "ST3120020A" 194 C "Seagate ST3120020A" "ST3120022A" 194 C "Seagate Baraccuda 7200.7 120GB" "ST3120023A" 194 C "Seagate Barracuda V ST3120023A" "ST3120024A" 194 C "Seagate Barracuda V ST3120024A" "ST3120026A" 194 C "Seagate Barracuda V ST3120026A" "ST3160023AS" 194 C "Seagate Barracuda V ST3160023AS (160Gb, Serial ATA)" "ST94011A" 194 C "Seagate ST94011A" ######################################## ############# TOSHIBA Laptops ######################################## "MK4313MAT" 220 C "Toshiba MK4313MAT" "TOSHIBA MK1517GAP" 0 C "Toshiba MK1517GAP" "TOSHIBA MK3017GAP" 0 C "Toshiba MK3017GAP" "TOSHIBA MK3021GAS" 194 C "Toshiba MK3021GAS" #"TOSHIBA MK4019GAX" 222 C "Toshiba MK4019GAX" "TOSHIBA MK6021GAS" 194 C "Toshiba MK6021GAS" "TOSHIBA MK2018GAS" 226 F "Toshiba MK2018GAS" "TOSHIBA MK6022GAX" 194 C "Toshiba MK6022GAX" ######################################## ############# Western Digital drives ######################################## # WDC AC310100B and WDC AC2850F are reported not working # no more informations were given "WDC WD200BB-00AUA1" 0 C "Western Digital Caviar WD200BB" "WDC WD360GD-00FNA0" 194 C "Western Digital SATA Raptor 36.7GB" "WDC WD400BB-(18CA|00DE)A0" 0 C "Western Digital Caviar WD400BB" "WDC WD600BB-32BSA0" 0 C "Western Digital 600BB-32BSA0" "WDC WD800BB-00CAA1" 0 C "Western Digital WD800BB-00CAA1" "WDC WD800BB-22DKA0" 194 C "Western Digital 800BB-22DKA0" "WDC WD100EB-00BHF0" 0 C "Western Digital 100EB-00BHF0" "WDC WD400EB-00CPF0" 0 C "Western Digital 400EB-00CPF0" "WDC WD800JB-00ETA0" 194 C "Western Digital 80GB Special Edition 8MB" "WDC WD1600JB-00EVA0" 194 C "Western Digital 160GB Special Edition 8MB" "WDC WD2000JB-34EVA0" 194 C "Western Digital 200GB Special Edition 8MB" "WDC WD2500JB-32FUA0" 194 C "Western Digital 250GB Special Edition 8MB" "WDC AC420400D" 231 C "Western Digital Caviar AC420400D" "WDC AC418000D" 231 C "Western Digital AC418000D" "WDC WD135BA" 231 C "Wetsern Digital WD135BA" # not sure for next # "WDC WD800JB-00CRA1" 9 C "Western Digital Caviar WD800JB" # "WDC WD800JB-00CRA1" 199 C "Western Digital Caviar WD800JB" # "WDC WD1200JB-00CRA1" 9 C "Western Digital 1200JB-00CRA1" # "WDC WD273BA" 9 C "Western Digital WD273BA" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hddtemp/FC-2/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:34:04 -0000 1.3 +++ .cvsignore 22 Jan 2005 13:32:11 -0000 1.4 @@ -1,2 +1 @@ hddtemp-0.3-beta12.tar.bz2 -hddtemp.db Index: sources =================================================================== RCS file: /cvs/extras/rpms/hddtemp/FC-2/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:34:04 -0000 1.3 +++ sources 22 Jan 2005 13:32:11 -0000 1.4 @@ -1,2 +1 @@ 51f19658fa6e745eee62f6e100838884 hddtemp-0.3-beta12.tar.bz2 -4cd1caa5573efae5eedd36ee91b41b2c hddtemp.db From fedora-extras-commits at redhat.com Sat Jan 22 13:32:13 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 22 Jan 2005 08:32:13 -0500 Subject: rpms/hddtemp/FC-1 hddtemp.db, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200501221332.j0MDWDTH016657@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/hddtemp/FC-1 In directory cvs.fedora.redhat.com:/tmp/cvs-serv16639/FC-1 Modified Files: .cvsignore sources Added Files: hddtemp.db Log Message: Move hddtemp.db from lookaside cache to CVS for reproducible builds. It's an upstream text file whose name doesn't change between revisions. --- NEW FILE hddtemp.db --- # # DATABASE VERSION 03C (01/01/2004) # # Insert a regular expression for support of the model or the serie of your hard drive. # If you don't know what to put in the second field, put the number # that appears most often for your brand :o) # A value of zero meens that we know that the drive doesn't have # a temperature sensor (you can set the unit to C or F). # ############################################################################ # The following list was found at (http://www.almico.com/sfhardware.php) # If your drive is in the list send me a mail. # # Manufacturer Model Size Notes # FUJITSU FUJITSU MPF3102AH 10.0GB # FUJITSU FUJITSU MPG3204AH E 20.0GB # FUJITSU FUJITSU MPG3307AT 30.0GB # FUJITSU FUJITSU MPG3409AH 40.0GB # FUJITSU FUJITSU MPG3409AH EF 40.0GB # HITACHI HITACHI_DK23CA-10 9.8GB # HITACHI HITACHI_DK23CA-15 14.7GB # HITACHI HITACHI_DK23CA-30 29.3GB # MAXTOR MAXTOR 4K020H1 19.9GB # SAMSUNG SAMSUNG SV3012H 29.4GB # SEAGATE ST310210A 10.0GB # SEAGATE ST310211A 9.8GB # SEAGATE ST310215A 10.0GB # SEAGATE ST315320A 14.9GB # SEAGATE ST320410A 19.6GB # SEAGATE ST320413A 19.6GB # SEAGATE ST320420A 19.9GB # SEAGATE ST330610A 29.3GB # SEAGATE ST330620A 29.3GB # SEAGATE ST330621A 29.3GB # SEAGATE ST330630A 29.9GB # SEAGATE ST340016A 39.1GB # SEAGATE ST340810ACE 39.1GB # SEAGATE ST380020ACE 78.2GB # SEAGATE ST380021A 78.2GB # WESTERN DIGITAL WDC AC210200D 10.0GB # WESTERN DIGITAL WDC AC29100D 8.9GB # WESTERN DIGITAL WDC AC420400D 19.9GB # WESTERN DIGITAL WDC WD102AA 10.0GB # ################################################# ######################################## ############# Fujitsu drives ######################################## "FUJITSU MHM2100AT" 0 C "Fujitsu MHM2100AT" "FUJITSU MHN2200AT" 194 C "Fujitsu MHN2200AT" "FUJITSU MHN2300AT" 194 C "Fujitsu MHN2300AT" "FUJITSU MHR2020AT" 194 C "Fujitsu MHR2020AT" "FUJITSU MHR2030AT" 194 C "Fujitsu MHR2030AT" "FUJITSU MHS2030AT" 194 C "Fujitsu MHS2030AT" "FUJITSU MHS2040AT" 194 C "Fujitsu MHS2040AT" "FUJITSU MHS2060AT" 194 C "Fujitsu MHS2060AT (Apple PowerBook G4)" "FUJITSU MHT2030AT" 194 C "Fujitsu MHT2030AT" "FUJITSU MHT2040AT" 194 C "Fujitsu MHT2040AT" "FUJITSU MPF3204AH" 194 C "Fujitsu MPF3204AH" "FUJITSU MPG3204AT.*" 194 C "Fujitsu MPG3204AT" "FUJITSU MPG3307AT" 194 C "Fujitsu MPG3307AT" "FUJITSU MPG3409AT.*" 194 C "Fujitsu MPG3409AT E" "FUJITSU MPG3409AH.*" 194 C "Fujitsu MPG3409AH E" "FUJITSU MPG3204AH" 194 C "Fujitsu MPG3204AH" ######################################## ############# Hitachi drives ######################################## "HITACHI_DK228A-65" 0 C "Hitachi DK228A-65" "HITACHI_DK23CA-20" 194 C "Hitachi DK23CA-20" "HITACHI_DK23CA-30B" 194 C "Hitachi DK23CA-30B" "HITACHI_DK23CA-75" 194 C "Hitachi DK23CA-75" "HITACHI_DK23DA-[234]0" 194 C "Hitachi DK23DA series" "HITACHI_DK23EA-[346]0" 194 C "Hitachi DK23EA series" "HITACHI_DK23FB-60" 194 C "Hitachi DK23FB60" "HTS726060M9AT00" 194 C "Hitachi Travelstar 60GB" ######################################## ############# IBM drives ######################################## # DJSA serie is using F0h command to report temperature and also have # SMART capabilties but it was reported not to work. # "DJSA-2(30|32|10|20|05)" 0 C "IBM Travelstar 20GN, 32GH, 30GT series" "IBM-DARA-212000" 0 C "IBM Travelstar 12GN" "IBM-DTTA-35*" 0 C "IBM Deskstar 16GP serie" # according to specifications they do not seems to have sensor # but I prefer waiting for a report #"IBM-DTTA-37*" 0 C "IBM Deskstar 14GXP serie" "IBM-DJNA-35.*" 231 C "IBM Deskstar 25 GP serie" "IBM-DJNA-37.*" 231 C "IBM Deskstar 22 GXP serie" "IBM-DHEA-(34330|36480)" 0 C "IBM Deskstar 5 serie" "IBM-DHEA-(34331|36481|38451)" 0 C "IBM Deskstar 8 serie" "IBM-DPTA-37.*" 231 C "IBM Deskstar 34GXP serie" "IBM-DPTA-35.*" 231 C "IBM Deskstar 37GP serie" "IBM-DTLA-30[57]0[123467][05]" 194 C "IBM Deskstar 40GV & 75GXP series" "IC25N0[1234]0ATCS04-0" 194 C "IBM Travelstar 40GN serie" "IC25N0[24]0ATC[SX]05-0" 194 C "IBM Travelstar 40GNX serie" "IC25N0(15|20|30)ATDA04-0" 194 C "IBM Travelstar 30GN serie" "IC25T048ATDA05-0" 194 C "IBM Travelstar 48GH serie" "IC25T060ATC[SX]05-0" 194 C "IBM Travelstar 60GH serie" "IC35L0[12346]0AVER07" 194 C "IBM Deskstar 60GXP serie" "IC35L[01][02468]0AVV[AN]07*" 194 C "IBM Deskstar 120GXP serie" "IC35L[01][23689]0AVV207*" 194 C "IBM Deskstar 180GXP serie" ######################################## ############# Maxtor drives ######################################## #"Maxtor 2B0[012][04568]H1" ??? C "Maxtor Fireball 541DX" "Maxtor 2F020J0" 194 C "Maxtor 2F020J0" "Maxtor 2F030J0" 194 C "Maxtor 2F030J0" # which one must I trust ? #"Maxtor 4D040H2" 9 C "Maxtor DiamondMax D540X-4D" #"Maxtor 4D040H2" 0 C "Maxtor 4D040H2" #"Maxtor 4D080H4" 12 C "Maxtor DiamondMax D540X-4D" #"Maxtor 4D080H4" 9 C "Maxtor DiamondMax D540X-4D" "MAXTOR 4K0[468]0H[234]" 194 C "Maxtor DiamondMax D540X serie" "Maxtor 4[RA](16|12|08|06)0[LJ]0" 194 C "Maxtor DiamondMax 16" "Maxtor 51024U2" 0 C "Maxtor DiamondMax Plus 40" "Maxtor 5A250J0" 194 C "Maxtor Maxline 2 250GB 5400RPM" "Maxtor 5T0[24]0H[24]" 0 C "Maxtor DiamondMax Plus 60" "Maxtor 6E0[234]0L0" 194 C "Maxtor DiamondMax Plus 8" "MAXTOR 6L0[2468]0[LJ][1234]" 194 C "Maxtor DiamondMax Plus D740X family" "Maxtor 6Y(06|08|12|16|20)0[LPM]0" 194 C "Maxtor DiamondMax Plus 9" "Maxtor 94098U8" 11 C "Maxtor DiamondMax 40 94098U8" ######################################## ############# Quantum drives ######################################## "QUANTUM FIREBALLP AS40.0" 0 C "Quantum Fireball AS40" "QUANTUM FIREBALL CX10.2A" 0 C "Quantum Fireball CX10.2A" #"QUANTUM FIREBALLlct10 20" 4 C "Quantum Fireball CT10 20GB" # I suspect the QUANTUM FIREBALL_TM2110A to have a sensor in field 9... # "QUANTUM FIREBALL_TM2110A" 9 C "Quantum Fireball TM2110A" ######################################## ############# Samsung drives ######################################## # somenone reported a problem with the SP8004H which reports a temperature # 10?C below the ambient temperature "SAMSUNG SW0434A" 0 C "Samsung SW0434A" "SAMSUNG SP(2001|4002|6003|8004|40A2)H" 194 C "Samsung SpinPoint P40 serie" "SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)N" 194 C "Samsung SpinPoint P80 serie" "SAMSUNG SV0432A" 0 C "Samsung SV0432A" "SAMSUNG SV3002H" 0 C "Samsung SpinPoint V30 serie" "SAMSUNG SV(2001|4002|6003|8004)H" 194 C "Samsung SpinPoint V40 serie" #"SAMSUNG SV(0221|0602|0813|1204)H" 9 C "Samsung SpinPoint V60 serie" #"SAMSUNG SV1204H" 194 C "Samsung 120G" "SAMSUNG SV(0401|0802|1203|1604)N" 194 C "Samsung SpinPoint V80 serie" ######################################## ############# Seagate drives ######################################## "Seagate Technology 1275MB - ST31276A" 0 C "Seagate ST31276A" "ST3412A" 0 C "Seagate ST3412A" "ST38641A" 0 C "Seagate ST38641A" "ST310210A" 0 C "Seagate ST310210A" "ST310211A" 194 C "Seagate ST310211A" "ST310220A" 0 C "Seagate ST310220A" # SEAGATE ST313021A 13.0GB "ST313021A" 0 C "Seagate U8 ST313021A" "ST310240A" 0 C "Seagate Medalist 10240 Ultra ATA-3" "ST315320A" 194 C "Seagate ST315320A" "ST320423A" 0 C "Seagate U10 20423, Ultra ATA/66" "ST320011A" 194 C "Seagate ST320011A" "ST320014A" 194 C "Seagate ST320014A (5400 rpm, 20Gb)" "ST320410A" 194 C "Seagate ST320410A" "ST320413A" 194 C "Seagate ST320413A" "ST320414A" 194 C "Seagate ST320414A" "ST320420A" 194 C "Seagate Barracuda II ST320420A" "ST330620A" 194 C "Seagate ST330620A" "ST330621A" 194 C "Seagate ST330621A" "ST330630A" 194 C "Seagate Barracuda ST330630A" "ST340014A" 194 C "Seagate Barracuda 7200.7 40Gb" "ST340016A" 194 C "Seagate ST340016A" "ST340810A" 194 C "Seagate U Series 40810 (40Gb, Ultra ATA/100, 5400 rpm)" "ST340823A" 194 C "Seagate U Series 5 40823" "ST340824A" 194 C "Seagate Barracuda III" "ST360015A" 194 C "Seagate Barracuda V ST360015A" "ST360020A" 194 C "Seagate U Series 60020" "ST360021A" 194 C "Seagate Barracuda IV ST360021A" "ST380011A" 194 C "Seagate Barracuda 7200.7 80GB" "ST380013AS" 194 C "Seagate Barracuda 7200.7 80GB (Serial ATA)" "ST380020A" 194 C "Seagate U Series 80020 (80Gb, Ultra ATA/100, 5400 rpm)" "ST380021A" 194 C "Seagate Barracuda IV ST380021A" "ST380023A" 194 C "Seagate Barracuda V ST380023A" "ST39111A" 194 C "Seagate ST39111A (from Sun Ultra)" "ST3120020A" 194 C "Seagate ST3120020A" "ST3120022A" 194 C "Seagate Baraccuda 7200.7 120GB" "ST3120023A" 194 C "Seagate Barracuda V ST3120023A" "ST3120024A" 194 C "Seagate Barracuda V ST3120024A" "ST3120026A" 194 C "Seagate Barracuda V ST3120026A" "ST3160023AS" 194 C "Seagate Barracuda V ST3160023AS (160Gb, Serial ATA)" "ST94011A" 194 C "Seagate ST94011A" ######################################## ############# TOSHIBA Laptops ######################################## "MK4313MAT" 220 C "Toshiba MK4313MAT" "TOSHIBA MK1517GAP" 0 C "Toshiba MK1517GAP" "TOSHIBA MK3017GAP" 0 C "Toshiba MK3017GAP" "TOSHIBA MK3021GAS" 194 C "Toshiba MK3021GAS" #"TOSHIBA MK4019GAX" 222 C "Toshiba MK4019GAX" "TOSHIBA MK6021GAS" 194 C "Toshiba MK6021GAS" "TOSHIBA MK2018GAS" 226 F "Toshiba MK2018GAS" "TOSHIBA MK6022GAX" 194 C "Toshiba MK6022GAX" ######################################## ############# Western Digital drives ######################################## # WDC AC310100B and WDC AC2850F are reported not working # no more informations were given "WDC WD200BB-00AUA1" 0 C "Western Digital Caviar WD200BB" "WDC WD360GD-00FNA0" 194 C "Western Digital SATA Raptor 36.7GB" "WDC WD400BB-(18CA|00DE)A0" 0 C "Western Digital Caviar WD400BB" "WDC WD600BB-32BSA0" 0 C "Western Digital 600BB-32BSA0" "WDC WD800BB-00CAA1" 0 C "Western Digital WD800BB-00CAA1" "WDC WD800BB-22DKA0" 194 C "Western Digital 800BB-22DKA0" "WDC WD100EB-00BHF0" 0 C "Western Digital 100EB-00BHF0" "WDC WD400EB-00CPF0" 0 C "Western Digital 400EB-00CPF0" "WDC WD800JB-00ETA0" 194 C "Western Digital 80GB Special Edition 8MB" "WDC WD1600JB-00EVA0" 194 C "Western Digital 160GB Special Edition 8MB" "WDC WD2000JB-34EVA0" 194 C "Western Digital 200GB Special Edition 8MB" "WDC WD2500JB-32FUA0" 194 C "Western Digital 250GB Special Edition 8MB" "WDC AC420400D" 231 C "Western Digital Caviar AC420400D" "WDC AC418000D" 231 C "Western Digital AC418000D" "WDC WD135BA" 231 C "Wetsern Digital WD135BA" # not sure for next # "WDC WD800JB-00CRA1" 9 C "Western Digital Caviar WD800JB" # "WDC WD800JB-00CRA1" 199 C "Western Digital Caviar WD800JB" # "WDC WD1200JB-00CRA1" 9 C "Western Digital 1200JB-00CRA1" # "WDC WD273BA" 9 C "Western Digital WD273BA" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hddtemp/FC-1/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:33:49 -0000 1.3 +++ .cvsignore 22 Jan 2005 13:32:11 -0000 1.4 @@ -1,2 +1 @@ hddtemp-0.3-beta12.tar.bz2 -hddtemp.db Index: sources =================================================================== RCS file: /cvs/extras/rpms/hddtemp/FC-1/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:33:49 -0000 1.3 +++ sources 22 Jan 2005 13:32:11 -0000 1.4 @@ -1,2 +1 @@ 51f19658fa6e745eee62f6e100838884 hddtemp-0.3-beta12.tar.bz2 -4cd1caa5573efae5eedd36ee91b41b2c hddtemp.db From fedora-extras-commits at redhat.com Sat Jan 22 13:32:13 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 22 Jan 2005 08:32:13 -0500 Subject: rpms/hddtemp/RHL-8 hddtemp.db, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200501221332.j0MDWD7p016663@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/hddtemp/RHL-8 In directory cvs.fedora.redhat.com:/tmp/cvs-serv16639/RHL-8 Modified Files: .cvsignore sources Added Files: hddtemp.db Log Message: Move hddtemp.db from lookaside cache to CVS for reproducible builds. It's an upstream text file whose name doesn't change between revisions. --- NEW FILE hddtemp.db --- # # DATABASE VERSION 03C (01/01/2004) # # Insert a regular expression for support of the model or the serie of your hard drive. # If you don't know what to put in the second field, put the number # that appears most often for your brand :o) # A value of zero meens that we know that the drive doesn't have # a temperature sensor (you can set the unit to C or F). # ############################################################################ # The following list was found at (http://www.almico.com/sfhardware.php) # If your drive is in the list send me a mail. # # Manufacturer Model Size Notes # FUJITSU FUJITSU MPF3102AH 10.0GB # FUJITSU FUJITSU MPG3204AH E 20.0GB # FUJITSU FUJITSU MPG3307AT 30.0GB # FUJITSU FUJITSU MPG3409AH 40.0GB # FUJITSU FUJITSU MPG3409AH EF 40.0GB # HITACHI HITACHI_DK23CA-10 9.8GB # HITACHI HITACHI_DK23CA-15 14.7GB # HITACHI HITACHI_DK23CA-30 29.3GB # MAXTOR MAXTOR 4K020H1 19.9GB # SAMSUNG SAMSUNG SV3012H 29.4GB # SEAGATE ST310210A 10.0GB # SEAGATE ST310211A 9.8GB # SEAGATE ST310215A 10.0GB # SEAGATE ST315320A 14.9GB # SEAGATE ST320410A 19.6GB # SEAGATE ST320413A 19.6GB # SEAGATE ST320420A 19.9GB # SEAGATE ST330610A 29.3GB # SEAGATE ST330620A 29.3GB # SEAGATE ST330621A 29.3GB # SEAGATE ST330630A 29.9GB # SEAGATE ST340016A 39.1GB # SEAGATE ST340810ACE 39.1GB # SEAGATE ST380020ACE 78.2GB # SEAGATE ST380021A 78.2GB # WESTERN DIGITAL WDC AC210200D 10.0GB # WESTERN DIGITAL WDC AC29100D 8.9GB # WESTERN DIGITAL WDC AC420400D 19.9GB # WESTERN DIGITAL WDC WD102AA 10.0GB # ################################################# ######################################## ############# Fujitsu drives ######################################## "FUJITSU MHM2100AT" 0 C "Fujitsu MHM2100AT" "FUJITSU MHN2200AT" 194 C "Fujitsu MHN2200AT" "FUJITSU MHN2300AT" 194 C "Fujitsu MHN2300AT" "FUJITSU MHR2020AT" 194 C "Fujitsu MHR2020AT" "FUJITSU MHR2030AT" 194 C "Fujitsu MHR2030AT" "FUJITSU MHS2030AT" 194 C "Fujitsu MHS2030AT" "FUJITSU MHS2040AT" 194 C "Fujitsu MHS2040AT" "FUJITSU MHS2060AT" 194 C "Fujitsu MHS2060AT (Apple PowerBook G4)" "FUJITSU MHT2030AT" 194 C "Fujitsu MHT2030AT" "FUJITSU MHT2040AT" 194 C "Fujitsu MHT2040AT" "FUJITSU MPF3204AH" 194 C "Fujitsu MPF3204AH" "FUJITSU MPG3204AT.*" 194 C "Fujitsu MPG3204AT" "FUJITSU MPG3307AT" 194 C "Fujitsu MPG3307AT" "FUJITSU MPG3409AT.*" 194 C "Fujitsu MPG3409AT E" "FUJITSU MPG3409AH.*" 194 C "Fujitsu MPG3409AH E" "FUJITSU MPG3204AH" 194 C "Fujitsu MPG3204AH" ######################################## ############# Hitachi drives ######################################## "HITACHI_DK228A-65" 0 C "Hitachi DK228A-65" "HITACHI_DK23CA-20" 194 C "Hitachi DK23CA-20" "HITACHI_DK23CA-30B" 194 C "Hitachi DK23CA-30B" "HITACHI_DK23CA-75" 194 C "Hitachi DK23CA-75" "HITACHI_DK23DA-[234]0" 194 C "Hitachi DK23DA series" "HITACHI_DK23EA-[346]0" 194 C "Hitachi DK23EA series" "HITACHI_DK23FB-60" 194 C "Hitachi DK23FB60" "HTS726060M9AT00" 194 C "Hitachi Travelstar 60GB" ######################################## ############# IBM drives ######################################## # DJSA serie is using F0h command to report temperature and also have # SMART capabilties but it was reported not to work. # "DJSA-2(30|32|10|20|05)" 0 C "IBM Travelstar 20GN, 32GH, 30GT series" "IBM-DARA-212000" 0 C "IBM Travelstar 12GN" "IBM-DTTA-35*" 0 C "IBM Deskstar 16GP serie" # according to specifications they do not seems to have sensor # but I prefer waiting for a report #"IBM-DTTA-37*" 0 C "IBM Deskstar 14GXP serie" "IBM-DJNA-35.*" 231 C "IBM Deskstar 25 GP serie" "IBM-DJNA-37.*" 231 C "IBM Deskstar 22 GXP serie" "IBM-DHEA-(34330|36480)" 0 C "IBM Deskstar 5 serie" "IBM-DHEA-(34331|36481|38451)" 0 C "IBM Deskstar 8 serie" "IBM-DPTA-37.*" 231 C "IBM Deskstar 34GXP serie" "IBM-DPTA-35.*" 231 C "IBM Deskstar 37GP serie" "IBM-DTLA-30[57]0[123467][05]" 194 C "IBM Deskstar 40GV & 75GXP series" "IC25N0[1234]0ATCS04-0" 194 C "IBM Travelstar 40GN serie" "IC25N0[24]0ATC[SX]05-0" 194 C "IBM Travelstar 40GNX serie" "IC25N0(15|20|30)ATDA04-0" 194 C "IBM Travelstar 30GN serie" "IC25T048ATDA05-0" 194 C "IBM Travelstar 48GH serie" "IC25T060ATC[SX]05-0" 194 C "IBM Travelstar 60GH serie" "IC35L0[12346]0AVER07" 194 C "IBM Deskstar 60GXP serie" "IC35L[01][02468]0AVV[AN]07*" 194 C "IBM Deskstar 120GXP serie" "IC35L[01][23689]0AVV207*" 194 C "IBM Deskstar 180GXP serie" ######################################## ############# Maxtor drives ######################################## #"Maxtor 2B0[012][04568]H1" ??? C "Maxtor Fireball 541DX" "Maxtor 2F020J0" 194 C "Maxtor 2F020J0" "Maxtor 2F030J0" 194 C "Maxtor 2F030J0" # which one must I trust ? #"Maxtor 4D040H2" 9 C "Maxtor DiamondMax D540X-4D" #"Maxtor 4D040H2" 0 C "Maxtor 4D040H2" #"Maxtor 4D080H4" 12 C "Maxtor DiamondMax D540X-4D" #"Maxtor 4D080H4" 9 C "Maxtor DiamondMax D540X-4D" "MAXTOR 4K0[468]0H[234]" 194 C "Maxtor DiamondMax D540X serie" "Maxtor 4[RA](16|12|08|06)0[LJ]0" 194 C "Maxtor DiamondMax 16" "Maxtor 51024U2" 0 C "Maxtor DiamondMax Plus 40" "Maxtor 5A250J0" 194 C "Maxtor Maxline 2 250GB 5400RPM" "Maxtor 5T0[24]0H[24]" 0 C "Maxtor DiamondMax Plus 60" "Maxtor 6E0[234]0L0" 194 C "Maxtor DiamondMax Plus 8" "MAXTOR 6L0[2468]0[LJ][1234]" 194 C "Maxtor DiamondMax Plus D740X family" "Maxtor 6Y(06|08|12|16|20)0[LPM]0" 194 C "Maxtor DiamondMax Plus 9" "Maxtor 94098U8" 11 C "Maxtor DiamondMax 40 94098U8" ######################################## ############# Quantum drives ######################################## "QUANTUM FIREBALLP AS40.0" 0 C "Quantum Fireball AS40" "QUANTUM FIREBALL CX10.2A" 0 C "Quantum Fireball CX10.2A" #"QUANTUM FIREBALLlct10 20" 4 C "Quantum Fireball CT10 20GB" # I suspect the QUANTUM FIREBALL_TM2110A to have a sensor in field 9... # "QUANTUM FIREBALL_TM2110A" 9 C "Quantum Fireball TM2110A" ######################################## ############# Samsung drives ######################################## # somenone reported a problem with the SP8004H which reports a temperature # 10?C below the ambient temperature "SAMSUNG SW0434A" 0 C "Samsung SW0434A" "SAMSUNG SP(2001|4002|6003|8004|40A2)H" 194 C "Samsung SpinPoint P40 serie" "SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)N" 194 C "Samsung SpinPoint P80 serie" "SAMSUNG SV0432A" 0 C "Samsung SV0432A" "SAMSUNG SV3002H" 0 C "Samsung SpinPoint V30 serie" "SAMSUNG SV(2001|4002|6003|8004)H" 194 C "Samsung SpinPoint V40 serie" #"SAMSUNG SV(0221|0602|0813|1204)H" 9 C "Samsung SpinPoint V60 serie" #"SAMSUNG SV1204H" 194 C "Samsung 120G" "SAMSUNG SV(0401|0802|1203|1604)N" 194 C "Samsung SpinPoint V80 serie" ######################################## ############# Seagate drives ######################################## "Seagate Technology 1275MB - ST31276A" 0 C "Seagate ST31276A" "ST3412A" 0 C "Seagate ST3412A" "ST38641A" 0 C "Seagate ST38641A" "ST310210A" 0 C "Seagate ST310210A" "ST310211A" 194 C "Seagate ST310211A" "ST310220A" 0 C "Seagate ST310220A" # SEAGATE ST313021A 13.0GB "ST313021A" 0 C "Seagate U8 ST313021A" "ST310240A" 0 C "Seagate Medalist 10240 Ultra ATA-3" "ST315320A" 194 C "Seagate ST315320A" "ST320423A" 0 C "Seagate U10 20423, Ultra ATA/66" "ST320011A" 194 C "Seagate ST320011A" "ST320014A" 194 C "Seagate ST320014A (5400 rpm, 20Gb)" "ST320410A" 194 C "Seagate ST320410A" "ST320413A" 194 C "Seagate ST320413A" "ST320414A" 194 C "Seagate ST320414A" "ST320420A" 194 C "Seagate Barracuda II ST320420A" "ST330620A" 194 C "Seagate ST330620A" "ST330621A" 194 C "Seagate ST330621A" "ST330630A" 194 C "Seagate Barracuda ST330630A" "ST340014A" 194 C "Seagate Barracuda 7200.7 40Gb" "ST340016A" 194 C "Seagate ST340016A" "ST340810A" 194 C "Seagate U Series 40810 (40Gb, Ultra ATA/100, 5400 rpm)" "ST340823A" 194 C "Seagate U Series 5 40823" "ST340824A" 194 C "Seagate Barracuda III" "ST360015A" 194 C "Seagate Barracuda V ST360015A" "ST360020A" 194 C "Seagate U Series 60020" "ST360021A" 194 C "Seagate Barracuda IV ST360021A" "ST380011A" 194 C "Seagate Barracuda 7200.7 80GB" "ST380013AS" 194 C "Seagate Barracuda 7200.7 80GB (Serial ATA)" "ST380020A" 194 C "Seagate U Series 80020 (80Gb, Ultra ATA/100, 5400 rpm)" "ST380021A" 194 C "Seagate Barracuda IV ST380021A" "ST380023A" 194 C "Seagate Barracuda V ST380023A" "ST39111A" 194 C "Seagate ST39111A (from Sun Ultra)" "ST3120020A" 194 C "Seagate ST3120020A" "ST3120022A" 194 C "Seagate Baraccuda 7200.7 120GB" "ST3120023A" 194 C "Seagate Barracuda V ST3120023A" "ST3120024A" 194 C "Seagate Barracuda V ST3120024A" "ST3120026A" 194 C "Seagate Barracuda V ST3120026A" "ST3160023AS" 194 C "Seagate Barracuda V ST3160023AS (160Gb, Serial ATA)" "ST94011A" 194 C "Seagate ST94011A" ######################################## ############# TOSHIBA Laptops ######################################## "MK4313MAT" 220 C "Toshiba MK4313MAT" "TOSHIBA MK1517GAP" 0 C "Toshiba MK1517GAP" "TOSHIBA MK3017GAP" 0 C "Toshiba MK3017GAP" "TOSHIBA MK3021GAS" 194 C "Toshiba MK3021GAS" #"TOSHIBA MK4019GAX" 222 C "Toshiba MK4019GAX" "TOSHIBA MK6021GAS" 194 C "Toshiba MK6021GAS" "TOSHIBA MK2018GAS" 226 F "Toshiba MK2018GAS" "TOSHIBA MK6022GAX" 194 C "Toshiba MK6022GAX" ######################################## ############# Western Digital drives ######################################## # WDC AC310100B and WDC AC2850F are reported not working # no more informations were given "WDC WD200BB-00AUA1" 0 C "Western Digital Caviar WD200BB" "WDC WD360GD-00FNA0" 194 C "Western Digital SATA Raptor 36.7GB" "WDC WD400BB-(18CA|00DE)A0" 0 C "Western Digital Caviar WD400BB" "WDC WD600BB-32BSA0" 0 C "Western Digital 600BB-32BSA0" "WDC WD800BB-00CAA1" 0 C "Western Digital WD800BB-00CAA1" "WDC WD800BB-22DKA0" 194 C "Western Digital 800BB-22DKA0" "WDC WD100EB-00BHF0" 0 C "Western Digital 100EB-00BHF0" "WDC WD400EB-00CPF0" 0 C "Western Digital 400EB-00CPF0" "WDC WD800JB-00ETA0" 194 C "Western Digital 80GB Special Edition 8MB" "WDC WD1600JB-00EVA0" 194 C "Western Digital 160GB Special Edition 8MB" "WDC WD2000JB-34EVA0" 194 C "Western Digital 200GB Special Edition 8MB" "WDC WD2500JB-32FUA0" 194 C "Western Digital 250GB Special Edition 8MB" "WDC AC420400D" 231 C "Western Digital Caviar AC420400D" "WDC AC418000D" 231 C "Western Digital AC418000D" "WDC WD135BA" 231 C "Wetsern Digital WD135BA" # not sure for next # "WDC WD800JB-00CRA1" 9 C "Western Digital Caviar WD800JB" # "WDC WD800JB-00CRA1" 199 C "Western Digital Caviar WD800JB" # "WDC WD1200JB-00CRA1" 9 C "Western Digital 1200JB-00CRA1" # "WDC WD273BA" 9 C "Western Digital WD273BA" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hddtemp/RHL-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:33:28 -0000 1.2 +++ .cvsignore 22 Jan 2005 13:32:11 -0000 1.3 @@ -1,2 +1 @@ hddtemp-0.3-beta11.tar.gz -hddtemp.db Index: sources =================================================================== RCS file: /cvs/extras/rpms/hddtemp/RHL-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:33:28 -0000 1.2 +++ sources 22 Jan 2005 13:32:11 -0000 1.3 @@ -1,2 +1 @@ 79851534a7557a22418a3510a8f22234 hddtemp-0.3-beta11.tar.gz -f816512c3feee3cc9a92a9a8d27e9cff hddtemp.db From fedora-extras-commits at redhat.com Sat Jan 22 13:32:13 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 22 Jan 2005 08:32:13 -0500 Subject: rpms/hddtemp/RHL-9 hddtemp.db, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200501221332.j0MDWDo5016671@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/hddtemp/RHL-9 In directory cvs.fedora.redhat.com:/tmp/cvs-serv16639/RHL-9 Modified Files: .cvsignore sources Added Files: hddtemp.db Log Message: Move hddtemp.db from lookaside cache to CVS for reproducible builds. It's an upstream text file whose name doesn't change between revisions. --- NEW FILE hddtemp.db --- # # DATABASE VERSION 03C (01/01/2004) # # Insert a regular expression for support of the model or the serie of your hard drive. # If you don't know what to put in the second field, put the number # that appears most often for your brand :o) # A value of zero meens that we know that the drive doesn't have # a temperature sensor (you can set the unit to C or F). # ############################################################################ # The following list was found at (http://www.almico.com/sfhardware.php) # If your drive is in the list send me a mail. # # Manufacturer Model Size Notes # FUJITSU FUJITSU MPF3102AH 10.0GB # FUJITSU FUJITSU MPG3204AH E 20.0GB # FUJITSU FUJITSU MPG3307AT 30.0GB # FUJITSU FUJITSU MPG3409AH 40.0GB # FUJITSU FUJITSU MPG3409AH EF 40.0GB # HITACHI HITACHI_DK23CA-10 9.8GB # HITACHI HITACHI_DK23CA-15 14.7GB # HITACHI HITACHI_DK23CA-30 29.3GB # MAXTOR MAXTOR 4K020H1 19.9GB # SAMSUNG SAMSUNG SV3012H 29.4GB # SEAGATE ST310210A 10.0GB # SEAGATE ST310211A 9.8GB # SEAGATE ST310215A 10.0GB # SEAGATE ST315320A 14.9GB # SEAGATE ST320410A 19.6GB # SEAGATE ST320413A 19.6GB # SEAGATE ST320420A 19.9GB # SEAGATE ST330610A 29.3GB # SEAGATE ST330620A 29.3GB # SEAGATE ST330621A 29.3GB # SEAGATE ST330630A 29.9GB # SEAGATE ST340016A 39.1GB # SEAGATE ST340810ACE 39.1GB # SEAGATE ST380020ACE 78.2GB # SEAGATE ST380021A 78.2GB # WESTERN DIGITAL WDC AC210200D 10.0GB # WESTERN DIGITAL WDC AC29100D 8.9GB # WESTERN DIGITAL WDC AC420400D 19.9GB # WESTERN DIGITAL WDC WD102AA 10.0GB # ################################################# ######################################## ############# Fujitsu drives ######################################## "FUJITSU MHM2100AT" 0 C "Fujitsu MHM2100AT" "FUJITSU MHN2200AT" 194 C "Fujitsu MHN2200AT" "FUJITSU MHN2300AT" 194 C "Fujitsu MHN2300AT" "FUJITSU MHR2020AT" 194 C "Fujitsu MHR2020AT" "FUJITSU MHR2030AT" 194 C "Fujitsu MHR2030AT" "FUJITSU MHS2030AT" 194 C "Fujitsu MHS2030AT" "FUJITSU MHS2040AT" 194 C "Fujitsu MHS2040AT" "FUJITSU MHS2060AT" 194 C "Fujitsu MHS2060AT (Apple PowerBook G4)" "FUJITSU MHT2030AT" 194 C "Fujitsu MHT2030AT" "FUJITSU MHT2040AT" 194 C "Fujitsu MHT2040AT" "FUJITSU MPF3204AH" 194 C "Fujitsu MPF3204AH" "FUJITSU MPG3204AT.*" 194 C "Fujitsu MPG3204AT" "FUJITSU MPG3307AT" 194 C "Fujitsu MPG3307AT" "FUJITSU MPG3409AT.*" 194 C "Fujitsu MPG3409AT E" "FUJITSU MPG3409AH.*" 194 C "Fujitsu MPG3409AH E" "FUJITSU MPG3204AH" 194 C "Fujitsu MPG3204AH" ######################################## ############# Hitachi drives ######################################## "HITACHI_DK228A-65" 0 C "Hitachi DK228A-65" "HITACHI_DK23CA-20" 194 C "Hitachi DK23CA-20" "HITACHI_DK23CA-30B" 194 C "Hitachi DK23CA-30B" "HITACHI_DK23CA-75" 194 C "Hitachi DK23CA-75" "HITACHI_DK23DA-[234]0" 194 C "Hitachi DK23DA series" "HITACHI_DK23EA-[346]0" 194 C "Hitachi DK23EA series" "HITACHI_DK23FB-60" 194 C "Hitachi DK23FB60" "HTS726060M9AT00" 194 C "Hitachi Travelstar 60GB" ######################################## ############# IBM drives ######################################## # DJSA serie is using F0h command to report temperature and also have # SMART capabilties but it was reported not to work. # "DJSA-2(30|32|10|20|05)" 0 C "IBM Travelstar 20GN, 32GH, 30GT series" "IBM-DARA-212000" 0 C "IBM Travelstar 12GN" "IBM-DTTA-35*" 0 C "IBM Deskstar 16GP serie" # according to specifications they do not seems to have sensor # but I prefer waiting for a report #"IBM-DTTA-37*" 0 C "IBM Deskstar 14GXP serie" "IBM-DJNA-35.*" 231 C "IBM Deskstar 25 GP serie" "IBM-DJNA-37.*" 231 C "IBM Deskstar 22 GXP serie" "IBM-DHEA-(34330|36480)" 0 C "IBM Deskstar 5 serie" "IBM-DHEA-(34331|36481|38451)" 0 C "IBM Deskstar 8 serie" "IBM-DPTA-37.*" 231 C "IBM Deskstar 34GXP serie" "IBM-DPTA-35.*" 231 C "IBM Deskstar 37GP serie" "IBM-DTLA-30[57]0[123467][05]" 194 C "IBM Deskstar 40GV & 75GXP series" "IC25N0[1234]0ATCS04-0" 194 C "IBM Travelstar 40GN serie" "IC25N0[24]0ATC[SX]05-0" 194 C "IBM Travelstar 40GNX serie" "IC25N0(15|20|30)ATDA04-0" 194 C "IBM Travelstar 30GN serie" "IC25T048ATDA05-0" 194 C "IBM Travelstar 48GH serie" "IC25T060ATC[SX]05-0" 194 C "IBM Travelstar 60GH serie" "IC35L0[12346]0AVER07" 194 C "IBM Deskstar 60GXP serie" "IC35L[01][02468]0AVV[AN]07*" 194 C "IBM Deskstar 120GXP serie" "IC35L[01][23689]0AVV207*" 194 C "IBM Deskstar 180GXP serie" ######################################## ############# Maxtor drives ######################################## #"Maxtor 2B0[012][04568]H1" ??? C "Maxtor Fireball 541DX" "Maxtor 2F020J0" 194 C "Maxtor 2F020J0" "Maxtor 2F030J0" 194 C "Maxtor 2F030J0" # which one must I trust ? #"Maxtor 4D040H2" 9 C "Maxtor DiamondMax D540X-4D" #"Maxtor 4D040H2" 0 C "Maxtor 4D040H2" #"Maxtor 4D080H4" 12 C "Maxtor DiamondMax D540X-4D" #"Maxtor 4D080H4" 9 C "Maxtor DiamondMax D540X-4D" "MAXTOR 4K0[468]0H[234]" 194 C "Maxtor DiamondMax D540X serie" "Maxtor 4[RA](16|12|08|06)0[LJ]0" 194 C "Maxtor DiamondMax 16" "Maxtor 51024U2" 0 C "Maxtor DiamondMax Plus 40" "Maxtor 5A250J0" 194 C "Maxtor Maxline 2 250GB 5400RPM" "Maxtor 5T0[24]0H[24]" 0 C "Maxtor DiamondMax Plus 60" "Maxtor 6E0[234]0L0" 194 C "Maxtor DiamondMax Plus 8" "MAXTOR 6L0[2468]0[LJ][1234]" 194 C "Maxtor DiamondMax Plus D740X family" "Maxtor 6Y(06|08|12|16|20)0[LPM]0" 194 C "Maxtor DiamondMax Plus 9" "Maxtor 94098U8" 11 C "Maxtor DiamondMax 40 94098U8" ######################################## ############# Quantum drives ######################################## "QUANTUM FIREBALLP AS40.0" 0 C "Quantum Fireball AS40" "QUANTUM FIREBALL CX10.2A" 0 C "Quantum Fireball CX10.2A" #"QUANTUM FIREBALLlct10 20" 4 C "Quantum Fireball CT10 20GB" # I suspect the QUANTUM FIREBALL_TM2110A to have a sensor in field 9... # "QUANTUM FIREBALL_TM2110A" 9 C "Quantum Fireball TM2110A" ######################################## ############# Samsung drives ######################################## # somenone reported a problem with the SP8004H which reports a temperature # 10?C below the ambient temperature "SAMSUNG SW0434A" 0 C "Samsung SW0434A" "SAMSUNG SP(2001|4002|6003|8004|40A2)H" 194 C "Samsung SpinPoint P40 serie" "SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)N" 194 C "Samsung SpinPoint P80 serie" "SAMSUNG SV0432A" 0 C "Samsung SV0432A" "SAMSUNG SV3002H" 0 C "Samsung SpinPoint V30 serie" "SAMSUNG SV(2001|4002|6003|8004)H" 194 C "Samsung SpinPoint V40 serie" #"SAMSUNG SV(0221|0602|0813|1204)H" 9 C "Samsung SpinPoint V60 serie" #"SAMSUNG SV1204H" 194 C "Samsung 120G" "SAMSUNG SV(0401|0802|1203|1604)N" 194 C "Samsung SpinPoint V80 serie" ######################################## ############# Seagate drives ######################################## "Seagate Technology 1275MB - ST31276A" 0 C "Seagate ST31276A" "ST3412A" 0 C "Seagate ST3412A" "ST38641A" 0 C "Seagate ST38641A" "ST310210A" 0 C "Seagate ST310210A" "ST310211A" 194 C "Seagate ST310211A" "ST310220A" 0 C "Seagate ST310220A" # SEAGATE ST313021A 13.0GB "ST313021A" 0 C "Seagate U8 ST313021A" "ST310240A" 0 C "Seagate Medalist 10240 Ultra ATA-3" "ST315320A" 194 C "Seagate ST315320A" "ST320423A" 0 C "Seagate U10 20423, Ultra ATA/66" "ST320011A" 194 C "Seagate ST320011A" "ST320014A" 194 C "Seagate ST320014A (5400 rpm, 20Gb)" "ST320410A" 194 C "Seagate ST320410A" "ST320413A" 194 C "Seagate ST320413A" "ST320414A" 194 C "Seagate ST320414A" "ST320420A" 194 C "Seagate Barracuda II ST320420A" "ST330620A" 194 C "Seagate ST330620A" "ST330621A" 194 C "Seagate ST330621A" "ST330630A" 194 C "Seagate Barracuda ST330630A" "ST340014A" 194 C "Seagate Barracuda 7200.7 40Gb" "ST340016A" 194 C "Seagate ST340016A" "ST340810A" 194 C "Seagate U Series 40810 (40Gb, Ultra ATA/100, 5400 rpm)" "ST340823A" 194 C "Seagate U Series 5 40823" "ST340824A" 194 C "Seagate Barracuda III" "ST360015A" 194 C "Seagate Barracuda V ST360015A" "ST360020A" 194 C "Seagate U Series 60020" "ST360021A" 194 C "Seagate Barracuda IV ST360021A" "ST380011A" 194 C "Seagate Barracuda 7200.7 80GB" "ST380013AS" 194 C "Seagate Barracuda 7200.7 80GB (Serial ATA)" "ST380020A" 194 C "Seagate U Series 80020 (80Gb, Ultra ATA/100, 5400 rpm)" "ST380021A" 194 C "Seagate Barracuda IV ST380021A" "ST380023A" 194 C "Seagate Barracuda V ST380023A" "ST39111A" 194 C "Seagate ST39111A (from Sun Ultra)" "ST3120020A" 194 C "Seagate ST3120020A" "ST3120022A" 194 C "Seagate Baraccuda 7200.7 120GB" "ST3120023A" 194 C "Seagate Barracuda V ST3120023A" "ST3120024A" 194 C "Seagate Barracuda V ST3120024A" "ST3120026A" 194 C "Seagate Barracuda V ST3120026A" "ST3160023AS" 194 C "Seagate Barracuda V ST3160023AS (160Gb, Serial ATA)" "ST94011A" 194 C "Seagate ST94011A" ######################################## ############# TOSHIBA Laptops ######################################## "MK4313MAT" 220 C "Toshiba MK4313MAT" "TOSHIBA MK1517GAP" 0 C "Toshiba MK1517GAP" "TOSHIBA MK3017GAP" 0 C "Toshiba MK3017GAP" "TOSHIBA MK3021GAS" 194 C "Toshiba MK3021GAS" #"TOSHIBA MK4019GAX" 222 C "Toshiba MK4019GAX" "TOSHIBA MK6021GAS" 194 C "Toshiba MK6021GAS" "TOSHIBA MK2018GAS" 226 F "Toshiba MK2018GAS" "TOSHIBA MK6022GAX" 194 C "Toshiba MK6022GAX" ######################################## ############# Western Digital drives ######################################## # WDC AC310100B and WDC AC2850F are reported not working # no more informations were given "WDC WD200BB-00AUA1" 0 C "Western Digital Caviar WD200BB" "WDC WD360GD-00FNA0" 194 C "Western Digital SATA Raptor 36.7GB" "WDC WD400BB-(18CA|00DE)A0" 0 C "Western Digital Caviar WD400BB" "WDC WD600BB-32BSA0" 0 C "Western Digital 600BB-32BSA0" "WDC WD800BB-00CAA1" 0 C "Western Digital WD800BB-00CAA1" "WDC WD800BB-22DKA0" 194 C "Western Digital 800BB-22DKA0" "WDC WD100EB-00BHF0" 0 C "Western Digital 100EB-00BHF0" "WDC WD400EB-00CPF0" 0 C "Western Digital 400EB-00CPF0" "WDC WD800JB-00ETA0" 194 C "Western Digital 80GB Special Edition 8MB" "WDC WD1600JB-00EVA0" 194 C "Western Digital 160GB Special Edition 8MB" "WDC WD2000JB-34EVA0" 194 C "Western Digital 200GB Special Edition 8MB" "WDC WD2500JB-32FUA0" 194 C "Western Digital 250GB Special Edition 8MB" "WDC AC420400D" 231 C "Western Digital Caviar AC420400D" "WDC AC418000D" 231 C "Western Digital AC418000D" "WDC WD135BA" 231 C "Wetsern Digital WD135BA" # not sure for next # "WDC WD800JB-00CRA1" 9 C "Western Digital Caviar WD800JB" # "WDC WD800JB-00CRA1" 199 C "Western Digital Caviar WD800JB" # "WDC WD1200JB-00CRA1" 9 C "Western Digital 1200JB-00CRA1" # "WDC WD273BA" 9 C "Western Digital WD273BA" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hddtemp/RHL-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:33:28 -0000 1.2 +++ .cvsignore 22 Jan 2005 13:32:11 -0000 1.3 @@ -1,2 +1 @@ hddtemp-0.3-beta11.tar.gz -hddtemp.db Index: sources =================================================================== RCS file: /cvs/extras/rpms/hddtemp/RHL-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:33:28 -0000 1.2 +++ sources 22 Jan 2005 13:32:11 -0000 1.3 @@ -1,2 +1 @@ 79851534a7557a22418a3510a8f22234 hddtemp-0.3-beta11.tar.gz -f816512c3feee3cc9a92a9a8d27e9cff hddtemp.db From fedora-extras-commits at redhat.com Sat Jan 22 13:32:13 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 22 Jan 2005 08:32:13 -0500 Subject: rpms/hddtemp/devel hddtemp.db, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200501221332.j0MDWDSP016676@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/hddtemp/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv16639/devel Modified Files: .cvsignore sources Added Files: hddtemp.db Log Message: Move hddtemp.db from lookaside cache to CVS for reproducible builds. It's an upstream text file whose name doesn't change between revisions. --- NEW FILE hddtemp.db --- # # DATABASE VERSION 03C (01/01/2004) # # Insert a regular expression for support of the model or the serie of your hard drive. # If you don't know what to put in the second field, put the number # that appears most often for your brand :o) # A value of zero meens that we know that the drive doesn't have # a temperature sensor (you can set the unit to C or F). # ############################################################################ # The following list was found at (http://www.almico.com/sfhardware.php) # If your drive is in the list send me a mail. # # Manufacturer Model Size Notes # FUJITSU FUJITSU MPF3102AH 10.0GB # FUJITSU FUJITSU MPG3204AH E 20.0GB # FUJITSU FUJITSU MPG3307AT 30.0GB # FUJITSU FUJITSU MPG3409AH 40.0GB # FUJITSU FUJITSU MPG3409AH EF 40.0GB # HITACHI HITACHI_DK23CA-10 9.8GB # HITACHI HITACHI_DK23CA-15 14.7GB # HITACHI HITACHI_DK23CA-30 29.3GB # MAXTOR MAXTOR 4K020H1 19.9GB # SAMSUNG SAMSUNG SV3012H 29.4GB # SEAGATE ST310210A 10.0GB # SEAGATE ST310211A 9.8GB # SEAGATE ST310215A 10.0GB # SEAGATE ST315320A 14.9GB # SEAGATE ST320410A 19.6GB # SEAGATE ST320413A 19.6GB # SEAGATE ST320420A 19.9GB # SEAGATE ST330610A 29.3GB # SEAGATE ST330620A 29.3GB # SEAGATE ST330621A 29.3GB # SEAGATE ST330630A 29.9GB # SEAGATE ST340016A 39.1GB # SEAGATE ST340810ACE 39.1GB # SEAGATE ST380020ACE 78.2GB # SEAGATE ST380021A 78.2GB # WESTERN DIGITAL WDC AC210200D 10.0GB # WESTERN DIGITAL WDC AC29100D 8.9GB # WESTERN DIGITAL WDC AC420400D 19.9GB # WESTERN DIGITAL WDC WD102AA 10.0GB # ################################################# ######################################## ############# Fujitsu drives ######################################## "FUJITSU MHM2100AT" 0 C "Fujitsu MHM2100AT" "FUJITSU MHN2200AT" 194 C "Fujitsu MHN2200AT" "FUJITSU MHN2300AT" 194 C "Fujitsu MHN2300AT" "FUJITSU MHR2020AT" 194 C "Fujitsu MHR2020AT" "FUJITSU MHR2030AT" 194 C "Fujitsu MHR2030AT" "FUJITSU MHS2030AT" 194 C "Fujitsu MHS2030AT" "FUJITSU MHS2040AT" 194 C "Fujitsu MHS2040AT" "FUJITSU MHS2060AT" 194 C "Fujitsu MHS2060AT (Apple PowerBook G4)" "FUJITSU MHT2030AT" 194 C "Fujitsu MHT2030AT" "FUJITSU MHT2040AT" 194 C "Fujitsu MHT2040AT" "FUJITSU MPF3204AH" 194 C "Fujitsu MPF3204AH" "FUJITSU MPG3204AT.*" 194 C "Fujitsu MPG3204AT" "FUJITSU MPG3307AT" 194 C "Fujitsu MPG3307AT" "FUJITSU MPG3409AT.*" 194 C "Fujitsu MPG3409AT E" "FUJITSU MPG3409AH.*" 194 C "Fujitsu MPG3409AH E" "FUJITSU MPG3204AH" 194 C "Fujitsu MPG3204AH" ######################################## ############# Hitachi drives ######################################## "HITACHI_DK228A-65" 0 C "Hitachi DK228A-65" "HITACHI_DK23CA-20" 194 C "Hitachi DK23CA-20" "HITACHI_DK23CA-30B" 194 C "Hitachi DK23CA-30B" "HITACHI_DK23CA-75" 194 C "Hitachi DK23CA-75" "HITACHI_DK23DA-[234]0" 194 C "Hitachi DK23DA series" "HITACHI_DK23EA-[346]0" 194 C "Hitachi DK23EA series" "HITACHI_DK23FB-60" 194 C "Hitachi DK23FB60" "HTS726060M9AT00" 194 C "Hitachi Travelstar 60GB" ######################################## ############# IBM drives ######################################## # DJSA serie is using F0h command to report temperature and also have # SMART capabilties but it was reported not to work. # "DJSA-2(30|32|10|20|05)" 0 C "IBM Travelstar 20GN, 32GH, 30GT series" "IBM-DARA-212000" 0 C "IBM Travelstar 12GN" "IBM-DTTA-35*" 0 C "IBM Deskstar 16GP serie" # according to specifications they do not seems to have sensor # but I prefer waiting for a report #"IBM-DTTA-37*" 0 C "IBM Deskstar 14GXP serie" "IBM-DJNA-35.*" 231 C "IBM Deskstar 25 GP serie" "IBM-DJNA-37.*" 231 C "IBM Deskstar 22 GXP serie" "IBM-DHEA-(34330|36480)" 0 C "IBM Deskstar 5 serie" "IBM-DHEA-(34331|36481|38451)" 0 C "IBM Deskstar 8 serie" "IBM-DPTA-37.*" 231 C "IBM Deskstar 34GXP serie" "IBM-DPTA-35.*" 231 C "IBM Deskstar 37GP serie" "IBM-DTLA-30[57]0[123467][05]" 194 C "IBM Deskstar 40GV & 75GXP series" "IC25N0[1234]0ATCS04-0" 194 C "IBM Travelstar 40GN serie" "IC25N0[24]0ATC[SX]05-0" 194 C "IBM Travelstar 40GNX serie" "IC25N0(15|20|30)ATDA04-0" 194 C "IBM Travelstar 30GN serie" "IC25T048ATDA05-0" 194 C "IBM Travelstar 48GH serie" "IC25T060ATC[SX]05-0" 194 C "IBM Travelstar 60GH serie" "IC35L0[12346]0AVER07" 194 C "IBM Deskstar 60GXP serie" "IC35L[01][02468]0AVV[AN]07*" 194 C "IBM Deskstar 120GXP serie" "IC35L[01][23689]0AVV207*" 194 C "IBM Deskstar 180GXP serie" ######################################## ############# Maxtor drives ######################################## #"Maxtor 2B0[012][04568]H1" ??? C "Maxtor Fireball 541DX" "Maxtor 2F020J0" 194 C "Maxtor 2F020J0" "Maxtor 2F030J0" 194 C "Maxtor 2F030J0" # which one must I trust ? #"Maxtor 4D040H2" 9 C "Maxtor DiamondMax D540X-4D" #"Maxtor 4D040H2" 0 C "Maxtor 4D040H2" #"Maxtor 4D080H4" 12 C "Maxtor DiamondMax D540X-4D" #"Maxtor 4D080H4" 9 C "Maxtor DiamondMax D540X-4D" "MAXTOR 4K0[468]0H[234]" 194 C "Maxtor DiamondMax D540X serie" "Maxtor 4[RA](16|12|08|06)0[LJ]0" 194 C "Maxtor DiamondMax 16" "Maxtor 51024U2" 0 C "Maxtor DiamondMax Plus 40" "Maxtor 5A250J0" 194 C "Maxtor Maxline 2 250GB 5400RPM" "Maxtor 5T0[24]0H[24]" 0 C "Maxtor DiamondMax Plus 60" "Maxtor 6E0[234]0L0" 194 C "Maxtor DiamondMax Plus 8" "MAXTOR 6L0[2468]0[LJ][1234]" 194 C "Maxtor DiamondMax Plus D740X family" "Maxtor 6Y(06|08|12|16|20)0[LPM]0" 194 C "Maxtor DiamondMax Plus 9" "Maxtor 94098U8" 11 C "Maxtor DiamondMax 40 94098U8" ######################################## ############# Quantum drives ######################################## "QUANTUM FIREBALLP AS40.0" 0 C "Quantum Fireball AS40" "QUANTUM FIREBALL CX10.2A" 0 C "Quantum Fireball CX10.2A" #"QUANTUM FIREBALLlct10 20" 4 C "Quantum Fireball CT10 20GB" # I suspect the QUANTUM FIREBALL_TM2110A to have a sensor in field 9... # "QUANTUM FIREBALL_TM2110A" 9 C "Quantum Fireball TM2110A" ######################################## ############# Samsung drives ######################################## # somenone reported a problem with the SP8004H which reports a temperature # 10?C below the ambient temperature "SAMSUNG SW0434A" 0 C "Samsung SW0434A" "SAMSUNG SP(2001|4002|6003|8004|40A2)H" 194 C "Samsung SpinPoint P40 serie" "SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)N" 194 C "Samsung SpinPoint P80 serie" "SAMSUNG SV0432A" 0 C "Samsung SV0432A" "SAMSUNG SV3002H" 0 C "Samsung SpinPoint V30 serie" "SAMSUNG SV(2001|4002|6003|8004)H" 194 C "Samsung SpinPoint V40 serie" #"SAMSUNG SV(0221|0602|0813|1204)H" 9 C "Samsung SpinPoint V60 serie" #"SAMSUNG SV1204H" 194 C "Samsung 120G" "SAMSUNG SV(0401|0802|1203|1604)N" 194 C "Samsung SpinPoint V80 serie" ######################################## ############# Seagate drives ######################################## "Seagate Technology 1275MB - ST31276A" 0 C "Seagate ST31276A" "ST3412A" 0 C "Seagate ST3412A" "ST38641A" 0 C "Seagate ST38641A" "ST310210A" 0 C "Seagate ST310210A" "ST310211A" 194 C "Seagate ST310211A" "ST310220A" 0 C "Seagate ST310220A" # SEAGATE ST313021A 13.0GB "ST313021A" 0 C "Seagate U8 ST313021A" "ST310240A" 0 C "Seagate Medalist 10240 Ultra ATA-3" "ST315320A" 194 C "Seagate ST315320A" "ST320423A" 0 C "Seagate U10 20423, Ultra ATA/66" "ST320011A" 194 C "Seagate ST320011A" "ST320014A" 194 C "Seagate ST320014A (5400 rpm, 20Gb)" "ST320410A" 194 C "Seagate ST320410A" "ST320413A" 194 C "Seagate ST320413A" "ST320414A" 194 C "Seagate ST320414A" "ST320420A" 194 C "Seagate Barracuda II ST320420A" "ST330620A" 194 C "Seagate ST330620A" "ST330621A" 194 C "Seagate ST330621A" "ST330630A" 194 C "Seagate Barracuda ST330630A" "ST340014A" 194 C "Seagate Barracuda 7200.7 40Gb" "ST340016A" 194 C "Seagate ST340016A" "ST340810A" 194 C "Seagate U Series 40810 (40Gb, Ultra ATA/100, 5400 rpm)" "ST340823A" 194 C "Seagate U Series 5 40823" "ST340824A" 194 C "Seagate Barracuda III" "ST360015A" 194 C "Seagate Barracuda V ST360015A" "ST360020A" 194 C "Seagate U Series 60020" "ST360021A" 194 C "Seagate Barracuda IV ST360021A" "ST380011A" 194 C "Seagate Barracuda 7200.7 80GB" "ST380013AS" 194 C "Seagate Barracuda 7200.7 80GB (Serial ATA)" "ST380020A" 194 C "Seagate U Series 80020 (80Gb, Ultra ATA/100, 5400 rpm)" "ST380021A" 194 C "Seagate Barracuda IV ST380021A" "ST380023A" 194 C "Seagate Barracuda V ST380023A" "ST39111A" 194 C "Seagate ST39111A (from Sun Ultra)" "ST3120020A" 194 C "Seagate ST3120020A" "ST3120022A" 194 C "Seagate Baraccuda 7200.7 120GB" "ST3120023A" 194 C "Seagate Barracuda V ST3120023A" "ST3120024A" 194 C "Seagate Barracuda V ST3120024A" "ST3120026A" 194 C "Seagate Barracuda V ST3120026A" "ST3160023AS" 194 C "Seagate Barracuda V ST3160023AS (160Gb, Serial ATA)" "ST94011A" 194 C "Seagate ST94011A" ######################################## ############# TOSHIBA Laptops ######################################## "MK4313MAT" 220 C "Toshiba MK4313MAT" "TOSHIBA MK1517GAP" 0 C "Toshiba MK1517GAP" "TOSHIBA MK3017GAP" 0 C "Toshiba MK3017GAP" "TOSHIBA MK3021GAS" 194 C "Toshiba MK3021GAS" #"TOSHIBA MK4019GAX" 222 C "Toshiba MK4019GAX" "TOSHIBA MK6021GAS" 194 C "Toshiba MK6021GAS" "TOSHIBA MK2018GAS" 226 F "Toshiba MK2018GAS" "TOSHIBA MK6022GAX" 194 C "Toshiba MK6022GAX" ######################################## ############# Western Digital drives ######################################## # WDC AC310100B and WDC AC2850F are reported not working # no more informations were given "WDC WD200BB-00AUA1" 0 C "Western Digital Caviar WD200BB" "WDC WD360GD-00FNA0" 194 C "Western Digital SATA Raptor 36.7GB" "WDC WD400BB-(18CA|00DE)A0" 0 C "Western Digital Caviar WD400BB" "WDC WD600BB-32BSA0" 0 C "Western Digital 600BB-32BSA0" "WDC WD800BB-00CAA1" 0 C "Western Digital WD800BB-00CAA1" "WDC WD800BB-22DKA0" 194 C "Western Digital 800BB-22DKA0" "WDC WD100EB-00BHF0" 0 C "Western Digital 100EB-00BHF0" "WDC WD400EB-00CPF0" 0 C "Western Digital 400EB-00CPF0" "WDC WD800JB-00ETA0" 194 C "Western Digital 80GB Special Edition 8MB" "WDC WD1600JB-00EVA0" 194 C "Western Digital 160GB Special Edition 8MB" "WDC WD2000JB-34EVA0" 194 C "Western Digital 200GB Special Edition 8MB" "WDC WD2500JB-32FUA0" 194 C "Western Digital 250GB Special Edition 8MB" "WDC AC420400D" 231 C "Western Digital Caviar AC420400D" "WDC AC418000D" 231 C "Western Digital AC418000D" "WDC WD135BA" 231 C "Wetsern Digital WD135BA" # not sure for next # "WDC WD800JB-00CRA1" 9 C "Western Digital Caviar WD800JB" # "WDC WD800JB-00CRA1" 199 C "Western Digital Caviar WD800JB" # "WDC WD1200JB-00CRA1" 9 C "Western Digital 1200JB-00CRA1" # "WDC WD273BA" 9 C "Western Digital WD273BA" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hddtemp/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:34:04 -0000 1.3 +++ .cvsignore 22 Jan 2005 13:32:11 -0000 1.4 @@ -1,2 +1 @@ hddtemp-0.3-beta12.tar.bz2 -hddtemp.db Index: sources =================================================================== RCS file: /cvs/extras/rpms/hddtemp/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Dec 2004 22:43:31 -0000 1.4 +++ sources 22 Jan 2005 13:32:11 -0000 1.5 @@ -1,2 +1 @@ 51f19658fa6e745eee62f6e100838884 hddtemp-0.3-beta12.tar.bz2 -0a5add4df5f20d8a7471bd48e6842762 hddtemp.db From fedora-extras-commits at redhat.com Sat Jan 22 13:39:08 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 22 Jan 2005 08:39:08 -0500 Subject: rpms/hddtemp/devel hddtemp.db,1.1,1.2 hddtemp.spec,1.6,1.7 Message-ID: <200501221339.j0MDd8WN016810@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/hddtemp/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv16794 Modified Files: hddtemp.db hddtemp.spec Log Message: Update hddtemp.db to 2005-01-17. Index: hddtemp.db =================================================================== RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.db,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hddtemp.db 22 Jan 2005 13:32:11 -0000 1.1 +++ hddtemp.db 22 Jan 2005 13:39:06 -0000 1.2 @@ -1,6 +1,4 @@ # -# DATABASE VERSION 03C (01/01/2004) -# # Insert a regular expression for support of the model or the serie of your hard drive. # If you don't know what to put in the second field, put the number # that appears most often for your brand :o) @@ -44,6 +42,12 @@ # ################################################# +######################################## +############# ExcelStor drives +######################################## +# "ExcelStor Technology CT215" ??? ? "ExcelStor CT215" +"ExcelStor Technology J3.0" 194 C "ExcelStor Technology 3xy (xy GB)" + ######################################## ############# Fujitsu drives @@ -57,7 +61,12 @@ "FUJITSU MHS2040AT" 194 C "Fujitsu MHS2040AT" "FUJITSU MHS2060AT" 194 C "Fujitsu MHS2060AT (Apple PowerBook G4)" "FUJITSU MHT2030AT" 194 C "Fujitsu MHT2030AT" +"FUJITSU MHT2040AH" 194 C "Fujitsu MHT2040AH" "FUJITSU MHT2040AT" 194 C "Fujitsu MHT2040AT" +"FUJITSU MHT2060AH" 194 C "Fujitsu MHT2060AH" +"FUJITSU MHT2060AT" 194 C "Fujitsu MHT2060AT" +"FUJITSU MHT2080AH" 194 C "Fujitsu MHT2080AH" +"FUJITSU MHN2150AT" 194 C "Fujitsu MHN2150AT" "FUJITSU MPF3204AH" 194 C "Fujitsu MPF3204AH" "FUJITSU MPG3204AT.*" 194 C "Fujitsu MPG3204AT" "FUJITSU MPG3307AT" 194 C "Fujitsu MPG3307AT" @@ -65,20 +74,28 @@ "FUJITSU MPG3409AH.*" 194 C "Fujitsu MPG3409AH E" "FUJITSU MPG3204AH" 194 C "Fujitsu MPG3204AH" - ######################################## ############# Hitachi drives ######################################## - "HITACHI_DK228A-65" 0 C "Hitachi DK228A-65" "HITACHI_DK23CA-20" 194 C "Hitachi DK23CA-20" "HITACHI_DK23CA-30B" 194 C "Hitachi DK23CA-30B" "HITACHI_DK23CA-75" 194 C "Hitachi DK23CA-75" "HITACHI_DK23DA-[234]0" 194 C "Hitachi DK23DA series" "HITACHI_DK23EA-[346]0" 194 C "Hitachi DK23EA series" -"HITACHI_DK23FB-60" 194 C "Hitachi DK23FB60" +"HITACHI_DK23EB-40" 194 C "Hitachi DK23EB series" +"HITACHI_DK23FB-[46]0" 194 C "Hitachi DK23FB series" +"HTS424040M9AT00" 194 C "Hitachi Travelstar 4K40 40GB 2MB cache (4200RPM)" +"HTS548020M9AT00" 194 C "Hitachi Travelstar 20GB (5400RPM)" +"HTS548030M9AT00" 194 C "Hitachi Travelstar 30GB (5400RPM)" +"HTS548040M9AT00" 194 C "Hitachi Travelstar 40GB (5400RPM)" +"HTS548060M9AT00" 194 C "Hitachi Travelstar 60GB (5400RPM)" +"HTS548080M9AT00" 194 C "Hitachi Travelstar 80GB (5400RPM)" "HTS726060M9AT00" 194 C "Hitachi Travelstar 60GB" - +"HDS722516VLAT[28]0" 194 C "Hitachi Deskstar 7K250 160GB 2/8MB cache" +"HDS722525VLAT80" 194 C "Hitachi Deskstar 7K250 200/250GB, 7200RPM, 8MB, Parallel-ATA" +"HDS722580VLAT20" 194 C "Deskstar 7K250 60GB" +"HDS728080PLAT20" 194 C "Hitachi Deskstar 7K80 80GB" ######################################## ############# IBM drives @@ -105,6 +122,8 @@ "IC25N0[1234]0ATCS04-0" 194 C "IBM Travelstar 40GN serie" "IC25N0[24]0ATC[SX]05-0" 194 C "IBM Travelstar 40GNX serie" "IC25N0(15|20|30)ATDA04-0" 194 C "IBM Travelstar 30GN serie" +"IC25N0[23468]0ATMR04*" 194 C "Hitachi Travelstar 80GN" +"IC25N040ATMR04-0" 194 C "Hitachi Travelstar 40GB" "IC25T048ATDA05-0" 194 C "IBM Travelstar 48GH serie" "IC25T060ATC[SX]05-0" 194 C "IBM Travelstar 60GH serie" "IC35L0[12346]0AVER07" 194 C "IBM Deskstar 60GXP serie" @@ -112,35 +131,32 @@ "IC35L[01][23689]0AVV207*" 194 C "IBM Deskstar 180GXP serie" + ######################################## ############# Maxtor drives ######################################## - -#"Maxtor 2B0[012][04568]H1" ??? C "Maxtor Fireball 541DX" -"Maxtor 2F020J0" 194 C "Maxtor 2F020J0" -"Maxtor 2F030J0" 194 C "Maxtor 2F030J0" +#"Maxtor 2B0[012][04568]H1" ??? C "Maxtor Fireball 541DX" +"Maxtor 2F0[234]0[LJ]0" 194 C "Maxtor Fireball 3" # which one must I trust ? -#"Maxtor 4D040H2" 9 C "Maxtor DiamondMax D540X-4D" -#"Maxtor 4D040H2" 0 C "Maxtor 4D040H2" -#"Maxtor 4D080H4" 12 C "Maxtor DiamondMax D540X-4D" -#"Maxtor 4D080H4" 9 C "Maxtor DiamondMax D540X-4D" -"MAXTOR 4K0[468]0H[234]" 194 C "Maxtor DiamondMax D540X serie" -"Maxtor 4[RA](16|12|08|06)0[LJ]0" 194 C "Maxtor DiamondMax 16" -"Maxtor 51024U2" 0 C "Maxtor DiamondMax Plus 40" -"Maxtor 5A250J0" 194 C "Maxtor Maxline 2 250GB 5400RPM" -"Maxtor 5T0[24]0H[24]" 0 C "Maxtor DiamondMax Plus 60" -"Maxtor 6E0[234]0L0" 194 C "Maxtor DiamondMax Plus 8" -"MAXTOR 6L0[2468]0[LJ][1234]" 194 C "Maxtor DiamondMax Plus D740X family" -"Maxtor 6Y(06|08|12|16|20)0[LPM]0" 194 C "Maxtor DiamondMax Plus 9" -"Maxtor 94098U8" 11 C "Maxtor DiamondMax 40 94098U8" - - - +#"Maxtor 4D040H2" 9 C "Maxtor DiamondMax D540X-4D" +#"Maxtor 4D040H2" 0 C "Maxtor 4D040H2" +#"Maxtor 4D080H4" 12 C "Maxtor DiamondMax D540X-4D" +#"Maxtor 4D080H4" 9 C "Maxtor DiamondMax D540X-4D" +"MAXTOR 4K0[468]0H[234]" 194 C "Maxtor DiamondMax D540X serie" +"Maxtor 4[RA](25|16|12|08|06)0[LJ]0" 194 C "Maxtor DiamondMax 16" +"Maxtor 5(1024|1369|2049|2732|3073|4098)U(2|3|4|6|8)" 0 C "Maxtor DiamondMax Plus 40" +"Maxtor 5A250J0" 194 C "Maxtor MaXline II 250GB 5400RPM" +"Maxtor 5A300J0" 194 C "Maxtor 5A300J0" +"Maxtor 5T0[24]0H[24]" 0 C "Maxtor DiamondMax Plus 60" +"Maxtor 6E0[234]0L0" 194 C "Maxtor DiamondMax Plus 8" +"MAXTOR 6L0[2468]0[LJ][1234]" 194 C "Maxtor DiamondMax Plus D740X family" +"Maxtor 6[YB](04|06|08|12|16|20|25)0[LPM]0" 194 C "Maxtor DiamondMax Plus 9" +"Maxtor 7Y250[PM]0" 194 C "Maxtor MaXLine Plus II 250GB 7200RPM" +"Maxtor 94098U8" 11 C "Maxtor DiamondMax 40 94098U8" ######################################## ############# Quantum drives ######################################## - "QUANTUM FIREBALLP AS40.0" 0 C "Quantum Fireball AS40" "QUANTUM FIREBALL CX10.2A" 0 C "Quantum Fireball CX10.2A" #"QUANTUM FIREBALLlct10 20" 4 C "Quantum Fireball CT10 20GB" @@ -148,14 +164,19 @@ # "QUANTUM FIREBALL_TM2110A" 9 C "Quantum Fireball TM2110A" + ######################################## ############# Samsung drives ######################################## # somenone reported a problem with the SP8004H which reports a temperature # 10?C below the ambient temperature +"SAMSUNG MP0(302|402|603|804)H" 194 C "Samsung SpinPoint M40 2.5inch" "SAMSUNG SW0434A" 0 C "Samsung SW0434A" "SAMSUNG SP(2001|4002|6003|8004|40A2)H" 194 C "Samsung SpinPoint P40 serie" "SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)N" 194 C "Samsung SpinPoint P80 serie" +"SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)C" 194 C "Samsung SpinPoint P80 series - SATA" +"SAMSUNG SP0411N" 194 C "Samsung SpinPoint PL40 serie" +"SAMSUNG SP(0812|1213|1614)C" 194 C "Samsung Spinpoint 160G SATA" "SAMSUNG SV0432A" 0 C "Samsung SV0432A" "SAMSUNG SV3002H" 0 C "Samsung SpinPoint V30 serie" "SAMSUNG SV(2001|4002|6003|8004)H" 194 C "Samsung SpinPoint V40 serie" @@ -164,10 +185,10 @@ "SAMSUNG SV(0401|0802|1203|1604)N" 194 C "Samsung SpinPoint V80 serie" + ######################################## ############# Seagate drives ######################################## - "Seagate Technology 1275MB - ST31276A" 0 C "Seagate ST31276A" "ST3412A" 0 C "Seagate ST3412A" "ST38641A" 0 C "Seagate ST38641A" @@ -189,6 +210,7 @@ "ST330621A" 194 C "Seagate ST330621A" "ST330630A" 194 C "Seagate Barracuda ST330630A" "ST340014A" 194 C "Seagate Barracuda 7200.7 40Gb" +"ST340015A" 194 C "Seagate Barracuda 5400.1 40GB" "ST340016A" 194 C "Seagate ST340016A" "ST340810A" 194 C "Seagate U Series 40810 (40Gb, Ultra ATA/100, 5400 rpm)" "ST340823A" 194 C "Seagate U Series 5 40823" @@ -197,9 +219,11 @@ "ST360020A" 194 C "Seagate U Series 60020" "ST360021A" 194 C "Seagate Barracuda IV ST360021A" "ST380011A" 194 C "Seagate Barracuda 7200.7 80GB" +"ST380013A" 194 C "Seagate Barracuda 7200.7 80GB" "ST380013AS" 194 C "Seagate Barracuda 7200.7 80GB (Serial ATA)" "ST380020A" 194 C "Seagate U Series 80020 (80Gb, Ultra ATA/100, 5400 rpm)" "ST380021A" 194 C "Seagate Barracuda IV ST380021A" +"ST380022A" 194 C "Seagate Barracuda U7 80022, Ultra ATA/100" "ST380023A" 194 C "Seagate Barracuda V ST380023A" "ST39111A" 194 C "Seagate ST39111A (from Sun Ultra)" "ST3120020A" 194 C "Seagate ST3120020A" @@ -207,50 +231,64 @@ "ST3120023A" 194 C "Seagate Barracuda V ST3120023A" "ST3120024A" 194 C "Seagate Barracuda V ST3120024A" "ST3120026A" 194 C "Seagate Barracuda V ST3120026A" -"ST3160023AS" 194 C "Seagate Barracuda V ST3160023AS (160Gb, Serial ATA)" -"ST94011A" 194 C "Seagate ST94011A" - - +"ST3160021A" 194 C "Seagate Barracuda 7200.7 - ST3160021A" +"ST3160023(A|AS)" 194 C "Seagate Barracuda V ST3160023A and AS (160Gb, ATA100 and Serial ATA)" +"ST3200822A" 194 C "Seagate Barracuda 7200.7 Plus 200GB" +"ST94[08]11A" 194 C "Seagate ST94011A" ######################################## ############# TOSHIBA Laptops ######################################## - "MK4313MAT" 220 C "Toshiba MK4313MAT" "TOSHIBA MK1517GAP" 0 C "Toshiba MK1517GAP" +"TOSHIBA MK2018GAS" 226 F "Toshiba MK2018GAS" +"TOSHIBA MK2023GAS" 194 C "Toshiba MK2023GAS" "TOSHIBA MK3017GAP" 0 C "Toshiba MK3017GAP" "TOSHIBA MK3021GAS" 194 C "Toshiba MK3021GAS" #"TOSHIBA MK4019GAX" 222 C "Toshiba MK4019GAX" "TOSHIBA MK6021GAS" 194 C "Toshiba MK6021GAS" -"TOSHIBA MK2018GAS" 226 F "Toshiba MK2018GAS" "TOSHIBA MK6022GAX" 194 C "Toshiba MK6022GAX" +"TOSHIBA MK6025GAS" 194 C "Toshiba MK6025GAS" +"TOSHIBA MK8025GAS" 194 C "Toshiba MK8025GAS" +"TOSHIBA MK8026GAX" 194 C "Toshiba MK8026GAX" +"MK4025GAS" 194 C "Toshiba MK4025GAS" ######################################## ############# Western Digital drives ######################################## - # WDC AC310100B and WDC AC2850F are reported not working # no more informations were given -"WDC WD200BB-00AUA1" 0 C "Western Digital Caviar WD200BB" -"WDC WD360GD-00FNA0" 194 C "Western Digital SATA Raptor 36.7GB" -"WDC WD400BB-(18CA|00DE)A0" 0 C "Western Digital Caviar WD400BB" -"WDC WD600BB-32BSA0" 0 C "Western Digital 600BB-32BSA0" -"WDC WD800BB-00CAA1" 0 C "Western Digital WD800BB-00CAA1" -"WDC WD800BB-22DKA0" 194 C "Western Digital 800BB-22DKA0" -"WDC WD100EB-00BHF0" 0 C "Western Digital 100EB-00BHF0" -"WDC WD400EB-00CPF0" 0 C "Western Digital 400EB-00CPF0" -"WDC WD800JB-00ETA0" 194 C "Western Digital 80GB Special Edition 8MB" -"WDC WD1600JB-00EVA0" 194 C "Western Digital 160GB Special Edition 8MB" -"WDC WD2000JB-34EVA0" 194 C "Western Digital 200GB Special Edition 8MB" -"WDC WD2500JB-32FUA0" 194 C "Western Digital 250GB Special Edition 8MB" -"WDC AC420400D" 231 C "Western Digital Caviar AC420400D" -"WDC AC418000D" 231 C "Western Digital AC418000D" -"WDC WD135BA" 231 C "Wetsern Digital WD135BA" +"WDC WD100EB-00BHF0" 0 C "Western Digital 100EB-00BHF0" +"WDC WD200BB-00AUA1" 0 C "Western Digital Caviar WD200BB" +#"WDC WD200BB-60DGA0" 0 C "Western Digital Caviar WD200BB" +"WDC WD360GD-00FNA0" 194 C "Western Digital SATA Raptor 36.7GB" +"WDC WD400BB-(18CA|00DE)A0" 0 C "Western Digital Caviar WD400BB" +"WDC WD400EB-00CPF0" 0 C "Western Digital 400EB-00CPF0" +"WDC WD400JB-00FMA0" 194 C "Western Digital Caviar 40GB Special Edition 8MB" +"WDC WD600BB-32BSA0" 0 C "Western Digital 600BB-32BSA0" +"WDC WD600LB-00DNA0" 194 C "Western Digital 60GB" +"WDC WD800BB-00CAA1" 0 C "Western Digital WD800BB-00CAA1" +"WDC WD800BB-22DKA0" 194 C "Western Digital 800BB-22DKA0" +"WDC WD800BB-32CCB0" 194 C "Western Digital 800BB-32CCB0" +"WDC WD800BB-55JKA0" 194 C "Western Digital 800BB-55JKA0" +"WDC WD800JB-00CRA1" 0 C "Western Digital Caviar WD800JB" +"WDC WD800JB-00(ET|FM|FS)A0" 194 C "Western Digital Caviar 80GB Special Edition 8MB" +"WDC WD800JB-00JJA0" 194 C "Western Digital WD800JB" +"WDC WD800JD-00HKA0" 194 C "Western Digital SATA 80GB, 8MB Cache" +"WDC WD1200JB-00(EV|FU|GV)A0" 194 C "Western Digital Caviar 120GB Special Edition 8MB" +"WDC WD1200JD-00GBB0" 194 C "Western Digital WD1200JD" +"WDC WD1200LB-55EDA0" 194 C "Western Digital WD1220LB" +"WDC WD1600BB-00DWA0" 194 C "Western Digital Caviar WD1600BB" +"WDC WD1600JB-00(EV|FU|GV)A0" 194 C "Western Digital Caviar 160GB Special Edition 8MB" +"WDC WD2000JB-(00EV|34EV|00FU|00GV|98GV)A0" 194 C "Western Digital Caviar 200GB Special Edition 8MB" +"WDC WD2500JB-(00FU|32FU|00GV)A0" 194 C "Western Digital Caviar 250GB Special Edition 8MB" +"WDC AC420400D" 231 C "Western Digital Caviar AC420400D" +"WDC AC418000D" 231 C "Western Digital AC418000D" +"WDC WD135BA" 231 C "Western Digital WD135BA" + # not sure for next -# "WDC WD800JB-00CRA1" 9 C "Western Digital Caviar WD800JB" -# "WDC WD800JB-00CRA1" 199 C "Western Digital Caviar WD800JB" # "WDC WD1200JB-00CRA1" 9 C "Western Digital 1200JB-00CRA1" # "WDC WD273BA" 9 C "Western Digital WD273BA" Index: hddtemp.spec =================================================================== RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- hddtemp.spec 4 Dec 2004 22:43:31 -0000 1.6 +++ hddtemp.spec 22 Jan 2005 13:39:06 -0000 1.7 @@ -1,6 +1,6 @@ Name: hddtemp Version: 0.3 -Release: 0.1.beta12 +Release: 0.2.beta12 Epoch: 0 Summary: Hard disk temperature tool @@ -92,6 +92,9 @@ %changelog +* Sat Jan 22 2005 Ville Skytt?? - 0:0.3-0.2.beta12 +- Update hddtemp.db to 2005-01-17. + * Sat Dec 4 2004 Ville Skytt?? - 0:0.3-0.1.beta12 - Init script and sysconfig cleanups. - Build with dependency tracking disabled. From fedora-extras-commits at redhat.com Sat Jan 22 20:27:04 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 22 Jan 2005 15:27:04 -0500 Subject: rpms/rdiff-backup/devel sources,1.2,1.3 rdiff-backup.spec,1.4,1.5 Message-ID: <200501222027.j0MKR4tO022435@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/rdiff-backup/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22429 Modified Files: sources rdiff-backup.spec Log Message: Update to 0.12.7 in reply to bug #144419. Index: sources =================================================================== RCS file: /cvs/extras/rpms/rdiff-backup/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:17:55 -0000 1.2 +++ sources 22 Jan 2005 20:27:02 -0000 1.3 @@ -1 +1 @@ -49d7baedd303fb278a65682064ec8c64 rdiff-backup-0.12.6.tar.gz +12fb0085861483eab379cb578fa9c849 rdiff-backup-0.12.7.tar.gz Index: rdiff-backup.spec =================================================================== RCS file: /cvs/extras/rpms/rdiff-backup/devel/rdiff-backup.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rdiff-backup.spec 10 Dec 2004 22:03:10 -0000 1.4 +++ rdiff-backup.spec 22 Jan 2005 20:27:02 -0000 1.5 @@ -1,19 +1,19 @@ -%define PYTHON_VERSION %(python -c 'import sys; print sys.version[:3],') -%define NEXT_PYTHON_VERSION %(python -c 'import sys; print "%d.%d" % (sys.version_info[0], sys.version_info[1]+1),') +%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -Version: 0.12.6 +Version: 0.12.7 Summary: Convenient and transparent local/remote incremental mirror/backup Name: rdiff-backup Release: 1 Epoch: 0 -URL: http://rdiff-backup.stanford.edu/ -Source: http://rdiff-backup.stanford.edu/OLD/%{version}/%{name}-%{version}.tar.gz +URL: http://www.nongnu.org/rdiff-backup/ +Source: http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz License: GPL Group: Applications/Archiving BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: python >= 0:%{PYTHON_VERSION}, python < 0:%{NEXT_PYTHON_VERSION} BuildRequires: python-devel >= 0:2.2, librsync-devel >= 0:0.9.6 +Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") + %description rdiff-backup is a script, written in Python, that backs up one directory to another and is intended to be run periodically (nightly @@ -33,9 +33,10 @@ python setup.py build %install +rm -rf $RPM_BUILD_ROOT python setup.py install --root $RPM_BUILD_ROOT # Produce .pyo files for %ghost directive later -python -Oc 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT/%{_libdir}/python%{PYTHON_VERSION}/site-packages/rdiff_backup'")' +python -Oc 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT/%{python_sitearch}/rdiff_backup'")' %clean rm -rf $RPM_BUILD_ROOT @@ -44,17 +45,24 @@ %defattr(-,root,root) %{_bindir}/rdiff-backup %{_mandir}/man1/rdiff-backup* -%dir %{_libdir}/python%{PYTHON_VERSION}/site-packages/rdiff_backup -%{_libdir}/python%{PYTHON_VERSION}/site-packages/rdiff_backup/*.py -%{_libdir}/python%{PYTHON_VERSION}/site-packages/rdiff_backup/*.pyc -%{_libdir}/python%{PYTHON_VERSION}/site-packages/rdiff_backup/*.so -%ghost %{_libdir}/python%{PYTHON_VERSION}/site-packages/rdiff_backup/*.pyo +%dir %{python_sitearch}/rdiff_backup +%{python_sitearch}/rdiff_backup/*.py +%{python_sitearch}/rdiff_backup/*.pyc +%{python_sitearch}/rdiff_backup/*.so +%ghost %{python_sitearch}/rdiff_backup/*.pyo %doc CHANGELOG COPYING FAQ.html README %changelog +* Sat Jan 22 2005 Michael Schwendt - 0:0.12.7-1 +- Update to 0.12.7 which was released May 31st, 2004. +- Enhance spec with python-abi and arch-dependent sitelib paths. +- Update URL and Source. + * Sun Oct 05 2003 Ben Escoto - 0:0.12.5-0.fdr.1 - Added epochs to python versions, more concise %%defines, %%ghost files + * Thu Aug 16 2003 Ben Escoto - 0:0.12.3-0.fdr.4 - Implemented various suggestions of Fedora QA + * Sun Nov 4 2001 Ben Escoto - Initial RPM From fedora-extras-commits at redhat.com Sun Jan 23 00:58:12 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 22 Jan 2005 19:58:12 -0500 Subject: rpms/liferea/devel liferea.spec,1.6,1.7 sources,1.4,1.5 Message-ID: <200501230058.j0N0wCEr025527@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/liferea/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25521 Modified Files: liferea.spec sources Log Message: Merging from testing branch. Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- liferea.spec 12 Jan 2005 20:05:46 -0000 1.6 +++ liferea.spec 23 Jan 2005 00:58:10 -0000 1.7 @@ -1,5 +1,5 @@ Name: liferea -Version: 0.6.4 +Version: 0.9.0 Release: 1.b Epoch: 0 Summary: An RSS/RDF feed reader. @@ -7,8 +7,7 @@ Group: Applications/Internet License: GPL URL: http://liferea.sourceforge.net/ -Source0: http://download.sourceforge.net/liferea/liferea-0.6.4b.tar.gz -Source2: %{name}.desktop +Source0: http://download.sourceforge.net/liferea/liferea-0.9.0b.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel @@ -48,7 +47,7 @@ desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ - %{SOURCE2} + %{name}.desktop %clean @@ -83,6 +82,13 @@ %changelog +* Tue Jan 18 2005 Brian Pepple - 0:0.9.0-1.b +- Updated to 0.9.0b. +- Remove seperate desktop file. + +* Fri Jan 14 2005 Brian Pepple - 0:0.9.0-1 +- Updated to 0.9.0. + * Wed Jan 12 2005 Brian Pepple - 0:0.6.4-1.b - Updated to 0.6.4b. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 12 Jan 2005 20:05:46 -0000 1.4 +++ sources 23 Jan 2005 00:58:10 -0000 1.5 @@ -1 +1 @@ -d45086ee3fc098cc9ca146bece0ddf9f liferea-0.6.4b.tar.gz +2781b3ae500e089497fcbee97bf73441 liferea-0.9.0b.tar.gz From fedora-extras-commits at redhat.com Sun Jan 23 05:36:39 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 23 Jan 2005 00:36:39 -0500 Subject: rpms/libfwbuilder - New directory Message-ID: <200501230536.j0N5ad1R029099@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/libfwbuilder In directory cvs.fedora.redhat.com:/tmp/cvs-serv29086/libfwbuilder Log Message: Directory /cvs/extras/rpms/libfwbuilder added to the repository From fedora-extras-commits at redhat.com Sun Jan 23 05:36:39 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 23 Jan 2005 00:36:39 -0500 Subject: rpms/libfwbuilder/devel - New directory Message-ID: <200501230536.j0N5adjk029102@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/libfwbuilder/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv29086/libfwbuilder/devel Log Message: Directory /cvs/extras/rpms/libfwbuilder/devel added to the repository From fedora-extras-commits at redhat.com Sun Jan 23 05:37:02 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 23 Jan 2005 00:37:02 -0500 Subject: rpms/libfwbuilder Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501230537.j0N5b27j029179@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/libfwbuilder In directory cvs.fedora.redhat.com:/tmp/cvs-serv29164 Added Files: Makefile import.log Log Message: Setup of module libfwbuilder --- NEW FILE Makefile --- # Top level Makefile for module libfwbuilder all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 23 05:37:02 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 23 Jan 2005 00:37:02 -0500 Subject: rpms/libfwbuilder/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501230537.j0N5b2UU029182@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/libfwbuilder/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv29164/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libfwbuilder --- NEW 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 Jan 23 05:37:39 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 23 Jan 2005 00:37:39 -0500 Subject: rpms/libfwbuilder import.log,1.1,1.2 Message-ID: <200501230537.j0N5bdZI029311@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/libfwbuilder In directory cvs.fedora.redhat.com:/tmp/cvs-serv29296 Modified Files: import.log Log Message: auto-import libfwbuilder-2.0.5-1 on branch devel from libfwbuilder-2.0.5-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 23 Jan 2005 05:37:00 -0000 1.1 +++ import.log 23 Jan 2005 05:37:37 -0000 1.2 @@ -0,0 +1 @@ +libfwbuilder-2_0_5-1:HEAD:libfwbuilder-2.0.5-1.src.rpm:1106458651 From fedora-extras-commits at redhat.com Sun Jan 23 05:37:39 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 23 Jan 2005 00:37:39 -0500 Subject: rpms/libfwbuilder/devel libfwbuilder.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501230537.j0N5bdKm029315@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/libfwbuilder/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv29296/devel Modified Files: .cvsignore sources Added Files: libfwbuilder.spec Log Message: auto-import libfwbuilder-2.0.5-1 on branch devel from libfwbuilder-2.0.5-1.src.rpm --- NEW FILE libfwbuilder.spec --- Name: libfwbuilder Summary: Firewall Builder API Version: 2.0.5 Release: 1 License: GPL Group: "System Environment/Libraries" Packager: Steve Grubb Url: http://www.fwbuilder.org/ Source: %{name}-%{version}.tar.gz Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: libxslt-devel, libxml2-devel BuildRequires: qt-devel >= 3.0.0 BuildRequires: openssl-devel #BuildRequires: net-snmp-devel Provides: %name = %version %description Firewall Builder API library and compiler framework %files %defattr(-,root,root) %doc doc/AUTHORS doc/COPYING doc/ChangeLog doc/Credits doc/INSTALL doc/README doc/PatchAcceptancePolicy.txt %dir %{_datadir}/libfwbuilder %{_datadir}/libfwbuilder/* %{_libdir}/*.so.* %{_libdir}/*.so %package devel Summary: Firewall Builder API Libraries and Header Files Group: "Development/Libraries" Requires: %{name} = %{version}-%{release} Provides: %name-devel = %version-%release %description devel This package contains the libraries and header files that programmer would need to develop applications using Firewall Builder API. %files devel %defattr(-, root, root) %{_bindir}/libfwbuilder-config-2 /usr/include/fwb-2.0/fwbuilder /usr/include/fwb-2.0/fwcompiler %prep %setup -q %build ./configure --enable-auto-docdir --libdir=%{_libdir} --prefix=%{_prefix} --with-templatedir=%{_datadir}/libfwbuilder --disable-static --enable-shared make QTDIR=`cat qtdir` all %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT make QTDIR=`cat qtdir` DDIR=$RPM_BUILD_ROOT install # prevent including twice the doc rm -fr $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version} %clean [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %changelog * Sat Jan 22 2005 Steve Grubb 2.0.5 - Created base spec file Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Jan 2005 05:37:00 -0000 1.1 +++ .cvsignore 23 Jan 2005 05:37:37 -0000 1.2 @@ -0,0 +1 @@ +libfwbuilder-2.0.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jan 2005 05:37:00 -0000 1.1 +++ sources 23 Jan 2005 05:37:37 -0000 1.2 @@ -0,0 +1 @@ +7fe07b07e13d21e20d10185276c2318e libfwbuilder-2.0.5.tar.gz From fedora-extras-commits at redhat.com Sun Jan 23 05:38:39 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 23 Jan 2005 00:38:39 -0500 Subject: rpms/fwbuilder - New directory Message-ID: <200501230538.j0N5cd03029469@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/fwbuilder In directory cvs.fedora.redhat.com:/tmp/cvs-serv29456/fwbuilder Log Message: Directory /cvs/extras/rpms/fwbuilder added to the repository From fedora-extras-commits at redhat.com Sun Jan 23 05:38:39 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 23 Jan 2005 00:38:39 -0500 Subject: rpms/fwbuilder/devel - New directory Message-ID: <200501230538.j0N5cd9Y029472@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/fwbuilder/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv29456/fwbuilder/devel Log Message: Directory /cvs/extras/rpms/fwbuilder/devel added to the repository From fedora-extras-commits at redhat.com Sun Jan 23 05:38:57 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 23 Jan 2005 00:38:57 -0500 Subject: rpms/fwbuilder Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501230538.j0N5cvN6029550@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/fwbuilder In directory cvs.fedora.redhat.com:/tmp/cvs-serv29535 Added Files: Makefile import.log Log Message: Setup of module fwbuilder --- NEW FILE Makefile --- # Top level Makefile for module fwbuilder all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 23 05:38:57 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 23 Jan 2005 00:38:57 -0500 Subject: rpms/fwbuilder/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501230538.j0N5cvau029553@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/fwbuilder/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv29535/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module fwbuilder --- NEW 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 Jan 23 05:40:03 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 23 Jan 2005 00:40:03 -0500 Subject: rpms/fwbuilder import.log,1.1,1.2 Message-ID: <200501230540.j0N5e32E029694@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/fwbuilder In directory cvs.fedora.redhat.com:/tmp/cvs-serv29679 Modified Files: import.log Log Message: auto-import fwbuilder-2.0.5-1 on branch devel from fwbuilder-2.0.5-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 23 Jan 2005 05:38:55 -0000 1.1 +++ import.log 23 Jan 2005 05:40:01 -0000 1.2 @@ -0,0 +1 @@ +fwbuilder-2_0_5-1:HEAD:fwbuilder-2.0.5-1.src.rpm:1106458795 From fedora-extras-commits at redhat.com Sun Jan 23 05:40:03 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 23 Jan 2005 00:40:03 -0500 Subject: rpms/fwbuilder/devel fwbuilder.desktop, NONE, 1.1 fwbuilder.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501230540.j0N5e3m5029698@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/fwbuilder/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv29679/devel Modified Files: .cvsignore sources Added Files: fwbuilder.desktop fwbuilder.spec Log Message: auto-import fwbuilder-2.0.5-1 on branch devel from fwbuilder-2.0.5-1.src.rpm --- NEW FILE fwbuilder.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Firewall Builder Comment=Design IPTables Firewall Rules Icon=/usr/share/pixmaps/fwbuilder/firewall.png Categories=Application;SystemSetup Exec=/usr/bin/fwbuilder Type=Application StartupNotify=true Terminal=false --- NEW FILE fwbuilder.spec --- Name: fwbuilder Summary: Firewall Builder Version: 2.0.5 Release: 1 License: GPL Group: "Applications/System" Packager: Steve Grubb Url: http://www.fwbuilder.org/ Source: %{name}-%{version}.tar.gz Source1: fwbuilder.desktop Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: qt-devel >= 3.0.0 BuildRequires: desktop-file-utils BuildRequires: libfwbuilder-devel = 2.0.5 Requires: libfwbuilder = 2.0.5 Provides: %name = %version %description Firewall Builder consists of a GUI and set of policy compilers for various firewall platforms. It helps users maintain a database of objects and allows policy editing using simple drag-and-drop operations. GUI generates firewall description in the form of XML file, which compilers then interpret and generate platform-specific code. Several algorithms are provided for automated network objects discovery and bulk import of data. The GUI and policy compilers are completely independent, this provides for a consistent abstract model and the same GUI for different firewall platforms. %prep %setup -q %build ./configure --prefix=%{_prefix} --with-templatedir=%{_datadir}/fwbuilder make QTDIR=`cat qtdir` all %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT make QTDIR=`cat qtdir` DDIR=$RPM_BUILD_ROOT install rm -fr $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version} # Add an icon for the menu system mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/fwbuilder install -c -m644 src/gui/icons/firewall.png $RPM_BUILD_ROOT/usr/share/pixmaps/fwbuilder # Add menu entry desktop-file-install --vendor system \ --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ --add-category X-Red-Hat-Base \ %{SOURCE1} %clean [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %dir %{_datadir}/fwbuilder %dir %{_datadir}/pixmaps/fwbuilder %{_datadir}/fwbuilder/locale/* %{_datadir}/fwbuilder/platform/* %{_datadir}/fwbuilder/os/* %{_datadir}/fwbuilder/resources.xml %{_datadir}/fwbuilder/objects_init.xml %{_datadir}/fwbuilder/templates.xml %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/fwbuilder/firewall.png %{_bindir}/fwbuilder %{_bindir}/fwblookup %{_bindir}/fwbedit %{_bindir}/fwb_install %{_bindir}/fwb_compile_all %doc doc/AUTHORS %doc doc/COPYING %doc doc/Credits %doc doc/ChangeLog %doc doc/PatchAcceptancePolicy.txt %doc doc/README.floppyfw %doc doc/ReleaseNotes_2_0.html %doc doc/ReleaseNotes_2_0.txt %doc doc/ReleaseNotes_2.0.1.html %doc doc/ReleaseNotes_2.0.1.txt %doc doc/ReleaseNotes_2.0.2.html %doc doc/ReleaseNotes_2.0.2.txt %doc doc/ReleaseNotes_2.0.3.html %doc doc/ReleaseNotes_2.0.3.txt %doc doc/ReleaseNotes_2.0.4.html %doc doc/ReleaseNotes_2.0.4.txt %doc doc/ReleaseNotes_2.0.5.html %doc doc/ReleaseNotes_2.0.5.txt %{_mandir}/man1/fwbuilder.1* %{_mandir}/man1/fwblookup.1* %{_mandir}/man1/fwbedit.1* %{_mandir}/man1/fwb_install.1* %{_mandir}/man1/fwb_compile_all.1* %package pf Summary: Policy Compiler for OpenBSD PF Group: "Applications/System" Requires: %{name} = %{version}-%{release} %description pf Policy compiler for OpenBSD PF %files pf %defattr(-,root,root) %{_bindir}/fwb_pf %doc doc/README.pf %{_mandir}/man1/fwb_pf.1* %package ipf Summary: Policy Pompiler for ipfilter Group: "Applications/System" Requires: %{name} = %{version}-%{release} %description ipf Policy compiler for ipfilter %files ipf %defattr(-,root,root) %{_bindir}/fwb_ipf %doc doc/README.ipf %{_mandir}/man1/fwb_ipf.1* %package ipfw Summary: Policy Compiler for ipfw Group: "Applications/System" Requires: %{name} = %{version}-%{release} %description ipfw Policy compiler for ipfw %files ipfw %defattr(-,root,root) %{_bindir}/fwb_ipfw %doc doc/README.ipfw %{_mandir}/man1/fwb_ipfw.1* %package ipt Summary: Policy Compiler for IPTables Group: "Applications/System" Requires: %{name} = %{version}-%{release} %description ipt Policy compiler for IPTables %files ipt %defattr(-,root,root) %{_bindir}/fwb_ipt %doc doc/README.ipt %{_mandir}/man1/fwb_ipt.1* %changelog * Sat Jan 22 2005 Steve Grubb 2.0.5 - Created base spec file Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Jan 2005 05:38:55 -0000 1.1 +++ .cvsignore 23 Jan 2005 05:40:01 -0000 1.2 @@ -0,0 +1 @@ +fwbuilder-2.0.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jan 2005 05:38:55 -0000 1.1 +++ sources 23 Jan 2005 05:40:01 -0000 1.2 @@ -0,0 +1 @@ +03fe6aaa6f8c7728bd3015a4df187c70 fwbuilder-2.0.5.tar.gz From fedora-extras-commits at redhat.com Sun Jan 23 05:42:14 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 23 Jan 2005 00:42:14 -0500 Subject: rpms/fwbuilder/devel fwbuilder.spec,1.1,1.2 Message-ID: <200501230542.j0N5gEkK029817@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/fwbuilder/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv29805 Modified Files: fwbuilder.spec Log Message: minor spec cleanup Index: fwbuilder.spec =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/devel/fwbuilder.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fwbuilder.spec 23 Jan 2005 05:40:01 -0000 1.1 +++ fwbuilder.spec 23 Jan 2005 05:42:12 -0000 1.2 @@ -1,19 +1,16 @@ Name: fwbuilder Summary: Firewall Builder Version: 2.0.5 -Release: 1 +Release: 2 License: GPL -Group: "Applications/System" -Packager: Steve Grubb -Url: http://www.fwbuilder.org/ +Group: Applications/System +URL: http://www.fwbuilder.org/ Source: %{name}-%{version}.tar.gz Source1: fwbuilder.desktop Buildroot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: qt-devel >= 3.0.0 +BuildRequires: qt-devel >= 1:3.0.0 BuildRequires: desktop-file-utils BuildRequires: libfwbuilder-devel = 2.0.5 -Requires: libfwbuilder = 2.0.5 -Provides: %name = %version %description Firewall Builder consists of a GUI and set of policy compilers for @@ -30,13 +27,15 @@ %setup -q %build +[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh ./configure --prefix=%{_prefix} --with-templatedir=%{_datadir}/fwbuilder -make QTDIR=`cat qtdir` all +make all %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -make QTDIR=`cat qtdir` DDIR=$RPM_BUILD_ROOT install -rm -fr $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version} +rm -rf $RPM_BUILD_ROOT +[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh +make DDIR=$RPM_BUILD_ROOT install +rm -rf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version} # Add an icon for the menu system mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/fwbuilder @@ -49,7 +48,7 @@ %{SOURCE1} %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) @@ -95,7 +94,7 @@ %package pf Summary: Policy Compiler for OpenBSD PF -Group: "Applications/System" +Group: Applications/System Requires: %{name} = %{version}-%{release} %description pf @@ -110,7 +109,7 @@ %package ipf Summary: Policy Pompiler for ipfilter -Group: "Applications/System" +Group: Applications/System Requires: %{name} = %{version}-%{release} %description ipf @@ -125,7 +124,7 @@ %package ipfw Summary: Policy Compiler for ipfw -Group: "Applications/System" +Group: Applications/System Requires: %{name} = %{version}-%{release} %description ipfw @@ -140,7 +139,7 @@ %package ipt Summary: Policy Compiler for IPTables -Group: "Applications/System" +Group: Applications/System Requires: %{name} = %{version}-%{release} %description ipt @@ -153,6 +152,9 @@ %{_mandir}/man1/fwb_ipt.1* %changelog +* Sat Jan 22 2005 Warren Togami 2.0.5-2 +- minor spec cleanup + * Sat Jan 22 2005 Steve Grubb 2.0.5 - Created base spec file From fedora-extras-commits at redhat.com Sun Jan 23 05:43:02 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 23 Jan 2005 00:43:02 -0500 Subject: rpms/libfwbuilder/devel libfwbuilder.spec,1.1,1.2 Message-ID: <200501230543.j0N5h2ia029877@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/libfwbuilder/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv29864 Modified Files: libfwbuilder.spec Log Message: spec cleanup Index: libfwbuilder.spec =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/devel/libfwbuilder.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libfwbuilder.spec 23 Jan 2005 05:37:37 -0000 1.1 +++ libfwbuilder.spec 23 Jan 2005 05:43:00 -0000 1.2 @@ -1,25 +1,23 @@ Name: libfwbuilder Summary: Firewall Builder API Version: 2.0.5 -Release: 1 +Release: 2 License: GPL -Group: "System Environment/Libraries" -Packager: Steve Grubb +Group: System Environment/Libraries Url: http://www.fwbuilder.org/ Source: %{name}-%{version}.tar.gz Buildroot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: libxslt-devel, libxml2-devel -BuildRequires: qt-devel >= 3.0.0 +BuildRequires: qt-devel >= 1:3.0.0 +BuildRequires: libxslt-devel BuildRequires: openssl-devel #BuildRequires: net-snmp-devel -Provides: %name = %version %description Firewall Builder API library and compiler framework %files %defattr(-,root,root) -%doc doc/AUTHORS doc/COPYING doc/ChangeLog doc/Credits doc/INSTALL doc/README doc/PatchAcceptancePolicy.txt +%doc doc/AUTHORS doc/COPYING doc/ChangeLog doc/Credits doc/README doc/PatchAcceptancePolicy.txt %dir %{_datadir}/libfwbuilder %{_datadir}/libfwbuilder/* %{_libdir}/*.so.* @@ -30,7 +28,8 @@ Summary: Firewall Builder API Libraries and Header Files Group: "Development/Libraries" Requires: %{name} = %{version}-%{release} -Provides: %name-devel = %version-%release +Requires: libxslt-devel +Requires: openssl-devel %description devel This package contains the libraries and header files that programmer would @@ -39,8 +38,8 @@ %files devel %defattr(-, root, root) %{_bindir}/libfwbuilder-config-2 -/usr/include/fwb-2.0/fwbuilder -/usr/include/fwb-2.0/fwcompiler +%{_includedir}/fwb-2.0/fwbuilder +%{_includedir}/fwb-2.0/fwcompiler %prep @@ -48,19 +47,21 @@ %build +[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh ./configure --enable-auto-docdir --libdir=%{_libdir} --prefix=%{_prefix} --with-templatedir=%{_datadir}/libfwbuilder --disable-static --enable-shared -make QTDIR=`cat qtdir` all +make all %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -make QTDIR=`cat qtdir` DDIR=$RPM_BUILD_ROOT install +[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh +rm -rf $RPM_BUILD_ROOT +make DDIR=$RPM_BUILD_ROOT install # prevent including twice the doc -rm -fr $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version} +rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version} %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig @@ -69,6 +70,9 @@ %changelog +* Sat Jan 22 2005 Warren Togami 2.0.5-2 +- spec cleanup + * Sat Jan 22 2005 Steve Grubb 2.0.5 - Created base spec file From wtogami at redhat.com Sun Jan 23 06:00:06 2005 From: wtogami at redhat.com (Warren Togami) Date: Sat, 22 Jan 2005 20:00:06 -1000 Subject: APPROVED: fwbuilder, libfwbuilder Message-ID: <41F33D66.8000908@redhat.com> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 fwbuilder libfwbuilder Pass my inspection after cleanup and are approved for adding to Fedora Extras. sgrubb at redhat.com will be responsible for these packages. PUBLISH APPROVAL by wtogami at redhat.com on Sat Jan 22th, 2005 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) iD8DBQFB8z0za93+jlSirPERAtBeAJ0emEFBydx5zg5TfjY2po/kGAC06wCeI1+/ oLz+veXEjssEU47vRyIiqU8= =9vCj -----END PGP SIGNATURE----- From fedora-extras-commits at redhat.com Sun Jan 23 13:59:39 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sun, 23 Jan 2005 08:59:39 -0500 Subject: rpms/librsync/devel librsync.spec,1.5,1.6 Message-ID: <200501231359.j0NDxdva007669@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/librsync/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv7663 Modified Files: librsync.spec Log Message: Fix build on x86_64. Index: librsync.spec =================================================================== RCS file: /cvs/extras/rpms/librsync/devel/librsync.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- librsync.spec 10 Dec 2004 22:03:05 -0000 1.5 +++ librsync.spec 23 Jan 2005 13:59:37 -0000 1.6 @@ -1,7 +1,7 @@ Summary: Rsync libraries Name: librsync Version: 0.9.7 -Release: 1 +Release: 2 Epoch: 0 License: LGPL Group: System Environment/Libraries @@ -9,6 +9,7 @@ URL: http://librsync.sf.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel, bzip2-devel, popt +Buildrequires: libtool %description librsync implements the "rsync" algorithm, which allows remote @@ -46,6 +47,7 @@ %setup -q %build +autoreconf -f %configure --enable-shared make %{?_smp_mflags} @@ -77,6 +79,9 @@ %exclude %{_libdir}/librsync.la %changelog +* Sun Jan 23 2005 Michael Schwendt - 0:0.9.7-2 +- Recreate autotools files with autoreconf to fix x86_64 build. + * Wed Nov 10 2004 Adrian Reber - 0:0.9.7-0.fdr.1 - updated to 0.9.7 (#2248) - changed source URL to be downloadable with wget From fedora-extras-commits at redhat.com Sun Jan 23 16:23:28 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:23:28 -0500 Subject: rpms/cvs2cl import.log,1.5,1.6 Message-ID: <200501231623.j0NGNSkk010284@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/cvs2cl In directory cvs.fedora.redhat.com:/tmp/cvs-serv10273 Modified Files: import.log Log Message: auto-import cvs2cl-2.58-0.fdr.1.rh80 on branch RHL-8 from cvs2cl-2.58-0.fdr.1.rh80.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 8 Nov 2004 04:12:29 -0000 1.5 +++ import.log 23 Jan 2005 16:23:26 -0000 1.6 @@ -2,3 +2,4 @@ cvs2cl-2_57-0_fdr_1_rh90:HEAD:cvs2cl-2.57-0.fdr.1.rh90.src.rpm:1099887088 cvs2cl-2_57-0_fdr_1_1:HEAD:cvs2cl-2.57-0.fdr.1.1.src.rpm:1099887094 cvs2cl-2_57-0_fdr_1_2:HEAD:cvs2cl-2.57-0.fdr.1.2.src.rpm:1099887149 +cvs2cl-2_58-0_fdr_1_rh80:RHL-8:cvs2cl-2.58-0.fdr.1.rh80.src.rpm:1106497375 From fedora-extras-commits at redhat.com Sun Jan 23 16:23:28 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:23:28 -0500 Subject: rpms/cvs2cl/RHL-8 cvs2cl.pl,1.1,1.2 cvs2cl.spec,1.1,1.2 Message-ID: <200501231623.j0NGNSxk010288@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/cvs2cl/RHL-8 In directory cvs.fedora.redhat.com:/tmp/cvs-serv10273/RHL-8 Modified Files: cvs2cl.pl cvs2cl.spec Log Message: auto-import cvs2cl-2.58-0.fdr.1.rh80 on branch RHL-8 from cvs2cl-2.58-0.fdr.1.rh80.src.rpm Index: cvs2cl.pl =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/RHL-8/cvs2cl.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cvs2cl.pl 8 Nov 2004 04:11:22 -0000 1.1 +++ cvs2cl.pl 23 Jan 2005 16:23:26 -0000 1.2 @@ -19,6 +19,7 @@ use File::Basename qw( fileparse ); use Getopt::Long qw( GetOptions ); use Text::Wrap qw( ); +use Time::Local qw( timegm ); use User::pwent qw( getpwnam ); # The Plan: @@ -956,7 +957,20 @@ # ------------------------------------- sub output_tagdate { - # NOT YET DONE + my $self = shift; + my ($fh, $time, $tag) = @_; + + my ($y, $m, $d, $H, $M, $S) = (gmtime($time))[5,4,3,2,1,0]; + + # Ideally, this would honor $UTC_Times and use +HH:MM syntax + my $isoDate = sprintf("%04d-%02d-%02dT%02d:%02d:%02dZ", + $y + 1900, $m + 1, $d, $H, $M, $S); + + print $fh "\n"; + print $fh "$isoDate\n"; + print $fh "$tag\n"; + print $fh "\n\n"; + return; } # ------------------------------------- @@ -1052,11 +1066,6 @@ my $follow_branches = $self->{follow_branches}; my $follow_only = $self->{follow_only}; -#print STDERR "IG: ", join(',', keys %{$self->{ignore_tags}}), "\n"; -#print STDERR "IX: ", join(',', @{$qunk->{tags}}), "\n" if defined $qunk->{tags}; -#print STDERR "IQ: ", join(',', keys %{$qunk->{branch_numbers}}), "\n" if defined $qunk->{branch_numbers}; -#use Data::Dumper; print STDERR Dumper $qunk; - for my $ignore_tag (keys %{$self->{ignore_tags}}) { return if defined $qunk->{tags} and grep $_ eq $ignore_tag, @{$qunk->{tags}}; @@ -1096,12 +1105,13 @@ ($branch_number . ".") ) { if ( $followsub ) { return 1; - } elsif (length($revision) == length($branch_number)+2 ) { +# } elsif ( length($revision) == length($branch_number)+2 ) { + } elsif ( substr($revision, length($branch_number)+1) =~ /^\d+$/ ) { return 1; } } elsif ( length($branch_number) > length($revision) and - $No_Ancestors ) { + ! $No_Ancestors ) { # Non-trivial case: check if rev is ancestral to branch # r_left still has the trailing "." @@ -1214,13 +1224,13 @@ # XML output includes everything else, we might as well make # it always include Day Of Week too, for consistency. my $authorhash = $changelog{$time}; - if ($Show_Tag_Dates) { + if ( $Show_Tag_Dates || $XML_Output ) { my %tags; while (my ($author,$mesghash) = each %$authorhash) { while (my ($msg,$qunk) = each %$mesghash) { - foreach my $qunkref2 (@$qunk) { + for my $qunkref2 (@$qunk) { if (defined ($qunkref2->tags)) { - foreach my $tag (@{$qunkref2->tags}) { + for my $tag (@{$qunkref2->tags}) { $tags{$tag} = 1; } } @@ -1925,22 +1935,38 @@ sub read_changelog { my ($self, $command) = @_; -# my $grand_poobah = CVS::Utils::ChangeLog::EntrySet->new; - + local (*READER, *WRITER); + my $pid; if (! $Input_From_Stdin) { - my $Log_Source_Command = join(' ', @$command); - &main::debug ("(run \"${Log_Source_Command}\")\n"); - open (LOG_SOURCE, "$Log_Source_Command |") - or die "unable to run \"${Log_Source_Command}\""; + pipe(READER, WRITER) + or die "Couldn't form pipe: $!\n"; + $pid = fork; + die "Couldn't fork: $!\n" + if ! defined $pid; + if ( ! $pid ) { # child + open STDOUT, '>&=' . fileno WRITER + or die "Couldn't dup stderr to ", fileno WRITER, "\n"; + # strangely, some perls give spurious warnings about STDIN being opened + # for output only these close calls precede the STDOUT reopen above. + # I think they must be reusing fd 1. + close READER; + close STDIN; + + exec @$command; + } + + close WRITER; + + &main::debug ("(run \"@$command\")\n"); } else { - open (LOG_SOURCE, "-") or die "unable to open stdin for reading"; + open READER, '-' or die "unable to open stdin for reading"; } - binmode LOG_SOURCE; + binmode READER; XX_Log_Source: - while () { + while () { chomp; s!\r$!!; @@ -1968,17 +1994,19 @@ # log message texts: $self->{rev_msg} .= $_ . "\n"; # Normally, just accumulate the message... } else { + my $noadd = 0; if ( ! $self->{rev_msg} or $self->{rev_msg} =~ /^\s*(\.\s*)?$/ or index($self->{rev_msg}, EMPTY_LOG_MESSAGE) > -1 ) { # ... until a msg separator is encountered: # Ensure the message contains something: - $self->clear_msg + $self->clear_msg, $noadd = 1 if $Prune_Empty_Msgs; $self->{rev_msg} = "[no log message]\n"; } - $self->add_file_entry; + $self->add_file_entry + unless $noadd; if ( $_ eq FILE_SEPARATOR ) { $self->clear_file; @@ -1988,9 +2016,15 @@ } } - close LOG_SOURCE - or die sprintf("Problem reading log input (exit/signal/core: %d/%d/%d)\n", - $? >> 8, $? & 127, $? & 128); + close READER + or die "Couldn't close pipe reader: $!\n"; + if ( defined $pid ) { + my $rv; + waitpid $pid, 0; + 0 == $? + or $!=1, die sprintf("Problem reading log input (pid/exit/signal/core: %d/%d/%d/%d)\n", + $pid, $? >> 8, $? & 127, $? & 128); + } return; } @@ -2127,9 +2161,8 @@ ($base, undef, undef) = fileparse($path); my $xpath = $Case_Insensitive ? lc($path) : $path; - if ( grep index($path, $_) > -1, @Ignore_Files ) { - return; - } + return + if grep $path =~ /$_/, @Ignore_Files; } $self->{filename} = $path; @@ -2399,7 +2432,7 @@ my $accumulation_date = maybe_grab_accumulation_date; if ($accumulation_date) { # Insert -d immediately after 'cvs log' - my $Log_Date_Command = "-d\'>${accumulation_date}\'"; + my $Log_Date_Command = "-d>${accumulation_date}"; my ($log_index) = grep $command->[$_] eq 'log', 0..$#$command; splice @$command, $log_index+1, 0, $Log_Date_Command; @@ -2456,6 +2489,7 @@ } # ------------------------------------- + sub parse_options { # Check this internally before setting the global variable. my $output_file; @@ -2605,7 +2639,7 @@ ) or die "options parsing failed\n"; - push @log_source_command, map "'$_'", @ARGV; + push @log_source_command, map "$_", @ARGV; ## Check for contradictions... @@ -2858,7 +2892,8 @@ =item B<-I> I, B<--ignore> I Ignore files whose names match I. This option may be used multiple -times. +times. The regexp is a perl regular expression. It is matched as is; you may +want to prefix with a ^ or suffix with a $ to anchor the match. =item B<-C>, B<--case-insensitive> @@ -3038,6 +3073,14 @@ Note that the rules for quoting under windows shells are different. +=item * + +To run in an automated environment such as CGI or PHP, suidperl may be needed +in order to execute as the correct user to enable /cvsroot read lock files to +be written for the 'cvs log' command. This is likely just a case of changing +the /usr/bin/perl command to /usr/bin/suidperl, and explicitly declaring the +PATH variable. + =back =head1 EXAMPLES @@ -3099,6 +3142,8 @@ =item Terry Kane +=item Pete Kempf + =item Akos Kiss =item Claus Klein @@ -3121,7 +3166,11 @@ =item Thomas Parmelan -=item Johanne Stezenbach +=item Jordan Russell + +=item Jacek Sliwerski + +=item Johannes Stezenbach =item Joseph Walton Index: cvs2cl.spec =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/RHL-8/cvs2cl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cvs2cl.spec 8 Nov 2004 04:11:22 -0000 1.1 +++ cvs2cl.spec 23 Jan 2005 16:23:26 -0000 1.2 @@ -1,5 +1,5 @@ Name: cvs2cl -Version: 2.57 +Version: 2.58 Release: 0.fdr.1.rh80 Epoch: 0 Summary: Utility which generates ChangeLogs from CVS working copies @@ -67,6 +67,9 @@ %changelog +* Sun Jan 16 2005 Marius L. J??hndal - 0:2.58-0.fdr.1 +- Updated to 2.58. + * Sat Jul 10 2004 Marius L. J??hndal - 0:2.57-0.fdr.1 - Updated to 2.57. - Moved XML and XSLT files from _datadir/sgml to _datadir/xml. From fedora-extras-commits at redhat.com Sun Jan 23 16:24:59 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:24:59 -0500 Subject: rpms/cvs2cl import.log,1.6,1.7 Message-ID: <200501231624.j0NGOxAi010395@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/cvs2cl In directory cvs.fedora.redhat.com:/tmp/cvs-serv10385 Modified Files: import.log Log Message: auto-import cvs2cl-2.58-0.fdr.1.rh90 on branch RHL-9 from cvs2cl-2.58-0.fdr.1.rh90.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 23 Jan 2005 16:23:26 -0000 1.6 +++ import.log 23 Jan 2005 16:24:57 -0000 1.7 @@ -3,3 +3,4 @@ cvs2cl-2_57-0_fdr_1_1:HEAD:cvs2cl-2.57-0.fdr.1.1.src.rpm:1099887094 cvs2cl-2_57-0_fdr_1_2:HEAD:cvs2cl-2.57-0.fdr.1.2.src.rpm:1099887149 cvs2cl-2_58-0_fdr_1_rh80:RHL-8:cvs2cl-2.58-0.fdr.1.rh80.src.rpm:1106497375 +cvs2cl-2_58-0_fdr_1_rh90:RHL-9:cvs2cl-2.58-0.fdr.1.rh90.src.rpm:1106497476 From fedora-extras-commits at redhat.com Sun Jan 23 16:24:59 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:24:59 -0500 Subject: rpms/cvs2cl/RHL-9 cvs2cl.pl,1.1,1.2 cvs2cl.spec,1.2,1.3 Message-ID: <200501231624.j0NGOxtv010398@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/cvs2cl/RHL-9 In directory cvs.fedora.redhat.com:/tmp/cvs-serv10385/RHL-9 Modified Files: cvs2cl.pl cvs2cl.spec Log Message: auto-import cvs2cl-2.58-0.fdr.1.rh90 on branch RHL-9 from cvs2cl-2.58-0.fdr.1.rh90.src.rpm Index: cvs2cl.pl =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/RHL-9/cvs2cl.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cvs2cl.pl 8 Nov 2004 04:11:22 -0000 1.1 +++ cvs2cl.pl 23 Jan 2005 16:24:57 -0000 1.2 @@ -19,6 +19,7 @@ use File::Basename qw( fileparse ); use Getopt::Long qw( GetOptions ); use Text::Wrap qw( ); +use Time::Local qw( timegm ); use User::pwent qw( getpwnam ); # The Plan: @@ -956,7 +957,20 @@ # ------------------------------------- sub output_tagdate { - # NOT YET DONE + my $self = shift; + my ($fh, $time, $tag) = @_; + + my ($y, $m, $d, $H, $M, $S) = (gmtime($time))[5,4,3,2,1,0]; + + # Ideally, this would honor $UTC_Times and use +HH:MM syntax + my $isoDate = sprintf("%04d-%02d-%02dT%02d:%02d:%02dZ", + $y + 1900, $m + 1, $d, $H, $M, $S); + + print $fh "\n"; + print $fh "$isoDate\n"; + print $fh "$tag\n"; + print $fh "\n\n"; + return; } # ------------------------------------- @@ -1052,11 +1066,6 @@ my $follow_branches = $self->{follow_branches}; my $follow_only = $self->{follow_only}; -#print STDERR "IG: ", join(',', keys %{$self->{ignore_tags}}), "\n"; -#print STDERR "IX: ", join(',', @{$qunk->{tags}}), "\n" if defined $qunk->{tags}; -#print STDERR "IQ: ", join(',', keys %{$qunk->{branch_numbers}}), "\n" if defined $qunk->{branch_numbers}; -#use Data::Dumper; print STDERR Dumper $qunk; - for my $ignore_tag (keys %{$self->{ignore_tags}}) { return if defined $qunk->{tags} and grep $_ eq $ignore_tag, @{$qunk->{tags}}; @@ -1096,12 +1105,13 @@ ($branch_number . ".") ) { if ( $followsub ) { return 1; - } elsif (length($revision) == length($branch_number)+2 ) { +# } elsif ( length($revision) == length($branch_number)+2 ) { + } elsif ( substr($revision, length($branch_number)+1) =~ /^\d+$/ ) { return 1; } } elsif ( length($branch_number) > length($revision) and - $No_Ancestors ) { + ! $No_Ancestors ) { # Non-trivial case: check if rev is ancestral to branch # r_left still has the trailing "." @@ -1214,13 +1224,13 @@ # XML output includes everything else, we might as well make # it always include Day Of Week too, for consistency. my $authorhash = $changelog{$time}; - if ($Show_Tag_Dates) { + if ( $Show_Tag_Dates || $XML_Output ) { my %tags; while (my ($author,$mesghash) = each %$authorhash) { while (my ($msg,$qunk) = each %$mesghash) { - foreach my $qunkref2 (@$qunk) { + for my $qunkref2 (@$qunk) { if (defined ($qunkref2->tags)) { - foreach my $tag (@{$qunkref2->tags}) { + for my $tag (@{$qunkref2->tags}) { $tags{$tag} = 1; } } @@ -1925,22 +1935,38 @@ sub read_changelog { my ($self, $command) = @_; -# my $grand_poobah = CVS::Utils::ChangeLog::EntrySet->new; - + local (*READER, *WRITER); + my $pid; if (! $Input_From_Stdin) { - my $Log_Source_Command = join(' ', @$command); - &main::debug ("(run \"${Log_Source_Command}\")\n"); - open (LOG_SOURCE, "$Log_Source_Command |") - or die "unable to run \"${Log_Source_Command}\""; + pipe(READER, WRITER) + or die "Couldn't form pipe: $!\n"; + $pid = fork; + die "Couldn't fork: $!\n" + if ! defined $pid; + if ( ! $pid ) { # child + open STDOUT, '>&=' . fileno WRITER + or die "Couldn't dup stderr to ", fileno WRITER, "\n"; + # strangely, some perls give spurious warnings about STDIN being opened + # for output only these close calls precede the STDOUT reopen above. + # I think they must be reusing fd 1. + close READER; + close STDIN; + + exec @$command; + } + + close WRITER; + + &main::debug ("(run \"@$command\")\n"); } else { - open (LOG_SOURCE, "-") or die "unable to open stdin for reading"; + open READER, '-' or die "unable to open stdin for reading"; } - binmode LOG_SOURCE; + binmode READER; XX_Log_Source: - while () { + while () { chomp; s!\r$!!; @@ -1968,17 +1994,19 @@ # log message texts: $self->{rev_msg} .= $_ . "\n"; # Normally, just accumulate the message... } else { + my $noadd = 0; if ( ! $self->{rev_msg} or $self->{rev_msg} =~ /^\s*(\.\s*)?$/ or index($self->{rev_msg}, EMPTY_LOG_MESSAGE) > -1 ) { # ... until a msg separator is encountered: # Ensure the message contains something: - $self->clear_msg + $self->clear_msg, $noadd = 1 if $Prune_Empty_Msgs; $self->{rev_msg} = "[no log message]\n"; } - $self->add_file_entry; + $self->add_file_entry + unless $noadd; if ( $_ eq FILE_SEPARATOR ) { $self->clear_file; @@ -1988,9 +2016,15 @@ } } - close LOG_SOURCE - or die sprintf("Problem reading log input (exit/signal/core: %d/%d/%d)\n", - $? >> 8, $? & 127, $? & 128); + close READER + or die "Couldn't close pipe reader: $!\n"; + if ( defined $pid ) { + my $rv; + waitpid $pid, 0; + 0 == $? + or $!=1, die sprintf("Problem reading log input (pid/exit/signal/core: %d/%d/%d/%d)\n", + $pid, $? >> 8, $? & 127, $? & 128); + } return; } @@ -2127,9 +2161,8 @@ ($base, undef, undef) = fileparse($path); my $xpath = $Case_Insensitive ? lc($path) : $path; - if ( grep index($path, $_) > -1, @Ignore_Files ) { - return; - } + return + if grep $path =~ /$_/, @Ignore_Files; } $self->{filename} = $path; @@ -2399,7 +2432,7 @@ my $accumulation_date = maybe_grab_accumulation_date; if ($accumulation_date) { # Insert -d immediately after 'cvs log' - my $Log_Date_Command = "-d\'>${accumulation_date}\'"; + my $Log_Date_Command = "-d>${accumulation_date}"; my ($log_index) = grep $command->[$_] eq 'log', 0..$#$command; splice @$command, $log_index+1, 0, $Log_Date_Command; @@ -2456,6 +2489,7 @@ } # ------------------------------------- + sub parse_options { # Check this internally before setting the global variable. my $output_file; @@ -2605,7 +2639,7 @@ ) or die "options parsing failed\n"; - push @log_source_command, map "'$_'", @ARGV; + push @log_source_command, map "$_", @ARGV; ## Check for contradictions... @@ -2858,7 +2892,8 @@ =item B<-I> I, B<--ignore> I Ignore files whose names match I. This option may be used multiple -times. +times. The regexp is a perl regular expression. It is matched as is; you may +want to prefix with a ^ or suffix with a $ to anchor the match. =item B<-C>, B<--case-insensitive> @@ -3038,6 +3073,14 @@ Note that the rules for quoting under windows shells are different. +=item * + +To run in an automated environment such as CGI or PHP, suidperl may be needed +in order to execute as the correct user to enable /cvsroot read lock files to +be written for the 'cvs log' command. This is likely just a case of changing +the /usr/bin/perl command to /usr/bin/suidperl, and explicitly declaring the +PATH variable. + =back =head1 EXAMPLES @@ -3099,6 +3142,8 @@ =item Terry Kane +=item Pete Kempf + =item Akos Kiss =item Claus Klein @@ -3121,7 +3166,11 @@ =item Thomas Parmelan -=item Johanne Stezenbach +=item Jordan Russell + +=item Jacek Sliwerski + +=item Johannes Stezenbach =item Joseph Walton Index: cvs2cl.spec =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/RHL-9/cvs2cl.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cvs2cl.spec 8 Nov 2004 04:11:28 -0000 1.2 +++ cvs2cl.spec 23 Jan 2005 16:24:57 -0000 1.3 @@ -1,5 +1,5 @@ Name: cvs2cl -Version: 2.57 +Version: 2.58 Release: 0.fdr.1.rh90 Epoch: 0 Summary: Utility which generates ChangeLogs from CVS working copies @@ -67,6 +67,9 @@ %changelog +* Sun Jan 16 2005 Marius L. J??hndal - 0:2.58-0.fdr.1 +- Updated to 2.58. + * Sat Jul 10 2004 Marius L. J??hndal - 0:2.57-0.fdr.1 - Updated to 2.57. - Moved XML and XSLT files from _datadir/sgml to _datadir/xml. From fedora-extras-commits at redhat.com Sun Jan 23 16:25:58 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:25:58 -0500 Subject: rpms/cvs2cl import.log,1.7,1.8 Message-ID: <200501231625.j0NGPwRh010507@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/cvs2cl In directory cvs.fedora.redhat.com:/tmp/cvs-serv10498 Modified Files: import.log Log Message: auto-import cvs2cl-2.58-0.fdr.1.1 on branch FC-1 from cvs2cl-2.58-0.fdr.1.1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 23 Jan 2005 16:24:57 -0000 1.7 +++ import.log 23 Jan 2005 16:25:56 -0000 1.8 @@ -4,3 +4,4 @@ cvs2cl-2_57-0_fdr_1_2:HEAD:cvs2cl-2.57-0.fdr.1.2.src.rpm:1099887149 cvs2cl-2_58-0_fdr_1_rh80:RHL-8:cvs2cl-2.58-0.fdr.1.rh80.src.rpm:1106497375 cvs2cl-2_58-0_fdr_1_rh90:RHL-9:cvs2cl-2.58-0.fdr.1.rh90.src.rpm:1106497476 +cvs2cl-2_58-0_fdr_1_1:FC-1:cvs2cl-2.58-0.fdr.1.1.src.rpm:1106497541 From fedora-extras-commits at redhat.com Sun Jan 23 16:25:58 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:25:58 -0500 Subject: rpms/cvs2cl/FC-1 cvs2cl.pl,1.1,1.2 cvs2cl.spec,1.3,1.4 Message-ID: <200501231625.j0NGPw91010511@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/cvs2cl/FC-1 In directory cvs.fedora.redhat.com:/tmp/cvs-serv10498/FC-1 Modified Files: cvs2cl.pl cvs2cl.spec Log Message: auto-import cvs2cl-2.58-0.fdr.1.1 on branch FC-1 from cvs2cl-2.58-0.fdr.1.1.src.rpm Index: cvs2cl.pl =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/FC-1/cvs2cl.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cvs2cl.pl 8 Nov 2004 04:11:22 -0000 1.1 +++ cvs2cl.pl 23 Jan 2005 16:25:56 -0000 1.2 @@ -19,6 +19,7 @@ use File::Basename qw( fileparse ); use Getopt::Long qw( GetOptions ); use Text::Wrap qw( ); +use Time::Local qw( timegm ); use User::pwent qw( getpwnam ); # The Plan: @@ -956,7 +957,20 @@ # ------------------------------------- sub output_tagdate { - # NOT YET DONE + my $self = shift; + my ($fh, $time, $tag) = @_; + + my ($y, $m, $d, $H, $M, $S) = (gmtime($time))[5,4,3,2,1,0]; + + # Ideally, this would honor $UTC_Times and use +HH:MM syntax + my $isoDate = sprintf("%04d-%02d-%02dT%02d:%02d:%02dZ", + $y + 1900, $m + 1, $d, $H, $M, $S); + + print $fh "\n"; + print $fh "$isoDate\n"; + print $fh "$tag\n"; + print $fh "\n\n"; + return; } # ------------------------------------- @@ -1052,11 +1066,6 @@ my $follow_branches = $self->{follow_branches}; my $follow_only = $self->{follow_only}; -#print STDERR "IG: ", join(',', keys %{$self->{ignore_tags}}), "\n"; -#print STDERR "IX: ", join(',', @{$qunk->{tags}}), "\n" if defined $qunk->{tags}; -#print STDERR "IQ: ", join(',', keys %{$qunk->{branch_numbers}}), "\n" if defined $qunk->{branch_numbers}; -#use Data::Dumper; print STDERR Dumper $qunk; - for my $ignore_tag (keys %{$self->{ignore_tags}}) { return if defined $qunk->{tags} and grep $_ eq $ignore_tag, @{$qunk->{tags}}; @@ -1096,12 +1105,13 @@ ($branch_number . ".") ) { if ( $followsub ) { return 1; - } elsif (length($revision) == length($branch_number)+2 ) { +# } elsif ( length($revision) == length($branch_number)+2 ) { + } elsif ( substr($revision, length($branch_number)+1) =~ /^\d+$/ ) { return 1; } } elsif ( length($branch_number) > length($revision) and - $No_Ancestors ) { + ! $No_Ancestors ) { # Non-trivial case: check if rev is ancestral to branch # r_left still has the trailing "." @@ -1214,13 +1224,13 @@ # XML output includes everything else, we might as well make # it always include Day Of Week too, for consistency. my $authorhash = $changelog{$time}; - if ($Show_Tag_Dates) { + if ( $Show_Tag_Dates || $XML_Output ) { my %tags; while (my ($author,$mesghash) = each %$authorhash) { while (my ($msg,$qunk) = each %$mesghash) { - foreach my $qunkref2 (@$qunk) { + for my $qunkref2 (@$qunk) { if (defined ($qunkref2->tags)) { - foreach my $tag (@{$qunkref2->tags}) { + for my $tag (@{$qunkref2->tags}) { $tags{$tag} = 1; } } @@ -1925,22 +1935,38 @@ sub read_changelog { my ($self, $command) = @_; -# my $grand_poobah = CVS::Utils::ChangeLog::EntrySet->new; - + local (*READER, *WRITER); + my $pid; if (! $Input_From_Stdin) { - my $Log_Source_Command = join(' ', @$command); - &main::debug ("(run \"${Log_Source_Command}\")\n"); - open (LOG_SOURCE, "$Log_Source_Command |") - or die "unable to run \"${Log_Source_Command}\""; + pipe(READER, WRITER) + or die "Couldn't form pipe: $!\n"; + $pid = fork; + die "Couldn't fork: $!\n" + if ! defined $pid; + if ( ! $pid ) { # child + open STDOUT, '>&=' . fileno WRITER + or die "Couldn't dup stderr to ", fileno WRITER, "\n"; + # strangely, some perls give spurious warnings about STDIN being opened + # for output only these close calls precede the STDOUT reopen above. + # I think they must be reusing fd 1. + close READER; + close STDIN; + + exec @$command; + } + + close WRITER; + + &main::debug ("(run \"@$command\")\n"); } else { - open (LOG_SOURCE, "-") or die "unable to open stdin for reading"; + open READER, '-' or die "unable to open stdin for reading"; } - binmode LOG_SOURCE; + binmode READER; XX_Log_Source: - while () { + while () { chomp; s!\r$!!; @@ -1968,17 +1994,19 @@ # log message texts: $self->{rev_msg} .= $_ . "\n"; # Normally, just accumulate the message... } else { + my $noadd = 0; if ( ! $self->{rev_msg} or $self->{rev_msg} =~ /^\s*(\.\s*)?$/ or index($self->{rev_msg}, EMPTY_LOG_MESSAGE) > -1 ) { # ... until a msg separator is encountered: # Ensure the message contains something: - $self->clear_msg + $self->clear_msg, $noadd = 1 if $Prune_Empty_Msgs; $self->{rev_msg} = "[no log message]\n"; } - $self->add_file_entry; + $self->add_file_entry + unless $noadd; if ( $_ eq FILE_SEPARATOR ) { $self->clear_file; @@ -1988,9 +2016,15 @@ } } - close LOG_SOURCE - or die sprintf("Problem reading log input (exit/signal/core: %d/%d/%d)\n", - $? >> 8, $? & 127, $? & 128); + close READER + or die "Couldn't close pipe reader: $!\n"; + if ( defined $pid ) { + my $rv; + waitpid $pid, 0; + 0 == $? + or $!=1, die sprintf("Problem reading log input (pid/exit/signal/core: %d/%d/%d/%d)\n", + $pid, $? >> 8, $? & 127, $? & 128); + } return; } @@ -2127,9 +2161,8 @@ ($base, undef, undef) = fileparse($path); my $xpath = $Case_Insensitive ? lc($path) : $path; - if ( grep index($path, $_) > -1, @Ignore_Files ) { - return; - } + return + if grep $path =~ /$_/, @Ignore_Files; } $self->{filename} = $path; @@ -2399,7 +2432,7 @@ my $accumulation_date = maybe_grab_accumulation_date; if ($accumulation_date) { # Insert -d immediately after 'cvs log' - my $Log_Date_Command = "-d\'>${accumulation_date}\'"; + my $Log_Date_Command = "-d>${accumulation_date}"; my ($log_index) = grep $command->[$_] eq 'log', 0..$#$command; splice @$command, $log_index+1, 0, $Log_Date_Command; @@ -2456,6 +2489,7 @@ } # ------------------------------------- + sub parse_options { # Check this internally before setting the global variable. my $output_file; @@ -2605,7 +2639,7 @@ ) or die "options parsing failed\n"; - push @log_source_command, map "'$_'", @ARGV; + push @log_source_command, map "$_", @ARGV; ## Check for contradictions... @@ -2858,7 +2892,8 @@ =item B<-I> I, B<--ignore> I Ignore files whose names match I. This option may be used multiple -times. +times. The regexp is a perl regular expression. It is matched as is; you may +want to prefix with a ^ or suffix with a $ to anchor the match. =item B<-C>, B<--case-insensitive> @@ -3038,6 +3073,14 @@ Note that the rules for quoting under windows shells are different. +=item * + +To run in an automated environment such as CGI or PHP, suidperl may be needed +in order to execute as the correct user to enable /cvsroot read lock files to +be written for the 'cvs log' command. This is likely just a case of changing +the /usr/bin/perl command to /usr/bin/suidperl, and explicitly declaring the +PATH variable. + =back =head1 EXAMPLES @@ -3099,6 +3142,8 @@ =item Terry Kane +=item Pete Kempf + =item Akos Kiss =item Claus Klein @@ -3121,7 +3166,11 @@ =item Thomas Parmelan -=item Johanne Stezenbach +=item Jordan Russell + +=item Jacek Sliwerski + +=item Johannes Stezenbach =item Joseph Walton Index: cvs2cl.spec =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/FC-1/cvs2cl.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cvs2cl.spec 8 Nov 2004 04:11:34 -0000 1.3 +++ cvs2cl.spec 23 Jan 2005 16:25:56 -0000 1.4 @@ -1,5 +1,5 @@ Name: cvs2cl -Version: 2.57 +Version: 2.58 Release: 0.fdr.1.1 Epoch: 0 Summary: Utility which generates ChangeLogs from CVS working copies @@ -67,6 +67,9 @@ %changelog +* Sun Jan 16 2005 Marius L. J??hndal - 0:2.58-0.fdr.1 +- Updated to 2.58. + * Sat Jul 10 2004 Marius L. J??hndal - 0:2.57-0.fdr.1 - Updated to 2.57. - Moved XML and XSLT files from _datadir/sgml to _datadir/xml. From fedora-extras-commits at redhat.com Sun Jan 23 16:27:22 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:27:22 -0500 Subject: rpms/cvs2cl import.log,1.8,1.9 Message-ID: <200501231627.j0NGRMEV010635@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/cvs2cl In directory cvs.fedora.redhat.com:/tmp/cvs-serv10626 Modified Files: import.log Log Message: auto-import cvs2cl-2.58-0.fdr.1.2 on branch FC-2 from cvs2cl-2.58-0.fdr.1.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 23 Jan 2005 16:25:56 -0000 1.8 +++ import.log 23 Jan 2005 16:27:20 -0000 1.9 @@ -5,3 +5,4 @@ cvs2cl-2_58-0_fdr_1_rh80:RHL-8:cvs2cl-2.58-0.fdr.1.rh80.src.rpm:1106497375 cvs2cl-2_58-0_fdr_1_rh90:RHL-9:cvs2cl-2.58-0.fdr.1.rh90.src.rpm:1106497476 cvs2cl-2_58-0_fdr_1_1:FC-1:cvs2cl-2.58-0.fdr.1.1.src.rpm:1106497541 +cvs2cl-2_58-0_fdr_1_2:FC-2:cvs2cl-2.58-0.fdr.1.2.src.rpm:1106497622 From fedora-extras-commits at redhat.com Sun Jan 23 16:27:22 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:27:22 -0500 Subject: rpms/cvs2cl/FC-2 cvs2cl.pl,1.1,1.2 cvs2cl.spec,1.4,1.5 Message-ID: <200501231627.j0NGRMsb010639@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/cvs2cl/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv10626/FC-2 Modified Files: cvs2cl.pl cvs2cl.spec Log Message: auto-import cvs2cl-2.58-0.fdr.1.2 on branch FC-2 from cvs2cl-2.58-0.fdr.1.2.src.rpm Index: cvs2cl.pl =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/FC-2/cvs2cl.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cvs2cl.pl 8 Nov 2004 04:11:22 -0000 1.1 +++ cvs2cl.pl 23 Jan 2005 16:27:20 -0000 1.2 @@ -19,6 +19,7 @@ use File::Basename qw( fileparse ); use Getopt::Long qw( GetOptions ); use Text::Wrap qw( ); +use Time::Local qw( timegm ); use User::pwent qw( getpwnam ); # The Plan: @@ -956,7 +957,20 @@ # ------------------------------------- sub output_tagdate { - # NOT YET DONE + my $self = shift; + my ($fh, $time, $tag) = @_; + + my ($y, $m, $d, $H, $M, $S) = (gmtime($time))[5,4,3,2,1,0]; + + # Ideally, this would honor $UTC_Times and use +HH:MM syntax + my $isoDate = sprintf("%04d-%02d-%02dT%02d:%02d:%02dZ", + $y + 1900, $m + 1, $d, $H, $M, $S); + + print $fh "\n"; + print $fh "$isoDate\n"; + print $fh "$tag\n"; + print $fh "\n\n"; + return; } # ------------------------------------- @@ -1052,11 +1066,6 @@ my $follow_branches = $self->{follow_branches}; my $follow_only = $self->{follow_only}; -#print STDERR "IG: ", join(',', keys %{$self->{ignore_tags}}), "\n"; -#print STDERR "IX: ", join(',', @{$qunk->{tags}}), "\n" if defined $qunk->{tags}; -#print STDERR "IQ: ", join(',', keys %{$qunk->{branch_numbers}}), "\n" if defined $qunk->{branch_numbers}; -#use Data::Dumper; print STDERR Dumper $qunk; - for my $ignore_tag (keys %{$self->{ignore_tags}}) { return if defined $qunk->{tags} and grep $_ eq $ignore_tag, @{$qunk->{tags}}; @@ -1096,12 +1105,13 @@ ($branch_number . ".") ) { if ( $followsub ) { return 1; - } elsif (length($revision) == length($branch_number)+2 ) { +# } elsif ( length($revision) == length($branch_number)+2 ) { + } elsif ( substr($revision, length($branch_number)+1) =~ /^\d+$/ ) { return 1; } } elsif ( length($branch_number) > length($revision) and - $No_Ancestors ) { + ! $No_Ancestors ) { # Non-trivial case: check if rev is ancestral to branch # r_left still has the trailing "." @@ -1214,13 +1224,13 @@ # XML output includes everything else, we might as well make # it always include Day Of Week too, for consistency. my $authorhash = $changelog{$time}; - if ($Show_Tag_Dates) { + if ( $Show_Tag_Dates || $XML_Output ) { my %tags; while (my ($author,$mesghash) = each %$authorhash) { while (my ($msg,$qunk) = each %$mesghash) { - foreach my $qunkref2 (@$qunk) { + for my $qunkref2 (@$qunk) { if (defined ($qunkref2->tags)) { - foreach my $tag (@{$qunkref2->tags}) { + for my $tag (@{$qunkref2->tags}) { $tags{$tag} = 1; } } @@ -1925,22 +1935,38 @@ sub read_changelog { my ($self, $command) = @_; -# my $grand_poobah = CVS::Utils::ChangeLog::EntrySet->new; - + local (*READER, *WRITER); + my $pid; if (! $Input_From_Stdin) { - my $Log_Source_Command = join(' ', @$command); - &main::debug ("(run \"${Log_Source_Command}\")\n"); - open (LOG_SOURCE, "$Log_Source_Command |") - or die "unable to run \"${Log_Source_Command}\""; + pipe(READER, WRITER) + or die "Couldn't form pipe: $!\n"; + $pid = fork; + die "Couldn't fork: $!\n" + if ! defined $pid; + if ( ! $pid ) { # child + open STDOUT, '>&=' . fileno WRITER + or die "Couldn't dup stderr to ", fileno WRITER, "\n"; + # strangely, some perls give spurious warnings about STDIN being opened + # for output only these close calls precede the STDOUT reopen above. + # I think they must be reusing fd 1. + close READER; + close STDIN; + + exec @$command; + } + + close WRITER; + + &main::debug ("(run \"@$command\")\n"); } else { - open (LOG_SOURCE, "-") or die "unable to open stdin for reading"; + open READER, '-' or die "unable to open stdin for reading"; } - binmode LOG_SOURCE; + binmode READER; XX_Log_Source: - while () { + while () { chomp; s!\r$!!; @@ -1968,17 +1994,19 @@ # log message texts: $self->{rev_msg} .= $_ . "\n"; # Normally, just accumulate the message... } else { + my $noadd = 0; if ( ! $self->{rev_msg} or $self->{rev_msg} =~ /^\s*(\.\s*)?$/ or index($self->{rev_msg}, EMPTY_LOG_MESSAGE) > -1 ) { # ... until a msg separator is encountered: # Ensure the message contains something: - $self->clear_msg + $self->clear_msg, $noadd = 1 if $Prune_Empty_Msgs; $self->{rev_msg} = "[no log message]\n"; } - $self->add_file_entry; + $self->add_file_entry + unless $noadd; if ( $_ eq FILE_SEPARATOR ) { $self->clear_file; @@ -1988,9 +2016,15 @@ } } - close LOG_SOURCE - or die sprintf("Problem reading log input (exit/signal/core: %d/%d/%d)\n", - $? >> 8, $? & 127, $? & 128); + close READER + or die "Couldn't close pipe reader: $!\n"; + if ( defined $pid ) { + my $rv; + waitpid $pid, 0; + 0 == $? + or $!=1, die sprintf("Problem reading log input (pid/exit/signal/core: %d/%d/%d/%d)\n", + $pid, $? >> 8, $? & 127, $? & 128); + } return; } @@ -2127,9 +2161,8 @@ ($base, undef, undef) = fileparse($path); my $xpath = $Case_Insensitive ? lc($path) : $path; - if ( grep index($path, $_) > -1, @Ignore_Files ) { - return; - } + return + if grep $path =~ /$_/, @Ignore_Files; } $self->{filename} = $path; @@ -2399,7 +2432,7 @@ my $accumulation_date = maybe_grab_accumulation_date; if ($accumulation_date) { # Insert -d immediately after 'cvs log' - my $Log_Date_Command = "-d\'>${accumulation_date}\'"; + my $Log_Date_Command = "-d>${accumulation_date}"; my ($log_index) = grep $command->[$_] eq 'log', 0..$#$command; splice @$command, $log_index+1, 0, $Log_Date_Command; @@ -2456,6 +2489,7 @@ } # ------------------------------------- + sub parse_options { # Check this internally before setting the global variable. my $output_file; @@ -2605,7 +2639,7 @@ ) or die "options parsing failed\n"; - push @log_source_command, map "'$_'", @ARGV; + push @log_source_command, map "$_", @ARGV; ## Check for contradictions... @@ -2858,7 +2892,8 @@ =item B<-I> I, B<--ignore> I Ignore files whose names match I. This option may be used multiple -times. +times. The regexp is a perl regular expression. It is matched as is; you may +want to prefix with a ^ or suffix with a $ to anchor the match. =item B<-C>, B<--case-insensitive> @@ -3038,6 +3073,14 @@ Note that the rules for quoting under windows shells are different. +=item * + +To run in an automated environment such as CGI or PHP, suidperl may be needed +in order to execute as the correct user to enable /cvsroot read lock files to +be written for the 'cvs log' command. This is likely just a case of changing +the /usr/bin/perl command to /usr/bin/suidperl, and explicitly declaring the +PATH variable. + =back =head1 EXAMPLES @@ -3099,6 +3142,8 @@ =item Terry Kane +=item Pete Kempf + =item Akos Kiss =item Claus Klein @@ -3121,7 +3166,11 @@ =item Thomas Parmelan -=item Johanne Stezenbach +=item Jordan Russell + +=item Jacek Sliwerski + +=item Johannes Stezenbach =item Joseph Walton Index: cvs2cl.spec =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/FC-2/cvs2cl.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cvs2cl.spec 8 Nov 2004 04:12:29 -0000 1.4 +++ cvs2cl.spec 23 Jan 2005 16:27:20 -0000 1.5 @@ -1,5 +1,5 @@ Name: cvs2cl -Version: 2.57 +Version: 2.58 Release: 0.fdr.1.2 Epoch: 0 Summary: Utility which generates ChangeLogs from CVS working copies @@ -67,6 +67,9 @@ %changelog +* Sun Jan 16 2005 Marius L. J??hndal - 0:2.58-0.fdr.1 +- Updated to 2.58. + * Sat Jul 10 2004 Marius L. J??hndal - 0:2.57-0.fdr.1 - Updated to 2.57. - Moved XML and XSLT files from _datadir/sgml to _datadir/xml. From fedora-extras-commits at redhat.com Sun Jan 23 16:27:45 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:27:45 -0500 Subject: rpms/graphviz/devel .cvsignore, 1.3, 1.4 graphviz.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200501231627.j0NGRjCO010723@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/graphviz/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv10717 Modified Files: .cvsignore graphviz.spec sources Log Message: Update to 2.2, thanks to John Ellison (#143122). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/graphviz/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:31:13 -0000 1.3 +++ .cvsignore 23 Jan 2005 16:27:43 -0000 1.4 @@ -1 +1 @@ -graphviz-1.12.tar.gz +graphviz-2.2.tar.gz Index: graphviz.spec =================================================================== RCS file: /cvs/extras/rpms/graphviz/devel/graphviz.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- graphviz.spec 10 Dec 2004 22:03:03 -0000 1.5 +++ graphviz.spec 23 Jan 2005 16:27:43 -0000 1.6 @@ -1,32 +1,56 @@ -# Note: graphviz requires gd with gif support, hence use internal one for now. +# Note: graphviz requires gd with gif support (and other fixes), hence use +# internal one for now. Summary: Graph Visualization Tools Name: graphviz -Version: 1.12 -Release: 2 +Version: 2.2 +Release: 3 Epoch: 0 Group: Applications/Multimedia -License: AT&T open source (see COPYING) +License: CPL URL: http://www.graphviz.org/ -Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-1.12.tar.gz +Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.2.tar.gz BuildRoot: %{_tmppath}/%{name}-root BuildRequires: zlib-devel libpng-devel libjpeg-devel XFree86-devel expat-devel -BuildRequires: bison m4 flex tk tcl >= 0:8.3 +BuildRequires: /bin/ksh bison m4 flex tk tcl >= 0:8.3 BuildRequires: /usr/include/tcl.h /usr/include/tk.h +%package tcl +Group: Applications/Multimedia +Summary: Tcl extension tools for %{name} +Requires: %{name} = %{epoch}:%{version}-%{release} tcl >= 0:8.3 tk + %package devel Summary: Development package for %{name} Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release} pkgconfig + +%package doc +Group: Documentation +Summary: PDF and HTML documents for %{name} + +%package graphs +Group: Applications/Multimedia +Summary: Demo graphs for %{name} + %description A collection of tools and tcl packages for the manipulation and layout of graphs (as in nodes and edges, not as in barcharts). +%description tcl +Various tcl packages (extensions) for the %{name} tools. + %description devel A collection of tools and tcl packages for the manipulation and layout of graphs (as in nodes and edges, not as in barcharts). -This package contains development files for %{name} +This package contains development files for %{name}. + +%description doc +Provides some additional PDF and HTML documentation for %{name}. + +%description graphs +Some demo graphs for %{name}. %prep @@ -36,17 +60,32 @@ %build # XXX ix86 only used to have -ffast-math, let's use everywhere %{expand: %%define optflags %{optflags} -ffast-math} -%configure --with-x -make docdir=%{_docdir}/%{name} %{?_smp_mflags} +# %%configure is broken in RH7.3 rpmbuild +# need unreleased changes to gd, so use --with-mylibgd for now. +CFLAGS="$RPM_OPT_FLAGS" \ +./configure \ + --prefix=%{_prefix} \ + --bindir=%{_bindir} \ + --libdir=%{_libdir} \ + --includedir=%{_includedir} \ + --datadir=%{_datadir} \ + --mandir=%{_mandir} \ + --with-x \ + --with-mylibgd \ + --disable-dependency-tracking +make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT __doc make \ DESTDIR=$RPM_BUILD_ROOT \ - docdir=$RPM_BUILD_ROOT%{_docdir}/%{name} \ + pkgconfigdir=%{_libdir}/pkgconfig \ transform='s,x,x,' \ install +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 %clean @@ -54,26 +93,77 @@ %files -%defattr(-,root,root) -%doc AUTHORS COPYING MINTERMS.txt NEWS README -%doc doc/*.html doc/*.pdf doc/*.ref +%defattr(-,root,root,-) +%doc AUTHORS COPYING ChangeLog NEWS README %{_bindir}/* %dir %{_libdir}/%{name} -%{_libdir}/%{name}/pkgIndex.tcl %{_libdir}/%{name}/*.so.* %{_mandir}/man1/*.1* +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/lefty +%exclude %{_libdir}/%{name}/lib*tcl*.so.* +%exclude %{_libdir}/%{name}/libtk*.so.* +%exclude %{_bindir}/dotneato-config +%exclude %{_mandir}/man1/dotneato-config.1* + +%files tcl +%defattr(-,root,root,-) +%{_libdir}/%{name}/lib*tcl*.so.*.* +%{_libdir}/%{name}/libtk*.so.*.* +%{_libdir}/%{name}/pkgIndex.tcl +%{_datadir}/%{name}/demo %{_mandir}/mann/*.n* -%{_datadir}/%{name} +%exclude %{_libdir}/%{name}/lib*tcl*.so.? +%exclude %{_libdir}/%{name}/libtk*.so.? %files devel %defattr(-,root,root,-) +%{_bindir}/dotneato-config %{_includedir}/%{name} %{_libdir}/%{name}/*.la %{_libdir}/%{name}/*.so +%{_libdir}/pkgconfig/*.pc +%{_mandir}/man1/dotneato-config.1* %{_mandir}/man3/*.3* +%exclude %{_libdir}/%{name}/lib*tcl*.* +%exclude %{_libdir}/%{name}/libtk*.* + +%files graphs +%defattr(-,root,root,-) +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/graphs + +%files doc +%defattr(-,root,root,-) +%doc __doc/* %changelog +* Sun Jan 23 2005 John Ellson - 0:2.2-3 +- change BuildRequires to /bin/ksh, since ksh doesn't provide a /usr/bin/ksh +- change devel exclude to also exclude libtcl*.la + +* Sat Jan 22 2005 Ville Skytt?? - 0:2.2-2 +- Move -doc back to %%{__docdir}, remove unused docdir=... from build. +- Own %%{_datadir}/%%{name} in -graphs. +- Require tcl and tk in -tcl. +- Require pkgconfig in -devel, fix *.pc install location. +- Build without dependency tracking. +- Honor $RPM_OPT_FLAGS again. +- Move dotneato-config to -devel. +- Fix lefty/* permissions. + +* Sat Jan 22 2005 John Ellson - 0:2.2-1 +- Updated to 2.2 +- split out: + graphviz-docs - optional and large + graphviz-graphs - optional demo graphs + graphviz-tcl - optional, of interest only to tcl users, requires tcl +- avoid use of %%configure which breaks on RH73 +- add some pkgconfigs - probably in wrong place they're a bit experimental + so OK for now +- add BuildRequires /usr/bin/ksh (either pdksh or the real one) + * Thu Jun 3 2004 Ville Skytt?? - 0:1.12-0.fdr.2 - BuildRequire m4 to work around https://bugzilla.redhat.com/108655 on FC1. Index: sources =================================================================== RCS file: /cvs/extras/rpms/graphviz/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:31:13 -0000 1.3 +++ sources 23 Jan 2005 16:27:43 -0000 1.4 @@ -1 +1 @@ -84910caae072c714d107ca9f3e54ace0 graphviz-1.12.tar.gz +9275d30695a5c22f360acbef7b85acd3 graphviz-2.2.tar.gz From fedora-extras-commits at redhat.com Sun Jan 23 16:29:04 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:29:04 -0500 Subject: rpms/cvs2cl import.log,1.9,1.10 Message-ID: <200501231629.j0NGT4KG010788@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/cvs2cl In directory cvs.fedora.redhat.com:/tmp/cvs-serv10778 Modified Files: import.log Log Message: auto-import cvs2cl-2.58-1 on branch devel from cvs2cl-2.58-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/import.log,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- import.log 23 Jan 2005 16:27:20 -0000 1.9 +++ import.log 23 Jan 2005 16:29:02 -0000 1.10 @@ -6,3 +6,4 @@ cvs2cl-2_58-0_fdr_1_rh90:RHL-9:cvs2cl-2.58-0.fdr.1.rh90.src.rpm:1106497476 cvs2cl-2_58-0_fdr_1_1:FC-1:cvs2cl-2.58-0.fdr.1.1.src.rpm:1106497541 cvs2cl-2_58-0_fdr_1_2:FC-2:cvs2cl-2.58-0.fdr.1.2.src.rpm:1106497622 +cvs2cl-2_58-1:HEAD:cvs2cl-2.58-1.src.rpm:1106497728 From fedora-extras-commits at redhat.com Sun Jan 23 16:29:04 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:29:04 -0500 Subject: rpms/cvs2cl/devel cvs2cl.pl,1.1,1.2 cvs2cl.spec,1.5,1.6 Message-ID: <200501231629.j0NGT4vr010791@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/cvs2cl/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv10778/devel Modified Files: cvs2cl.pl cvs2cl.spec Log Message: auto-import cvs2cl-2.58-1 on branch devel from cvs2cl-2.58-1.src.rpm Index: cvs2cl.pl =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/devel/cvs2cl.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cvs2cl.pl 8 Nov 2004 04:11:22 -0000 1.1 +++ cvs2cl.pl 23 Jan 2005 16:29:02 -0000 1.2 @@ -19,6 +19,7 @@ use File::Basename qw( fileparse ); use Getopt::Long qw( GetOptions ); use Text::Wrap qw( ); +use Time::Local qw( timegm ); use User::pwent qw( getpwnam ); # The Plan: @@ -956,7 +957,20 @@ # ------------------------------------- sub output_tagdate { - # NOT YET DONE + my $self = shift; + my ($fh, $time, $tag) = @_; + + my ($y, $m, $d, $H, $M, $S) = (gmtime($time))[5,4,3,2,1,0]; + + # Ideally, this would honor $UTC_Times and use +HH:MM syntax + my $isoDate = sprintf("%04d-%02d-%02dT%02d:%02d:%02dZ", + $y + 1900, $m + 1, $d, $H, $M, $S); + + print $fh "\n"; + print $fh "$isoDate\n"; + print $fh "$tag\n"; + print $fh "\n\n"; + return; } # ------------------------------------- @@ -1052,11 +1066,6 @@ my $follow_branches = $self->{follow_branches}; my $follow_only = $self->{follow_only}; -#print STDERR "IG: ", join(',', keys %{$self->{ignore_tags}}), "\n"; -#print STDERR "IX: ", join(',', @{$qunk->{tags}}), "\n" if defined $qunk->{tags}; -#print STDERR "IQ: ", join(',', keys %{$qunk->{branch_numbers}}), "\n" if defined $qunk->{branch_numbers}; -#use Data::Dumper; print STDERR Dumper $qunk; - for my $ignore_tag (keys %{$self->{ignore_tags}}) { return if defined $qunk->{tags} and grep $_ eq $ignore_tag, @{$qunk->{tags}}; @@ -1096,12 +1105,13 @@ ($branch_number . ".") ) { if ( $followsub ) { return 1; - } elsif (length($revision) == length($branch_number)+2 ) { +# } elsif ( length($revision) == length($branch_number)+2 ) { + } elsif ( substr($revision, length($branch_number)+1) =~ /^\d+$/ ) { return 1; } } elsif ( length($branch_number) > length($revision) and - $No_Ancestors ) { + ! $No_Ancestors ) { # Non-trivial case: check if rev is ancestral to branch # r_left still has the trailing "." @@ -1214,13 +1224,13 @@ # XML output includes everything else, we might as well make # it always include Day Of Week too, for consistency. my $authorhash = $changelog{$time}; - if ($Show_Tag_Dates) { + if ( $Show_Tag_Dates || $XML_Output ) { my %tags; while (my ($author,$mesghash) = each %$authorhash) { while (my ($msg,$qunk) = each %$mesghash) { - foreach my $qunkref2 (@$qunk) { + for my $qunkref2 (@$qunk) { if (defined ($qunkref2->tags)) { - foreach my $tag (@{$qunkref2->tags}) { + for my $tag (@{$qunkref2->tags}) { $tags{$tag} = 1; } } @@ -1925,22 +1935,38 @@ sub read_changelog { my ($self, $command) = @_; -# my $grand_poobah = CVS::Utils::ChangeLog::EntrySet->new; - + local (*READER, *WRITER); + my $pid; if (! $Input_From_Stdin) { - my $Log_Source_Command = join(' ', @$command); - &main::debug ("(run \"${Log_Source_Command}\")\n"); - open (LOG_SOURCE, "$Log_Source_Command |") - or die "unable to run \"${Log_Source_Command}\""; + pipe(READER, WRITER) + or die "Couldn't form pipe: $!\n"; + $pid = fork; + die "Couldn't fork: $!\n" + if ! defined $pid; + if ( ! $pid ) { # child + open STDOUT, '>&=' . fileno WRITER + or die "Couldn't dup stderr to ", fileno WRITER, "\n"; + # strangely, some perls give spurious warnings about STDIN being opened + # for output only these close calls precede the STDOUT reopen above. + # I think they must be reusing fd 1. + close READER; + close STDIN; + + exec @$command; + } + + close WRITER; + + &main::debug ("(run \"@$command\")\n"); } else { - open (LOG_SOURCE, "-") or die "unable to open stdin for reading"; + open READER, '-' or die "unable to open stdin for reading"; } - binmode LOG_SOURCE; + binmode READER; XX_Log_Source: - while () { + while () { chomp; s!\r$!!; @@ -1968,17 +1994,19 @@ # log message texts: $self->{rev_msg} .= $_ . "\n"; # Normally, just accumulate the message... } else { + my $noadd = 0; if ( ! $self->{rev_msg} or $self->{rev_msg} =~ /^\s*(\.\s*)?$/ or index($self->{rev_msg}, EMPTY_LOG_MESSAGE) > -1 ) { # ... until a msg separator is encountered: # Ensure the message contains something: - $self->clear_msg + $self->clear_msg, $noadd = 1 if $Prune_Empty_Msgs; $self->{rev_msg} = "[no log message]\n"; } - $self->add_file_entry; + $self->add_file_entry + unless $noadd; if ( $_ eq FILE_SEPARATOR ) { $self->clear_file; @@ -1988,9 +2016,15 @@ } } - close LOG_SOURCE - or die sprintf("Problem reading log input (exit/signal/core: %d/%d/%d)\n", - $? >> 8, $? & 127, $? & 128); + close READER + or die "Couldn't close pipe reader: $!\n"; + if ( defined $pid ) { + my $rv; + waitpid $pid, 0; + 0 == $? + or $!=1, die sprintf("Problem reading log input (pid/exit/signal/core: %d/%d/%d/%d)\n", + $pid, $? >> 8, $? & 127, $? & 128); + } return; } @@ -2127,9 +2161,8 @@ ($base, undef, undef) = fileparse($path); my $xpath = $Case_Insensitive ? lc($path) : $path; - if ( grep index($path, $_) > -1, @Ignore_Files ) { - return; - } + return + if grep $path =~ /$_/, @Ignore_Files; } $self->{filename} = $path; @@ -2399,7 +2432,7 @@ my $accumulation_date = maybe_grab_accumulation_date; if ($accumulation_date) { # Insert -d immediately after 'cvs log' - my $Log_Date_Command = "-d\'>${accumulation_date}\'"; + my $Log_Date_Command = "-d>${accumulation_date}"; my ($log_index) = grep $command->[$_] eq 'log', 0..$#$command; splice @$command, $log_index+1, 0, $Log_Date_Command; @@ -2456,6 +2489,7 @@ } # ------------------------------------- + sub parse_options { # Check this internally before setting the global variable. my $output_file; @@ -2605,7 +2639,7 @@ ) or die "options parsing failed\n"; - push @log_source_command, map "'$_'", @ARGV; + push @log_source_command, map "$_", @ARGV; ## Check for contradictions... @@ -2858,7 +2892,8 @@ =item B<-I> I, B<--ignore> I Ignore files whose names match I. This option may be used multiple -times. +times. The regexp is a perl regular expression. It is matched as is; you may +want to prefix with a ^ or suffix with a $ to anchor the match. =item B<-C>, B<--case-insensitive> @@ -3038,6 +3073,14 @@ Note that the rules for quoting under windows shells are different. +=item * + +To run in an automated environment such as CGI or PHP, suidperl may be needed +in order to execute as the correct user to enable /cvsroot read lock files to +be written for the 'cvs log' command. This is likely just a case of changing +the /usr/bin/perl command to /usr/bin/suidperl, and explicitly declaring the +PATH variable. + =back =head1 EXAMPLES @@ -3099,6 +3142,8 @@ =item Terry Kane +=item Pete Kempf + =item Akos Kiss =item Claus Klein @@ -3121,7 +3166,11 @@ =item Thomas Parmelan -=item Johanne Stezenbach +=item Jordan Russell + +=item Jacek Sliwerski + +=item Johannes Stezenbach =item Joseph Walton Index: cvs2cl.spec =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/devel/cvs2cl.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cvs2cl.spec 10 Dec 2004 22:03:02 -0000 1.5 +++ cvs2cl.spec 23 Jan 2005 16:29:02 -0000 1.6 @@ -1,5 +1,5 @@ Name: cvs2cl -Version: 2.57 +Version: 2.58 Release: 1 Epoch: 0 Summary: Utility which generates ChangeLogs from CVS working copies @@ -67,6 +67,9 @@ %changelog +* Sun Jan 16 2005 Marius L. J??hndal - 0:2.58-1 +- Updated to 2.58. + * Sat Jul 10 2004 Marius L. J??hndal - 0:2.57-0.fdr.1 - Updated to 2.57. - Moved XML and XSLT files from _datadir/sgml to _datadir/xml. From fedora-extras-commits at redhat.com Sun Jan 23 16:30:20 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:30:20 -0500 Subject: rpms/nget import.log,1.3,1.4 Message-ID: <200501231630.j0NGUK6g010902@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/nget In directory cvs.fedora.redhat.com:/tmp/cvs-serv10893 Modified Files: import.log Log Message: auto-import nget-0.27.1-1.1 on branch FC-1 from nget-0.27.1-1.1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/nget/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 8 Nov 2004 04:54:17 -0000 1.3 +++ import.log 23 Jan 2005 16:30:18 -0000 1.4 @@ -1,2 +1,3 @@ nget-0_27-0_fdr_1_1:HEAD:nget-0.27-0.fdr.1.1.src.rpm:1099889651 nget-0_27-0_fdr_1_2:HEAD:nget-0.27-0.fdr.1.2.src.rpm:1099889657 +nget-0_27_1-1_1:FC-1:nget-0.27.1-1.1.src.rpm:1106497812 From fedora-extras-commits at redhat.com Sun Jan 23 16:30:20 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:30:20 -0500 Subject: rpms/nget/FC-1 .cvsignore, 1.2, 1.3 nget.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200501231630.j0NGUKFg010906@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/nget/FC-1 In directory cvs.fedora.redhat.com:/tmp/cvs-serv10893/FC-1 Modified Files: .cvsignore nget.spec sources Log Message: auto-import nget-0.27.1-1.1 on branch FC-1 from nget-0.27.1-1.1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nget/FC-1/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:54:11 -0000 1.2 +++ .cvsignore 23 Jan 2005 16:30:18 -0000 1.3 @@ -1 +1 @@ -nget-0.27.tar.gz +nget-0.27.1.tar.gz Index: nget.spec =================================================================== RCS file: /cvs/extras/rpms/nget/FC-1/nget.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nget.spec 8 Nov 2004 04:54:11 -0000 1.1 +++ nget.spec 23 Jan 2005 16:30:18 -0000 1.2 @@ -1,13 +1,13 @@ Name: nget -Version: 0.27 -Release: 0.fdr.1.1 +Version: 0.27.1 +Release: 1.1 Epoch: 0 Summary: A utility for retrieving files using the NNTP protocol Group: Applications/Internet License: GPL URL: http://nget.sourceforge.net/ -Source0: http://dl.sf.net/nget/nget-0.27.tar.gz +Source0: http://dl.sf.net/nget/nget-0.27.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel @@ -48,6 +48,9 @@ %changelog +* Sun Jan 16 2005 Marius L. J??hndal - 0:0.27.1-1 +- Updated to 0.27.1. + * Fri Jun 18 2004 Marius L. J??hndal - 0:0.27-0.fdr.1 - Updated to 0.27. Index: sources =================================================================== RCS file: /cvs/extras/rpms/nget/FC-1/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:54:11 -0000 1.2 +++ sources 23 Jan 2005 16:30:18 -0000 1.3 @@ -1 +1 @@ -55fca5c127961cf7ef4c77b2eab8e41e nget-0.27.tar.gz +0710a25aebede4799bd9ca3756573f6a nget-0.27.1.tar.gz From fedora-extras-commits at redhat.com Sun Jan 23 16:31:14 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:31:14 -0500 Subject: rpms/nget import.log,1.4,1.5 Message-ID: <200501231631.j0NGVEsW011012@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/nget In directory cvs.fedora.redhat.com:/tmp/cvs-serv11003 Modified Files: import.log Log Message: auto-import nget-0.27.1-1.2 on branch FC-2 from nget-0.27.1-1.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/nget/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 23 Jan 2005 16:30:18 -0000 1.4 +++ import.log 23 Jan 2005 16:31:12 -0000 1.5 @@ -1,3 +1,4 @@ nget-0_27-0_fdr_1_1:HEAD:nget-0.27-0.fdr.1.1.src.rpm:1099889651 nget-0_27-0_fdr_1_2:HEAD:nget-0.27-0.fdr.1.2.src.rpm:1099889657 nget-0_27_1-1_1:FC-1:nget-0.27.1-1.1.src.rpm:1106497812 +nget-0_27_1-1_2:FC-2:nget-0.27.1-1.2.src.rpm:1106497865 From fedora-extras-commits at redhat.com Sun Jan 23 16:31:14 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:31:14 -0500 Subject: rpms/nget/FC-2 .cvsignore, 1.2, 1.3 nget.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200501231631.j0NGVE6M011016@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/nget/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv11003/FC-2 Modified Files: .cvsignore nget.spec sources Log Message: auto-import nget-0.27.1-1.2 on branch FC-2 from nget-0.27.1-1.2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nget/FC-2/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:54:11 -0000 1.2 +++ .cvsignore 23 Jan 2005 16:31:12 -0000 1.3 @@ -1 +1 @@ -nget-0.27.tar.gz +nget-0.27.1.tar.gz Index: nget.spec =================================================================== RCS file: /cvs/extras/rpms/nget/FC-2/nget.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nget.spec 8 Nov 2004 04:54:17 -0000 1.2 +++ nget.spec 23 Jan 2005 16:31:12 -0000 1.3 @@ -1,13 +1,13 @@ Name: nget -Version: 0.27 -Release: 0.fdr.1.2 +Version: 0.27.1 +Release: 1.2 Epoch: 0 Summary: A utility for retrieving files using the NNTP protocol Group: Applications/Internet License: GPL URL: http://nget.sourceforge.net/ -Source0: http://dl.sf.net/nget/nget-0.27.tar.gz +Source0: http://dl.sf.net/nget/nget-0.27.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel @@ -48,6 +48,9 @@ %changelog +* Sun Jan 16 2005 Marius L. J??hndal - 0:0.27.1-1 +- Updated to 0.27.1. + * Fri Jun 18 2004 Marius L. J??hndal - 0:0.27-0.fdr.1 - Updated to 0.27. Index: sources =================================================================== RCS file: /cvs/extras/rpms/nget/FC-2/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:54:11 -0000 1.2 +++ sources 23 Jan 2005 16:31:12 -0000 1.3 @@ -1 +1 @@ -55fca5c127961cf7ef4c77b2eab8e41e nget-0.27.tar.gz +0710a25aebede4799bd9ca3756573f6a nget-0.27.1.tar.gz From fedora-extras-commits at redhat.com Sun Jan 23 16:31:58 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:31:58 -0500 Subject: rpms/nget import.log,1.5,1.6 Message-ID: <200501231631.j0NGVwe3011129@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/nget In directory cvs.fedora.redhat.com:/tmp/cvs-serv11120 Modified Files: import.log Log Message: auto-import nget-0.27.1-2 on branch devel from nget-0.27.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/nget/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 23 Jan 2005 16:31:12 -0000 1.5 +++ import.log 23 Jan 2005 16:31:56 -0000 1.6 @@ -2,3 +2,4 @@ nget-0_27-0_fdr_1_2:HEAD:nget-0.27-0.fdr.1.2.src.rpm:1099889657 nget-0_27_1-1_1:FC-1:nget-0.27.1-1.1.src.rpm:1106497812 nget-0_27_1-1_2:FC-2:nget-0.27.1-1.2.src.rpm:1106497865 +nget-0_27_1-2:HEAD:nget-0.27.1-2.src.rpm:1106497909 From fedora-extras-commits at redhat.com Sun Jan 23 16:31:58 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 11:31:58 -0500 Subject: rpms/nget/devel .cvsignore, 1.2, 1.3 nget.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200501231631.j0NGVw2p011133@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/nget/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv11120/devel Modified Files: .cvsignore nget.spec sources Log Message: auto-import nget-0.27.1-2 on branch devel from nget-0.27.1-2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nget/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:54:11 -0000 1.2 +++ .cvsignore 23 Jan 2005 16:31:56 -0000 1.3 @@ -1 +1 @@ -nget-0.27.tar.gz +nget-0.27.1.tar.gz Index: nget.spec =================================================================== RCS file: /cvs/extras/rpms/nget/devel/nget.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nget.spec 10 Dec 2004 22:03:07 -0000 1.3 +++ nget.spec 23 Jan 2005 16:31:56 -0000 1.4 @@ -1,13 +1,13 @@ Name: nget -Version: 0.27 -Release: 1 +Version: 0.27.1 +Release: 2 Epoch: 0 Summary: A utility for retrieving files using the NNTP protocol Group: Applications/Internet License: GPL URL: http://nget.sourceforge.net/ -Source0: http://dl.sf.net/nget/nget-0.27.tar.gz +Source0: http://dl.sf.net/nget/nget-0.27.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel @@ -48,6 +48,9 @@ %changelog +* Sun Jan 16 2005 Marius L. J??hndal - 0:0.27.1-2 +- Updated to 0.27.1. + * Fri Jun 18 2004 Marius L. J??hndal - 0:0.27-0.fdr.1 - Updated to 0.27. Index: sources =================================================================== RCS file: /cvs/extras/rpms/nget/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:54:11 -0000 1.2 +++ sources 23 Jan 2005 16:31:56 -0000 1.3 @@ -1 +1 @@ -55fca5c127961cf7ef4c77b2eab8e41e nget-0.27.tar.gz +0710a25aebede4799bd9ca3756573f6a nget-0.27.1.tar.gz From fedora-extras-commits at redhat.com Sun Jan 23 16:54:43 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 23 Jan 2005 11:54:43 -0500 Subject: rpms/fwbuilder/devel fwbuilder.spec,1.2,1.3 Message-ID: <200501231654.j0NGsh9E011427@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/fwbuilder/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv11415 Modified Files: fwbuilder.spec Log Message: Typo fix Index: fwbuilder.spec =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/devel/fwbuilder.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fwbuilder.spec 23 Jan 2005 05:42:12 -0000 1.2 +++ fwbuilder.spec 23 Jan 2005 16:54:41 -0000 1.3 @@ -1,7 +1,7 @@ Name: fwbuilder Summary: Firewall Builder Version: 2.0.5 -Release: 2 +Release: 3 License: GPL Group: Applications/System URL: http://www.fwbuilder.org/ @@ -108,7 +108,7 @@ %package ipf -Summary: Policy Pompiler for ipfilter +Summary: Policy Compiler for ipfilter Group: Applications/System Requires: %{name} = %{version}-%{release} @@ -152,6 +152,9 @@ %{_mandir}/man1/fwb_ipt.1* %changelog +* Sun Jan 23 2005 Warren Togami 2.0.5-3 +- Typo fix (#145887 Stefan Hoelldampf) + * Sat Jan 22 2005 Warren Togami 2.0.5-2 - minor spec cleanup From fedora-extras-commits at redhat.com Sun Jan 23 18:22:47 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 13:22:47 -0500 Subject: rpms/apt/devel apt.spec,1.5,1.6 default.conf,1.2,1.3 Message-ID: <200501231822.j0NIMl2d013062@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/apt/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv13056 Modified Files: apt.spec default.conf Log Message: Add kernel-devel to Allow-Duplicated in apt.conf.d/default.conf. Index: apt.spec =================================================================== RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- apt.spec 17 Jan 2005 22:01:26 -0000 1.5 +++ apt.spec 23 Jan 2005 18:22:45 -0000 1.6 @@ -17,7 +17,7 @@ Summary: Debian's Advanced Packaging Tool with RPM support. Name: apt Version: 0.5.15cnc6 -Release: 12.%{svnver} +Release: 13.%{svnver} Epoch: 0 Group: System Environment/Base URL: https://moin.conectiva.com.br/AptRpm @@ -360,6 +360,9 @@ %changelog +* Sun Jan 23 2005 Ville Skytt?? - 0:0.5.15cnc6-13.r362 +- Add kernel-devel to Allow-Duplicated in apt.conf.d/default.conf. + * Mon Jan 17 2005 Ville Skytt?? - 0:0.5.15cnc6-12.r362 - Clean up -python packaging, make everything honor %%{__python}. - Build with dependency tracking disabled. Index: default.conf =================================================================== RCS file: /cvs/extras/rpms/apt/devel/default.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- default.conf 17 Jan 2005 22:01:26 -0000 1.2 +++ default.conf 23 Jan 2005 18:22:45 -0000 1.3 @@ -26,9 +26,9 @@ // 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|source|sourcecode))?(-(unsupported-modules))?$"; "^gpg-pubkey$"; }; + Allow-Duplicated { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|source|sourcecode|devel))?(-(unsupported-modules))?$"; "^gpg-pubkey$"; }; // XXX: not used currently - //Allow-Duplicated-Upgrade { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|source))?(-(unsupported-modules))?$"; }; + //Allow-Duplicated-Upgrade { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|source|sourcecode|devel))?(-(unsupported-modules))?$"; }; // "Upgrade" allow-duplicated packages as well Upgrade-Virtual "true"; // Enable source rebuilds From fedora-extras-commits at redhat.com Sun Jan 23 19:08:15 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sun, 23 Jan 2005 14:08:15 -0500 Subject: rpms/sqlite/devel sqlite-2.8.15-makefile.patch, NONE, 1.1 sqlite-2.8.15.rpath.patch, NONE, 1.1 sqlite.spec, 1.5, 1.6 sources, 1.2, 1.3 sqlite-2.8.3.makefile.tclsqlite.patch, 1.1, NONE Message-ID: <200501231908.j0NJ8Feb013870@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/sqlite/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv13864 Modified Files: sqlite.spec sources Added Files: sqlite-2.8.15-makefile.patch sqlite-2.8.15.rpath.patch Removed Files: sqlite-2.8.3.makefile.tclsqlite.patch Log Message: Merge stalled update and changes, mostly from fedora.us queue, in order to update from 2.8.6 to 2.8.15. 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-2.8.15 $(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-2.8.15 \ -version-info "8:6:8" sqlite at TARGET_EXEEXT@: $(TOP)/src/shell.c libsqlite.la sqlite.h Index: sqlite.spec =================================================================== RCS file: /cvs/extras/rpms/sqlite/devel/sqlite.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sqlite.spec 10 Dec 2004 22:03:11 -0000 1.5 +++ sqlite.spec 23 Jan 2005 19:08:13 -0000 1.6 @@ -1,19 +1,21 @@ Name: sqlite -Version: 2.8.6 -Release: 6 +Version: 2.8.15 +Release: 1 Epoch: 0 -Summary: An embeddable SQL engine in a C library. +Summary: An 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-2.8.6.tar.gz -Patch1: sqlite-2.8.6.norpath.patch -Patch2: sqlite-2.8.3.makefile.tclsqlite.patch -Patch3: sqlite-2.8.3.test.rh9.patch +Source0: http://www.sqlite.org/sqlite-2.8.15.tar.gz +Patch1: sqlite-2.8.15.rpath.patch +Patch2: sqlite-2.8.15-makefile.patch +Patch3: sqlite-2.8.3.test.rh9.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel readline-devel %{_includedir}/tcl.h +ExclusiveArch: %{ix86} + %description SQLite is a small, fast, embeddable SQL database engine that supports most of SQL92, including transactions with atomic commit and rollback, @@ -49,23 +51,28 @@ %prep %setup -q -n %{name} %patch1 -p1 -%patch2 -p0 +%patch2 -p1 %patch3 -p1 +# 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 -make all tclsqlite doc test +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 -cp -d -p .libs/libtclsqlite.so* $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 +install -D -m 0644 sqlite.1 $RPM_BUILD_ROOT%{_mandir}/man1/sqlite.1 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' @@ -93,10 +100,27 @@ %defattr(-,root,root,-) %doc doc/tclsqlite.html %exclude %_bindir/tclsqlite -%exclude %_libdir/libtclsqlite.* +%exclude %_libdir/%{name}-%{version}/libtclsqlite.a +%exclude %{_bindir}/tclsqlite %_libdir/sqlite-%version %changelog +* 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 @@ -105,13 +129,17 @@ 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 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sqlite/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:22:32 -0000 1.2 +++ sources 23 Jan 2005 19:08:13 -0000 1.3 @@ -1 +1 @@ -3047e24370d7e49d7bfd9728addf76cf sqlite-2.8.6.tar.gz +0afa73e107bd106031d046c8ca6a94ab sqlite-2.8.15.tar.gz --- sqlite-2.8.3.makefile.tclsqlite.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jan 23 19:11:49 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sun, 23 Jan 2005 14:11:49 -0500 Subject: rpms/sqlite/devel sqlite-2.8.6.norpath.patch,1.1,NONE Message-ID: <200501231911.j0NJBnpA013920@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/sqlite/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv13914 Removed Files: sqlite-2.8.6.norpath.patch Log Message: remove obsolete patch file --- sqlite-2.8.6.norpath.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jan 23 19:37:00 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 23 Jan 2005 14:37:00 -0500 Subject: rpms/wxGTK/devel wxGTK.spec,1.7,1.8 Message-ID: <200501231937.j0NJb0Hw014027@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/wxGTK/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv14021 Modified Files: wxGTK.spec Log Message: Fix wx-config for x86_64 (#145508), honor $RPM_OPT_FLAGS, %{__cc} and %{__cxx}. Index: wxGTK.spec =================================================================== RCS file: /cvs/extras/rpms/wxGTK/devel/wxGTK.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- wxGTK.spec 6 Dec 2004 11:02:41 -0000 1.7 +++ wxGTK.spec 23 Jan 2005 19:36:58 -0000 1.8 @@ -1,6 +1,8 @@ +%define x11libdir %{_prefix}/X11R6/%{_lib} + Name: wxGTK Version: 2.4.2 -Release: 7 +Release: 8 Summary: GTK+ port of the wxWidgets GUI library License: BSD Group: System Environment/Libraries @@ -132,19 +134,27 @@ %setup -q -n %{name}-%{version} %patch0 -p1 -b .privates %patch1 -b .aclocal18 +sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in %build mkdir _gtk1 _gtk2 -export APPEXTRACFLAGS="$RPM_OPT_FLAGS" -export APPEXTRACXXFLAGS="$RPM_OPT_FLAGS" +export CC="%{__cc}" +export CXX="%{__cxx}" +export CFLAGS="$RPM_OPT_FLAGS" +export CXXFLAGS="$RPM_OPT_FLAGS" +# --disable-optimise prevents our $RPM_OPT_FLAGS being overridden +# (see OPTIMISE in configure). cd _gtk1 ../configure \ --prefix=%{_prefix} \ + --libdir=%{_libdir} \ + --x-libraries=%{x11libdir} \ --with-opengl \ --enable-shared \ - --enable-soname + --enable-soname \ + --disable-optimise make %{?_smp_mflags} make %{?_smp_mflags} -C contrib/src/stc make %{?_smp_mflags} -C contrib/src/xrc @@ -152,9 +162,12 @@ cd ../_gtk2 ../configure \ --prefix=%{_prefix} \ + --libdir=%{_libdir} \ + --x-libraries=%{x11libdir} \ --with-opengl \ --enable-shared \ --enable-soname \ + --disable-optimise \ --enable-gtk2 make %{?_smp_mflags} make %{?_smp_mflags} -C contrib/src/stc @@ -166,6 +179,9 @@ %install rm -rf $RPM_BUILD_ROOT +# Since we're not using %%configure, we would really like to use +# "make install DESTDIR=..." instead of %%makeinstall here to keep things in +# sync. Unfortunately that does not work. cd _gtk1 %makeinstall %makeinstall -C contrib/src/stc @@ -276,6 +292,10 @@ %changelog +* Sun Jan 23 2005 Ville Skytt?? - 2.4.2-8 +- Fix wx-config for x86_64 (#145508). +- Honor $RPM_OPT_FLAGS better, as well as %%{__cc} and %%{__cxx}. + * Mon Dec 6 2004 Ville Skytt?? - 2.4.2-7 - Patch to avoid aclocal >= 1.8 warnings from wxwin.m4. - Move unversioned *.so links for -gl, -stc and -xrc to -devel, make -devel From fedora-extras-commits at redhat.com Sun Jan 23 19:40:24 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Sun, 23 Jan 2005 14:40:24 -0500 Subject: devel/galeon galeon.spec, 1.1, 1.2 sources, 1.2, 1.3 galeon-1.3.10-moz-home-detect.patch, 1.1, NONE Message-ID: <200501231940.j0NJeOvF014082@cvs.fedora.redhat.com> Author: anvil Update of /cvs/extras/devel/galeon In directory cvs.fedora.redhat.com:/tmp/cvs-serv14076 Modified Files: galeon.spec sources Removed Files: galeon-1.3.10-moz-home-detect.patch Log Message: galeon: updated to 1.3.19 Index: galeon.spec =================================================================== RCS file: /cvs/extras/devel/galeon/galeon.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- galeon.spec 8 Nov 2004 04:21:30 -0000 1.1 +++ galeon.spec 23 Jan 2005 19:40:22 -0000 1.2 @@ -1,36 +1,34 @@ -%define extraversion a - Summary: GNOME2 Web browser based on Mozilla Name: galeon -Version: 1.3.11 -Release: 0.fdr.3.%{extraversion}.fixed.1 +Version: 1.3.19 +Release: 1 Epoch: 0 License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ -Source0: %{name}-%{version}%{?extraversion}-fixed.tar.bz2 -Patch0: galeon-1.3.10-moz-home-detect.patch +Source0: %{name}-%{version}%{?extraversion}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) -Requires(post,postun): scrollkeeper -BuildRequires: gettext gtk2-devel mozilla-nspr-devel desktop-file-utils -BuildRequires: mozilla-devel >= 35:1.4 -BuildRequires: libxml2-devel >= 0:2.4.0 -BuildRequires: libgnomeui-devel >= 0:2.0.5 +Requires: scrollkeeper +Requires: mozilla = %(rpm -q mozilla-devel --qf='%%{epoch}:%%{version}' 2>/dev/null) +BuildRequires: gettext mozilla-nspr-devel desktop-file-utils +BuildRequires: gtk2-devel >= 0:2.4.0 +BuildRequires: mozilla-devel >= 37:1.7.2 +BuildRequires: libxml2-devel >= 0:2.6.6 +BuildRequires: libgnomeui-devel >= 0:2.5.2 %{!?_without_nautilus:BuildRequires: eel2-devel nautilus} # ----------------------------------------------------------------------------- %description -Galeon is a web browser built around Gecko (Mozilla 's rendering engine) -and Necko (Mozilla's networking engine). It's a GNOME web browser, -designed to take advantage of as many GNOME technologies as makes sense. -Galeon was written to do just one thing - browse the web. +Galeon is a web browser built around Gecko (Mozilla's rendering +engine) and Necko (Mozilla's networking engine). It's a GNOME web +browser, designed to take advantage of as many GNOME technologies as +makes sense. Galeon was written to do just one thing - browse the web. # ----------------------------------------------------------------------------- %prep %setup -q -n %{name}-%{version}%{?extraversion} -%patch -p1 -b .moz-home-detect # ----------------------------------------------------------------------------- @@ -45,6 +43,7 @@ %install rm -rf $RPM_BUILD_ROOT + make DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT%{_datadir}/applications/galeon.desktop # Overriding galeon *bluecurve* icon @@ -71,6 +70,13 @@ %{_bindir}/galeon-config-tool --pkg-install-schemas scrollkeeper-update||: +%preun +if [ "$0" = 1 ] ; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/galeon.schemas >/dev/null +fi||: + %postun scrollkeeper-update||: @@ -80,16 +86,13 @@ %config %{_sysconfdir}/gconf/schemas/galeon.schemas %config %{_sysconfdir}/sound/events/galeon.soundlist %{_bindir}/galeon -%{_bindir}/galeon-bin %{_bindir}/galeon-config-tool -%{_libdir}/galeon %{_mandir}/man1/galeon.1* %{_datadir}/galeon %{_datadir}/gnome/help/galeon %{_datadir}/pixmaps/galeon.png %{_datadir}/sounds/galeon %{_datadir}/gnome-2.0/ui/galeon-bookmarks-editor-ui.xml -%{_datadir}/gnome-2.0/ui/galeon-ui.xml %{_datadir}/gnome-2.0/ui/nautilus-galeon-view-ui.xml %{_datadir}/omf/galeon %{_libdir}/bonobo/servers/GNOME_Galeon_Automation.server @@ -99,6 +102,47 @@ # ----------------------------------------------------------------------------- %changelog +* Sun Jan 23 2005 Dams 0:1.3.19-1 +- Rebuilt for Extras + +* Sun Jan 16 2005 Dams 0:1.3.19-0.fdr.1 +- Updated to 1.3.19 +- Removed old mkinstalldirs fix + +* Wed Oct 27 2004 Dams 0:1.3.18-0.fdr.1 +- Updated to 1.3.18 + +* Thu Sep 30 2004 Dams 0:1.3.17-0.fdr.2 +- Requiring versioned mozilla as it's borked otherwise. + +* Mon Aug 9 2004 Dams 0:1.3.17-0.fdr.1 +- Updated to 1.3.17 +- Dropped patch0 +- Updated version requirement for build dependencies + +* Sat Aug 7 2004 Dams 0:1.3.16-0.fdr.2 +- Rebuild + +* Sat Jul 3 2004 Dams 0:1.3.16-0.fdr.1 +- Updated to 1.3.16 +- Fixed preun scriptlet + +* Wed Jun 2 2004 Dams 0:1.3.15-0.fdr.1 +- Updated to 1.3.15 + +* Sun Mar 21 2004 Dams 0:1.3.14-0.fdr.1 +- Updated to 1.3.14 + +* Tue Feb 17 2004 Dams 0:1.3.13-0.fdr.1 +- Updated to 1.3.13 +- Fixed build (missing mkinstalldirs..) + +* Fri Jan 9 2004 Dams 0:1.3.11-0.fdr.5.a.fixed +- Added Requires:mozilla (non-versioned) + +* Thu Jan 8 2004 Dams 0:1.3.11-0.fdr.4.a.fixed +- Removing schemas in preun + * Sat Dec 20 2003 Dams 0:1.3.11-0.fdr.3.a-fixed - Updated to 1.3.11a-fixed Index: sources =================================================================== RCS file: /cvs/extras/devel/galeon/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:21:30 -0000 1.2 +++ sources 23 Jan 2005 19:40:22 -0000 1.3 @@ -1 +1 @@ -81170880d32052a9ff34da4ae60edc80 galeon-1.3.11a-fixed.tar.bz2 +7d272c6b1863252026386fd299122841 galeon-1.3.19.tar.bz2 --- galeon-1.3.10-moz-home-detect.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jan 23 20:00:55 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Sun, 23 Jan 2005 15:00:55 -0500 Subject: devel/galeon galeon.spec,1.2,1.3 Message-ID: <200501232000.j0NK0tTR014138@cvs.fedora.redhat.com> Author: anvil Update of /cvs/extras/devel/galeon In directory cvs.fedora.redhat.com:/tmp/cvs-serv14132 Modified Files: galeon.spec Log Message: galeon.spec: added URL in Source0 tag Index: galeon.spec =================================================================== RCS file: /cvs/extras/devel/galeon/galeon.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- galeon.spec 23 Jan 2005 19:40:22 -0000 1.2 +++ galeon.spec 23 Jan 2005 20:00:53 -0000 1.3 @@ -1,12 +1,12 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 1.3.19 -Release: 1 +Release: 2 Epoch: 0 License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ -Source0: %{name}-%{version}%{?extraversion}.tar.bz2 +Source0: http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) Requires: scrollkeeper Requires: mozilla = %(rpm -q mozilla-devel --qf='%%{epoch}:%%{version}' 2>/dev/null) @@ -102,6 +102,9 @@ # ----------------------------------------------------------------------------- %changelog +* Sun Jan 23 2005 Dams - 0:1.3.19-2 +- Urlized Source0 + * Sun Jan 23 2005 Dams 0:1.3.19-1 - Rebuilt for Extras From fedora-extras-commits at redhat.com Tue Jan 25 14:27:57 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 25 Jan 2005 09:27:57 -0500 Subject: rpms/hercules/devel .cvsignore, 1.2, 1.3 hercules.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200501251427.j0PERvcU020736@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/hercules/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv20727 Modified Files: .cvsignore hercules.spec sources Log Message: Update to 3.02 final. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hercules/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Nov 2004 02:46:54 -0000 1.2 +++ .cvsignore 25 Jan 2005 14:27:55 -0000 1.3 @@ -1 +1 @@ -hercules-3.02-cvs.tar.gz +hercules-3.02.tar.gz Index: hercules.spec =================================================================== RCS file: /cvs/extras/rpms/hercules/devel/hercules.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- hercules.spec 13 Jan 2005 18:08:53 -0000 1.4 +++ hercules.spec 25 Jan 2005 14:27:55 -0000 1.5 @@ -1,4 +1,4 @@ -%define date 20041025 +#define date 20041025 Summary: Hercules S/370, ESA/390, and z/Architecture emulator Name: hercules @@ -168,11 +168,15 @@ %{_bindir}/* %{_datadir}/hercules/ %{_libdir}/hercules/ +%exclude %{_libdir}/hercules/*.la %{_libdir}/*.so %exclude %{_libdir}/*.la %{_mandir}/man?/* %changelog +* Tue Jan 25 2005 Matthias Saou 3.02-1 +- Update to 3.02 final. + * Fri Dec 24 2004 Thomas Vander Stichele - scrubbed release tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/hercules/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Nov 2004 02:46:54 -0000 1.2 +++ sources 25 Jan 2005 14:27:55 -0000 1.3 @@ -1 +1 @@ -deecbf3a71ac21ddb457efc4dddeecae hercules-3.02-cvs.tar.gz +d765ad315a1eba281bd816e63d854dc5 hercules-3.02.tar.gz From fedora-extras-commits at redhat.com Tue Jan 25 16:48:27 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 25 Jan 2005 11:48:27 -0500 Subject: rpms/i810switch - New directory Message-ID: <200501251648.j0PGmRJx022427@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/i810switch In directory cvs.fedora.redhat.com:/tmp/cvs-serv22420/i810switch Log Message: Directory /cvs/extras/rpms/i810switch added to the repository From fedora-extras-commits at redhat.com Tue Jan 25 16:48:27 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 25 Jan 2005 11:48:27 -0500 Subject: rpms/i810switch/devel - New directory Message-ID: <200501251648.j0PGmRbR022430@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/i810switch/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22420/i810switch/devel Log Message: Directory /cvs/extras/rpms/i810switch/devel added to the repository From fedora-extras-commits at redhat.com Tue Jan 25 16:48:45 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 25 Jan 2005 11:48:45 -0500 Subject: rpms/i810switch Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501251648.j0PGmjnP022493@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/i810switch In directory cvs.fedora.redhat.com:/tmp/cvs-serv22484 Added Files: Makefile import.log Log Message: Setup of module i810switch --- NEW FILE Makefile --- # Top level Makefile for module i810switch all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 25 16:48:45 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 25 Jan 2005 11:48:45 -0500 Subject: rpms/i810switch/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501251648.j0PGmjt1022496@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/i810switch/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22484/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module i810switch --- NEW 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 Jan 25 16:49:22 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 25 Jan 2005 11:49:22 -0500 Subject: rpms/i810switch import.log,1.1,1.2 Message-ID: <200501251649.j0PGnM5n022595@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/i810switch In directory cvs.fedora.redhat.com:/tmp/cvs-serv22586 Modified Files: import.log Log Message: auto-import i810switch-0.6.2-3 on branch devel from i810switch-0.6.2-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/i810switch/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 25 Jan 2005 16:48:43 -0000 1.1 +++ import.log 25 Jan 2005 16:49:20 -0000 1.2 @@ -0,0 +1 @@ +i810switch-0_6_2-3:HEAD:i810switch-0.6.2-3.src.rpm:1106671753 From fedora-extras-commits at redhat.com Tue Jan 25 16:49:22 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 25 Jan 2005 11:49:22 -0500 Subject: rpms/i810switch/devel i810switch-0.6.2.makefile.patch, NONE, 1.1 i810switch.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501251649.j0PGnMlQ022599@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/i810switch/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22586/devel Modified Files: .cvsignore sources Added Files: i810switch-0.6.2.makefile.patch i810switch.spec Log Message: auto-import i810switch-0.6.2-3 on branch devel from i810switch-0.6.2-3.src.rpm i810switch-0.6.2.makefile.patch: --- NEW FILE i810switch-0.6.2.makefile.patch --- diff -Naur i810switch-0.6.2.orig/Makefile i810switch-0.6.2/Makefile --- i810switch-0.6.2.orig/Makefile 2005-01-11 18:09:22.011215952 -0800 +++ i810switch-0.6.2/Makefile 2005-01-11 18:11:15.474110985 -0800 @@ -1,5 +1,8 @@ OBJECTS = i810switch.o +bindir = $(DESTDIR)/usr/bin +mandir = $(DESTDIR)/usr/share/man + %.o: %.c $(CC) $(CFLAGS) -c -o $@ $< @@ -9,16 +12,16 @@ $(CC) $(CFLAGS) -o $@ $(OBJECTS) install: i810switch - install -d $(DESTDIR)/usr/bin - install -d $(DESTDIR)/usr/share/man/man1 - install i810switch i810rotate $(DESTDIR)/usr/bin - install i810switch.1.gz i810rotate.1.gz $(DESTDIR)/usr/share/man/man1 + install -d $(bindir) + install -d $(mandir)/man1 + install i810switch i810rotate $(bindir) + install i810switch.1.gz i810rotate.1.gz $(mandir)/man1 uninstall: - rm -f $(DESTDIR)/usr/bin/i810switch - rm -f $(DESTDIR)/usr/bin/i810rotate - rm -f $(DESTDIR)/usr/share/man/man1/i810switch.1.gz - rm -f $(DESTDIR)/usr/share/man/man1/i810rotate.1.gz + rm -f $(bindir)/i810switch + rm -f $(bindir)/i810rotate + rm -f $(mandir)/man1/i810switch.1.gz + rm -f $(mandir)/man1/i810rotate.1.gz clean: @rm -f $(OBJECTS) i810switch --- NEW FILE i810switch.spec --- Name: i810switch Version: 0.6.2 Release: 3 Epoch: 0 Summary: A utility for switching the LCD and external VGA displays on and off Group: User Interface/X Hardware Support License: GPL URL: http://vorfgglon.cwru.edu/~ames/i810switch/ Source0: http://vorlon.cwru.edu/~ames/i810switch/i810switch-0.6.2.tar.gz Patch0: i810switch-0.6.2.makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: pciutils %description i810switch is a utility for switching the LCD and external VGA displays on and off under Linux. It was originally written by Antonino Daplas, and is now maintained by Ken Mano. %prep %setup -q %patch -p1 -b .buildroot %build CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT %{!?makeinstall: %define makeinstall make install DESTDIR=$RPM_BUILD_ROOT bindir=$RPM_BUILD_ROOT%{_bindir} mandir=$RPM_BUILD_ROOT%{_mandir} } %makeinstall %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING README TODO ChangeLog INSTALL %{_bindir}/* %{_mandir}/man1/* %changelog * Tue Jan 18 2005 David Kaplan - 0:0.6.2-3 - Added back INSTALL file to rpm because it explains how to SUID root the executable so that all users can use i810switch. * Thu Jan 13 2005 David Kaplan - 0:0.6.2-0.fdr.2 - Minor spec file fixes and addition of optimization flags to CFLAGS * Tue Jan 11 2005 David Kaplan - 0:0.6.2-0.fdr.1 - Initial build of i810switch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/i810switch/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 25 Jan 2005 16:48:43 -0000 1.1 +++ .cvsignore 25 Jan 2005 16:49:20 -0000 1.2 @@ -0,0 +1 @@ +i810switch-0.6.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/i810switch/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 25 Jan 2005 16:48:43 -0000 1.1 +++ sources 25 Jan 2005 16:49:20 -0000 1.2 @@ -0,0 +1 @@ +b31cc8fde7a36d553406339d2626d3e3 i810switch-0.6.2.tar.gz From fedora-extras-commits at redhat.com Tue Jan 25 16:50:53 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 25 Jan 2005 11:50:53 -0500 Subject: rpms/perl-Convert-BinHex - New directory Message-ID: <200501251650.j0PGor3v022720@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Convert-BinHex In directory cvs.fedora.redhat.com:/tmp/cvs-serv22713/perl-Convert-BinHex Log Message: Directory /cvs/extras/rpms/perl-Convert-BinHex added to the repository From fedora-extras-commits at redhat.com Tue Jan 25 16:50:53 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 25 Jan 2005 11:50:53 -0500 Subject: rpms/perl-Convert-BinHex/devel - New directory Message-ID: <200501251650.j0PGor11022723@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Convert-BinHex/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22713/perl-Convert-BinHex/devel Log Message: Directory /cvs/extras/rpms/perl-Convert-BinHex/devel added to the repository From fedora-extras-commits at redhat.com Tue Jan 25 16:51:12 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 25 Jan 2005 11:51:12 -0500 Subject: rpms/perl-Convert-BinHex Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501251651.j0PGpC6c022784@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Convert-BinHex In directory cvs.fedora.redhat.com:/tmp/cvs-serv22775 Added Files: Makefile import.log Log Message: Setup of module perl-Convert-BinHex --- NEW FILE Makefile --- # Top level Makefile for module perl-Convert-BinHex all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 25 16:51:12 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 25 Jan 2005 11:51:12 -0500 Subject: rpms/perl-Convert-BinHex/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501251651.j0PGpCNJ022787@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Convert-BinHex/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22775/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Convert-BinHex --- NEW 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 Jan 25 16:51:49 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 25 Jan 2005 11:51:49 -0500 Subject: rpms/perl-Convert-BinHex import.log,1.1,1.2 Message-ID: <200501251651.j0PGpnmv022882@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Convert-BinHex In directory cvs.fedora.redhat.com:/tmp/cvs-serv22873 Modified Files: import.log Log Message: auto-import perl-Convert-BinHex-1.119-1 on branch devel from perl-Convert-BinHex-1.119-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Convert-BinHex/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 25 Jan 2005 16:51:10 -0000 1.1 +++ import.log 25 Jan 2005 16:51:47 -0000 1.2 @@ -0,0 +1 @@ +perl-Convert-BinHex-1_119-1:HEAD:perl-Convert-BinHex-1.119-1.src.rpm:1106671899 From fedora-extras-commits at redhat.com Tue Jan 25 16:51:49 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 25 Jan 2005 11:51:49 -0500 Subject: rpms/perl-Convert-BinHex/devel perl-Convert-BinHex.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501251651.j0PGpnnM022886@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Convert-BinHex/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22873/devel Modified Files: .cvsignore sources Added Files: perl-Convert-BinHex.spec Log Message: auto-import perl-Convert-BinHex-1.119-1 on branch devel from perl-Convert-BinHex-1.119-1.src.rpm --- NEW FILE perl-Convert-BinHex.spec --- %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-Convert-BinHex Version: 1.119 Release: 1 Epoch: 0 Summary: Macintosh BinHex extractor library for Perl Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Convert-BinHex/ Source0: http://www.cpan.org/authors/id/E/ER/ERYQ/Convert-BinHex-1.119.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)) %description Convert::BinHex extracts data from Macintosh BinHex files. %prep %setup -q -n Convert-BinHex-%{version} chmod -x bin/*.pl docs/Convert/BinHex/*.gif cp -a bin examples %{__perl} -pi -e 's/^use lib .*$//' bin/*.pl %{__perl} -pi -e 's/^(\@ISA.*)/require Exporter; $1/' t/Checker.pm %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check || : make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING README docs examples %{perl_vendorlib}/Convert %{_mandir}/man3/Convert::BinHex.3* %changelog * Wed Sep 15 2004 Ville Skytt?? - 0:1.119-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Convert-BinHex/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 25 Jan 2005 16:51:10 -0000 1.1 +++ .cvsignore 25 Jan 2005 16:51:47 -0000 1.2 @@ -0,0 +1 @@ +Convert-BinHex-1.119.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Convert-BinHex/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 25 Jan 2005 16:51:10 -0000 1.1 +++ sources 25 Jan 2005 16:51:47 -0000 1.2 @@ -0,0 +1 @@ +ba70ad1772abac6270078f28197a7961 Convert-BinHex-1.119.tar.gz From fedora-extras-commits at redhat.com Tue Jan 25 18:38:25 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 25 Jan 2005 13:38:25 -0500 Subject: rpms/scons/devel scons.spec,1.3,1.4 Message-ID: <200501251838.j0PIcPlq025242@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/scons/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25236 Modified Files: scons.spec Log Message: Fix from Thorsten for #146014. Index: scons.spec =================================================================== RCS file: /cvs/extras/rpms/scons/devel/scons.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scons.spec 11 Nov 2004 19:21:37 -0000 1.3 +++ scons.spec 25 Jan 2005 18:38:23 -0000 1.4 @@ -1,6 +1,6 @@ Name: scons Version: 0.96 -Release: 3 +Release: 4 Summary: An Open Source software construction tool Group: Development/Tools @@ -8,8 +8,9 @@ URL: http://www.scons.org/ Source: http://download.sourceforge.net/scons/scons-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch +BuildArch: noarch BuildRequires: python-devel +Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %description SCons is an Open Source software construction tool--that is, a build @@ -31,11 +32,11 @@ %build -python setup.py build +CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT -python setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-lib=%{_libdir}/scons --install-scripts=%{_bindir} +%{__python} setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-lib=%{_prefix}/lib/scons --install-scripts=%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 cp -f scons.1 sconsign.1 $RPM_BUILD_ROOT%{_mandir}/man1 @@ -46,10 +47,14 @@ %defattr(-,root,root,-) %doc CHANGES.txt LICENSE.txt README.txt RELEASE.txt %{_bindir}/* -%{_libdir}/scons +%{_prefix}/lib/scons %{_mandir}/man*/* %changelog +* Tue Jan 25 2005 Thorsten Leemhuis 0.96-4 +- Place libs in {_prefix}/lib/ and not in {libdir}; fixes x86_64 problems +- Adjust minor bits to be in sync with python-spec-template + * Wed Nov 10 2004 Matthias Saou 0.96-3 - Bump release to provide Extras upgrade path. @@ -62,3 +67,4 @@ * Fri Nov 7 2003 Gerard Milmeister - 0:0.93-0.fdr.1 - First Fedora release + From thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net Tue Jan 25 19:21:42 2005 From: thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net (Matthias Saou) Date: Tue, 25 Jan 2005 20:21:42 +0100 Subject: rpms/scons/devel scons.spec,1.3,1.4 In-Reply-To: <200501251838.j0PIcPlq025242@cvs.fedora.redhat.com> References: <200501251838.j0PIcPlq025242@cvs.fedora.redhat.com> Message-ID: <20050125202142.17ddc3fa@python2> Michael Schwendt (mschwendt) wrote : > -python setup.py build > +CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build This is a noarch package, CFLAGS="$RPM_OPT_FLAGS" is definitely not needed ;-) > -%{_libdir}/scons > +%{_prefix}/lib/scons Shouldn't this use the sysconfig.get_python_lib(foo) trick (that Ville showed me) to get the arch independant python lib path instead? Matthias -- Clean custom Red Hat Linux rpm packages : http://freshrpms.net/ Fedora Core release 3 (Heidelberg) - Linux kernel 2.6.10-1.741_FC3.radeon Load : 0.81 0.60 0.46 From fedora at wir-sind-cool.org Tue Jan 25 20:02:44 2005 From: fedora at wir-sind-cool.org (Michael Schwendt) Date: Tue, 25 Jan 2005 21:02:44 +0100 Subject: rpms/scons/devel scons.spec,1.3,1.4 In-Reply-To: <20050125202142.17ddc3fa@python2> References: <200501251838.j0PIcPlq025242@cvs.fedora.redhat.com> <20050125202142.17ddc3fa@python2> Message-ID: <20050125210244.4b961744.fedora@wir-sind-cool.org> On Tue, 25 Jan 2005 20:21:42 +0100, Matthias Saou wrote: > > -python setup.py build > > +CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build > > This is a noarch package, CFLAGS="$RPM_OPT_FLAGS" is definitely not needed > ;-) Not needed, not used => not a blocker criterion => copying from universal spec templates does no harm here. > > -%{_libdir}/scons > > +%{_prefix}/lib/scons > > Shouldn't this use the sysconfig.get_python_lib(foo) trick (that Ville > showed me) to get the arch independant python lib path instead? No. You cannot get /usr/lib/scons via that method, but only the arch-dependent or arch-independent site-packages path. From fedora at leemhuis.info Tue Jan 25 19:36:36 2005 From: fedora at leemhuis.info (Thorsten Leemhuis) Date: Tue, 25 Jan 2005 20:36:36 +0100 Subject: rpms/scons/devel scons.spec,1.3,1.4 In-Reply-To: <20050125202142.17ddc3fa@python2> References: <200501251838.j0PIcPlq025242@cvs.fedora.redhat.com> <20050125202142.17ddc3fa@python2> Message-ID: <1106681796.5911.2.camel@localhost.localdomain> Am Dienstag, den 25.01.2005, 20:21 +0100 schrieb Matthias Saou: > Michael Schwendt (mschwendt) wrote : > > > -python setup.py build > > +CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build > > This is a noarch package, CFLAGS="$RPM_OPT_FLAGS" is definitely not needed > ;-) I knew someone would say something ;-) > > -%{_libdir}/scons > > +%{_prefix}/lib/scons > > Shouldn't this use the sysconfig.get_python_lib(foo) trick (that Ville > showed me) to get the arch independant python lib path instead? Good question; Ville what is that for a trick? CU thl -- Thorsten Leemhuis From ville.skytta at iki.fi Tue Jan 25 22:09:48 2005 From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=) Date: Wed, 26 Jan 2005 00:09:48 +0200 Subject: Python site-packages tricks (was: Re: rpms/scons/devel scons.spec,1.3,1.4) In-Reply-To: <1106681796.5911.2.camel@localhost.localdomain> References: <200501251838.j0PIcPlq025242@cvs.fedora.redhat.com> <20050125202142.17ddc3fa@python2> <1106681796.5911.2.camel@localhost.localdomain> Message-ID: <1106690988.6477.76.camel@bobcat.mine.nu> On Tue, 2005-01-25 at 20:36 +0100, Thorsten Leemhuis wrote: > Am Dienstag, den 25.01.2005, 20:21 +0100 schrieb Matthias Saou: > > Shouldn't this use the sysconfig.get_python_lib(foo) trick (that Ville > > showed me) to get the arch independant python lib path instead? > > Good question; Ville what is that for a trick? I don't know if it's much of a trick, but see spectemplate-python.spec in fedora-rpmdevtools. It applies to most Python extension packages out there that use Python's distutils, and install stuff into site-packages dirs. In the scons case, things are not installed to the site-packages dirs, it seems, so the "trick" doesn't apply AFAICT. Anyway the idea is to find out the dirs where Python's distutils will install stuff into by asking Python and using those in %files instead of inventing/hardcoding the dirs oneself. One common build failure with Python extension packages is that the packager assumes %{_libdir}/python%{something}/site-packages/[...] as the target dir. This will fail for all noarch Python packages when built on x86_64. There, noarch stuff ends up in /usr/lib/pythonX.X/[...], and arch-dependent to /usr/lib64/pythonX.X/[...]. Python makes a distinction between arch- specific and arch-independent packages, and the Python spec template has %{python_sitearch} and %{python_sitelib} accordingly. The names correspond to the macros rpm has had for Perl for a long time. There are open RFE's in Bugzilla to get these %{python_site*} macros applied to upstream rpm's default macros file. This strategy should be future proof in the way that if the site- packages or parts of it moves elsewhere (for example, the arch- independent parts to /usr/share/[...]) one day, a simple package rebuild for the extensions should suffice. It'll also take care of Python version changes for free. Further, spectemplate-python.spec uses the %{__python} macro for everything, so this stuff should apply to custom Python installations; one just does a "rpmbuild --rebuild --define '__python /path/to/custom/pythonX' ..." and things should work regarding this bit. (I intend to document this to the WIP packagers-handbook in cvs.fedora.us soon(tm).) From fedora-extras-commits at redhat.com Wed Jan 26 00:10:39 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 25 Jan 2005 19:10:39 -0500 Subject: rpms/libsigc++20/devel libsigc++.spec,1.2,1.3 sources,1.2,1.3 Message-ID: <200501260010.j0Q0Ad7h030507@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libsigc++20/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv30501 Modified Files: libsigc++.spec sources Log Message: Update okayed by Denis. Index: libsigc++.spec =================================================================== RCS file: /cvs/extras/rpms/libsigc++20/devel/libsigc++.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libsigc++.spec 10 Dec 2004 22:03:05 -0000 1.2 +++ libsigc++.spec 26 Jan 2005 00:10:37 -0000 1.3 @@ -1,5 +1,5 @@ Name: libsigc++20 -Version: 2.0.3 +Version: 2.0.6 Release: 1 Epoch: 0 Summary: The Typesafe Signal Framework for C++ @@ -7,7 +7,7 @@ Group: System Environment/Libraries License: LGPL URL: http://libsigc.sourceforge.net/ -Source0: http://dl.sourceforge.net/libsigc/libsigc++-%version.tar.gz +Source0: http://dl.sourceforge.net/libsigc/libsigc++-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -81,6 +81,9 @@ %{_libdir}/*.a %changelog +* Sat Jan 15 2005 Rick L Vinyard Jr - 0:2.0.6-1 +- Update to 2.0.6 + * Mon Jun 27 2004 Denis Leroy - 0:2.0.3-0.fdr.1 - Update to 2.0.3 - Merged deps from FC2 sigc++ 1.2.5 spec Index: sources =================================================================== RCS file: /cvs/extras/rpms/libsigc++20/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:47:19 -0000 1.2 +++ sources 26 Jan 2005 00:10:37 -0000 1.3 @@ -1 +1 @@ -57c6887dd46ce0bd312a4823589db5d8 libsigc++-2.0.3.tar.gz +1097a8403db9506c5373c7de6b9357bb libsigc++-2.0.6.tar.bz2 From fedora-extras-commits at redhat.com Wed Jan 26 00:10:46 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 25 Jan 2005 19:10:46 -0500 Subject: rpms/gtkmm24/devel gtkmm.spec,1.2,1.3 sources,1.3,1.4 Message-ID: <200501260010.j0Q0Ak6i030537@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gtkmm24/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv30531 Modified Files: gtkmm.spec sources Log Message: Update okayed by Denis. Index: gtkmm.spec =================================================================== RCS file: /cvs/extras/rpms/gtkmm24/devel/gtkmm.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gtkmm.spec 7 Dec 2004 22:42:02 -0000 1.2 +++ gtkmm.spec 26 Jan 2005 00:10:44 -0000 1.3 @@ -1,5 +1,5 @@ Name: gtkmm24 -Version: 2.4.7 +Version: 2.4.8 Release: 1 Epoch: 0 Summary: A C++ interface for GTK2 (a GUI library for X). @@ -99,6 +99,9 @@ %changelog +* Sat Jan 15 2005 Rick L Vinyard Jr - 0:2.4.8-1 +- Update for gtkmm 2.4.8 + * Wed Nov 17 2004 Denis Leroy - 0:2.4.7-1 - Update for gtkmm 2.4.7 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkmm24/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Dec 2004 22:42:02 -0000 1.3 +++ sources 26 Jan 2005 00:10:44 -0000 1.4 @@ -1 +1 @@ -7aedecbf6878a7fa88b0ed636a7b9342 gtkmm-2.4.7.tar.bz2 +c2aee4c259a75fa0dc766d402bef253b gtkmm-2.4.8.tar.bz2 From fedora-extras-commits at redhat.com Wed Jan 26 20:08:45 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 26 Jan 2005 15:08:45 -0500 Subject: rpms/cvsgraph/devel .cvsignore, 1.3, 1.4 cvsgraph-config.patch, 1.1, 1.2 cvsgraph.spec, 1.5, 1.6 sources, 1.3, 1.4 cvsgraph-spelling.patch, 1.1, NONE cvsgraph-wrapper.patch, 1.1, NONE Message-ID: <200501262008.j0QK8j3Q018393@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/cvsgraph/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv18386 Modified Files: .cvsignore cvsgraph-config.patch cvsgraph.spec sources Removed Files: cvsgraph-spelling.patch cvsgraph-wrapper.patch Log Message: Update to 1.5.1, drop -web. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cvsgraph/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:11:43 -0000 1.3 +++ .cvsignore 26 Jan 2005 20:08:42 -0000 1.4 @@ -1 +1 @@ -cvsgraph-1.5.0.tar.gz +cvsgraph-1.5.1.tar.gz cvsgraph-config.patch: Index: cvsgraph-config.patch =================================================================== RCS file: /cvs/extras/rpms/cvsgraph/devel/cvsgraph-config.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cvsgraph-config.patch 8 Nov 2004 04:11:43 -0000 1.1 +++ cvsgraph-config.patch 26 Jan 2005 20:08:42 -0000 1.2 @@ -42,14 +42,3 @@ -title_ttfont = "/dos/windows/fonts/times.ttf"; +title_ttfont = "/usr/share/fonts/bitstream-vera/VeraSe.ttf"; title_ttsize = 10.0; -@@ -339,7 +339,7 @@ - map_branch_alt = "alt=\"%0 %(%t%) (%B)\""; --map_rev_href = "href=\"%9cvsweb_graph.cgi/%m%p%F?rev=%R&content-type=text/x-cvsweb-markup%8\""; -+map_rev_href = "href=\"%9cvsweb_graph.cgi/%m%p%F?rev=%R&content-type=text/x-cvsweb-markup%8\""; - map_rev_alt = "alt=\"%1 %(%t%) (%R)\""; --map_diff_href = "href=\"%9cvsweb_graph.cgi/%m%p%F.diff?r1=%P&r2=%R%8\""; -+map_diff_href = "href=\"%9cvsweb_graph.cgi/%m%p%F.diff?r1=%P&r2=%R%8\""; - map_diff_alt = "alt=\"%2 %P <-> %R\""; --map_merge_href = "href=\"%9cvsweb_graph.cgi/%m%p%F.diff?r1=%P&r2=%R%8\""; -+map_merge_href = "href=\"%9cvsweb_graph.cgi/%m%p%F.diff?r1=%P&r2=%R%8\""; - map_merge_alt = "alt=\"%2 %P <-> %R\""; Index: cvsgraph.spec =================================================================== RCS file: /cvs/extras/rpms/cvsgraph/devel/cvsgraph.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cvsgraph.spec 10 Dec 2004 22:03:02 -0000 1.5 +++ cvsgraph.spec 26 Jan 2005 20:08:42 -0000 1.6 @@ -1,5 +1,5 @@ Name: cvsgraph -Version: 1.5.0 +Version: 1.5.1 Release: 1 Epoch: 0 Summary: A CVS/RCS repository grapher @@ -7,44 +7,31 @@ Group: Development/Tools License: GPL URL: http://www.akhphd.au.dk/~bertho/cvsgraph/ -Source0: http://www.akhphd.au.dk/~bertho/cvsgraph/release/cvsgraph-1.5.0.tar.gz +Source0: http://www.akhphd.au.dk/~bertho/cvsgraph/release/cvsgraph-1.5.1.tar.gz Source1: %{name}-httpd.conf Patch0: %{name}-config.patch -Patch1: %{name}-wrapper.patch -Patch2: %{name}-spelling.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gd-devel, byacc, flex, freetype-devel, libpng-devel, zlib-devel BuildRequires: libjpeg-devel, %{__perl} +Obsoletes: cvsgraph-web < 0:1.5.1 %description CvsGraph is a utility to make a graphical representation of all revisions and branches of a file in a CVS/RCS repository. It has been inspired by the 'graph' option in WinCVS. -%package web -Summary: WWW interface to %{name} -Group: Development/Tools -Requires: %{name} = %{epoch}:%{version}-%{release}, httpd, php - -%description web -WWW interface to %{name}. - %prep %setup -q %patch0 -%patch1 -%patch2 -p1 -# Fix up paths in php files -rename .php3 .php *.php3 +rename .php3 .php contrib/*.php3 %{__perl} -pi -e \ 's|/home/bertho/public_html/cvsgraph/cvsgraph|%{_bindir}/cvsgraph|g ; - s|/home/bertho/public_html/cvsgraph/conf/cvsgraph\.conf|%{_sysconfdir}/cvsgraph.conf|g ; - s|\b1\.1\.2\b|%{version}|g' \ - *.php -# Fix man page path + s|/home/bertho/public_html/cvsgraph/conf/cvsgraph\.conf|%{_sysconfdir}/cvsgraph.conf|g' \ + contrib/*.php %{__perl} -pi -e 's|/usr/local/etc|%{_sysconfdir}|g' cvsgraph.1 +cp -p %{SOURCE1} contrib/cvsgraph-httpd.conf %build @@ -54,46 +41,29 @@ %install rm -rf $RPM_BUILD_ROOT - install -Dpm 755 cvsgraph $RPM_BUILD_ROOT%{_bindir}/cvsgraph install -Dpm 644 cvsgraph.conf $RPM_BUILD_ROOT%{_sysconfdir}/cvsgraph.conf install -Dpm 644 cvsgraph.1 $RPM_BUILD_ROOT%{_mandir}/man1/cvsgraph.1 install -Dpm 644 cvsgraph.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5/cvsgraph.conf.5 -install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/web -install -pm 644 *.php $RPM_BUILD_ROOT%{_datadir}/%{name}/web - -install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d -%{__perl} -pe 's|/usr/share/cvsgraph/web\b|%{_datadir}/%{name}/web|' \ - %{SOURCE1} > $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/zzz-%{name}.conf -chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/zzz-%{name}.conf - %clean rm -rf $RPM_BUILD_ROOT -%post web -[ $1 -eq 1 ] && %{_initrddir}/httpd reload >/dev/null || : - -%postun web -%{_initrddir}/httpd reload >/dev/null || : - - %files %defattr(-,root,root,-) -%doc ChangeLog LICENSE README +%doc ChangeLog LICENSE README contrib/ %config(noreplace) %{_sysconfdir}/cvsgraph.conf %{_bindir}/cvsgraph %{_mandir}/man[15]/cvsgraph*.[15]* -%files web -%defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/httpd/conf.d/zzz-%{name}.conf -%{_datadir}/%{name} - %changelog +* Wed Jan 26 2005 Ville Skytt?? - 0:1.5.1-1 +- Update to 1.5.1; wrapper, spelling and part of config patch applied upstream. +- Drop -web subpackage, include *.php as docs. + * Fri Sep 3 2004 Ville Skytt?? - 0:1.5.0-0.fdr.1 - Update to 1.5.0. - Improve default configuration, manual page spelling fixes. Index: sources =================================================================== RCS file: /cvs/extras/rpms/cvsgraph/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:11:43 -0000 1.3 +++ sources 26 Jan 2005 20:08:42 -0000 1.4 @@ -1 +1 @@ -4b3e7d0ac09222407c1357bb348869a2 cvsgraph-1.5.0.tar.gz +2f01dc06685581ac03bac38e08bf3b29 cvsgraph-1.5.1.tar.gz --- cvsgraph-spelling.patch DELETED --- --- cvsgraph-wrapper.patch DELETED --- From dag at wieers.com Wed Jan 26 18:44:00 2005 From: dag at wieers.com (Dag Wieers) Date: Wed, 26 Jan 2005 19:44:00 +0100 (CET) Subject: Python site-packages tricks (was: Re: rpms/scons/devel scons.spec,1.3,1.4) In-Reply-To: <1106690988.6477.76.camel@bobcat.mine.nu> References: <200501251838.j0PIcPlq025242@cvs.fedora.redhat.com> <20050125202142.17ddc3fa@python2> <1106681796.5911.2.camel@localhost.localdomain> <1106690988.6477.76.camel@bobcat.mine.nu> Message-ID: On Wed, 26 Jan 2005, Ville Skytt? wrote: > On Tue, 2005-01-25 at 20:36 +0100, Thorsten Leemhuis wrote: > > Am Dienstag, den 25.01.2005, 20:21 +0100 schrieb Matthias Saou: > > > > Shouldn't this use the sysconfig.get_python_lib(foo) trick (that Ville > > > showed me) to get the arch independant python lib path instead? > > > > Good question; Ville what is that for a trick? > > I don't know if it's much of a trick, but see spectemplate-python.spec > in fedora-rpmdevtools. It applies to most Python extension packages out > there that use Python's distutils, and install stuff into site-packages > dirs. In the scons case, things are not installed to the site-packages > dirs, it seems, so the "trick" doesn't apply AFAICT. > > Anyway the idea is to find out the dirs where Python's distutils will > install stuff into by asking Python and using those in %files instead of > inventing/hardcoding the dirs oneself. We're using the following macros for that: %define python_sitearch %(python -c 'from distutils import sysconfig; print sysconfig.get_python_lib()') %define python_sitelib %(python -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)') Is this what you are using too ? -- dag wieers, dag at wieers.com, http://dag.wieers.com/ -- [all I want is a warm bed and a kind word and unlimited power] From ville.skytta at iki.fi Thu Jan 27 07:08:54 2005 From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=) Date: Thu, 27 Jan 2005 09:08:54 +0200 Subject: Python site-packages tricks (was: Re: rpms/scons/devel scons.spec,1.3,1.4) In-Reply-To: References: <200501251838.j0PIcPlq025242@cvs.fedora.redhat.com> <20050125202142.17ddc3fa@python2> <1106681796.5911.2.camel@localhost.localdomain> <1106690988.6477.76.camel@bobcat.mine.nu> Message-ID: <1106809734.6477.186.camel@bobcat.mine.nu> On Wed, 2005-01-26 at 19:44 +0100, Dag Wieers wrote: > On Wed, 26 Jan 2005, Ville Skytt? wrote: > > Anyway the idea is to find out the dirs where Python's distutils will > > install stuff into by asking Python and using those in %files instead of > > inventing/hardcoding the dirs oneself. > > We're using the following macros for that: > > %define python_sitearch %(python -c 'from distutils import sysconfig; print sysconfig.get_python_lib()') > %define python_sitelib %(python -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)') > > Is this what you are using too ? Almost. Your version above has the argument to get_python_lib reversed; with no arguments it returns the arch-independent path ("sitelib"), and with 1 the arch-dependent path ("sitearch"). Additionally, your version uses "python" instead of "%{__python}" which takes away a bit of the flexibility. Here's what's in fedora-rpmdevtools' spectemplate-python.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)")} From fedora-extras-commits at redhat.com Thu Jan 27 17:51:01 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 12:51:01 -0500 Subject: rpms/perl-Module-Build/devel .cvsignore, 1.5, 1.6 perl-Module-Build.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200501271751.j0RHp16J004823@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Module-Build/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv4816 Modified Files: .cvsignore perl-Module-Build.spec sources Log Message: Update to 0.2608. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 30 Dec 2004 18:29:11 -0000 1.5 +++ .cvsignore 27 Jan 2005 17:50:59 -0000 1.6 @@ -1 +1 @@ -Module-Build-0.2606.tar.gz +Module-Build-0.2608.tar.gz Index: perl-Module-Build.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/perl-Module-Build.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Module-Build.spec 30 Dec 2004 18:29:11 -0000 1.6 +++ perl-Module-Build.spec 27 Jan 2005 17:50:59 -0000 1.7 @@ -1,7 +1,7 @@ %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-Module-Build -Version: 0.2606 +Version: 0.2608 Release: 1 Epoch: 0 Summary: Perl module for building and installing Perl modules @@ -9,7 +9,7 @@ Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Module-Build/ -Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-0.2606.tar.gz +Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-0.2608.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -24,11 +24,6 @@ %prep %setup -q -n Module-Build-%{version} -# See 2004-12-01 changelog entry for rationale for this hack: -%{__perl} -MTest::Harness::Straps -e \ - '$Test::Harness::Straps::VERSION < 0.20 && - system("%{__perl} -pi -e \"s/have_yaml = .*/have_yaml = 0;/\" \\ - t/runthrough.t")' %build @@ -60,6 +55,9 @@ %changelog +* Thu Jan 27 2005 Ville Skytt?? - 0:0.2608-1 +- Update to 0.2608, Test::Harness kludge no longer needed. + * Sun Dec 19 2004 Ville Skytt?? - 0:0.2606-1 - Update to 0.2606. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 30 Dec 2004 18:29:11 -0000 1.5 +++ sources 27 Jan 2005 17:50:59 -0000 1.6 @@ -1 +1 @@ -7c03476a9c0b5b27416b8a978afa8996 Module-Build-0.2606.tar.gz +edb30a062bfca5570d412d1576787648 Module-Build-0.2608.tar.gz From fedora-extras-commits at redhat.com Thu Jan 27 18:03:49 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:03:49 -0500 Subject: rpms/glunarclock import.log,1.2,1.3 Message-ID: <200501271803.j0RI3n5c005519@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/glunarclock In directory cvs.fedora.redhat.com:/tmp/cvs-serv5510 Modified Files: import.log Log Message: auto-import glunarclock-0.32.2-0.fdr.1.2 on branch FC-2 from glunarclock-0.32.2-0.fdr.1.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/glunarclock/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 8 Nov 2004 04:26:12 -0000 1.2 +++ import.log 27 Jan 2005 18:03:47 -0000 1.3 @@ -1 +1,2 @@ glunarclock-0_32_1-0_fdr_1_2:HEAD:glunarclock-0.32.1-0.fdr.1.2.src.rpm:1099887972 +glunarclock-0_32_2-0_fdr_1_2:FC-2:glunarclock-0.32.2-0.fdr.1.2.src.rpm:1106849018 From fedora-extras-commits at redhat.com Thu Jan 27 18:03:49 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:03:49 -0500 Subject: rpms/glunarclock/FC-2 .cvsignore, 1.2, 1.3 glunarclock.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200501271803.j0RI3nnk005523@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/glunarclock/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv5510/FC-2 Modified Files: .cvsignore glunarclock.spec sources Log Message: auto-import glunarclock-0.32.2-0.fdr.1.2 on branch FC-2 from glunarclock-0.32.2-0.fdr.1.2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glunarclock/FC-2/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:26:12 -0000 1.2 +++ .cvsignore 27 Jan 2005 18:03:47 -0000 1.3 @@ -1 +1 @@ -glunarclock-0.32.1.tar.gz +glunarclock-0.32.2.tar.gz Index: glunarclock.spec =================================================================== RCS file: /cvs/extras/rpms/glunarclock/FC-2/glunarclock.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glunarclock.spec 8 Nov 2004 04:26:12 -0000 1.1 +++ glunarclock.spec 27 Jan 2005 18:03:47 -0000 1.2 @@ -1,5 +1,5 @@ Name: glunarclock -Version: 0.32.1 +Version: 0.32.2 Release: 0.fdr.1.2 Epoch: 0 Summary: GNOME applet that displays the current lunar phase @@ -7,7 +7,7 @@ Group: User Interface/Desktops License: GPL URL: http://glunarclock.sourceforge.net/ -Source0: http://download.sourceforge.net/glunarclock/glunarclock-0.32.1.tar.gz +Source0: http://download.sourceforge.net/glunarclock/glunarclock-0.32.2.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel @@ -16,6 +16,7 @@ BuildRequires: gnome-panel BuildRequires: scrollkeeper BuildRequires: gnome-panel-devel +BuildRequires: libxklavier-devel Requires(post): GConf2 Requires(preun): GConf2 Requires(post): scrollkeeper @@ -86,6 +87,9 @@ %changelog +* Sun Jan 16 2005 Marius L. J??hndal - 0:0.32.2-0.fdr.1 +- Updated to 0.32.2. + * Fri Jun 18 2004 Marius L. J??hndal - 0:0.32.1-0.fdr.1 - Updated to 0.32.1. Index: sources =================================================================== RCS file: /cvs/extras/rpms/glunarclock/FC-2/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:26:12 -0000 1.2 +++ sources 27 Jan 2005 18:03:47 -0000 1.3 @@ -1 +1 @@ -599dbc6074982456ec68d20ca8ff9069 glunarclock-0.32.1.tar.gz +3ac61aa62af4e0d53c90c18f09ee988f glunarclock-0.32.2.tar.gz From fedora-extras-commits at redhat.com Thu Jan 27 18:06:17 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:06:17 -0500 Subject: rpms/glunarclock import.log,1.3,1.4 Message-ID: <200501271806.j0RI6HRH005639@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/glunarclock In directory cvs.fedora.redhat.com:/tmp/cvs-serv5630 Modified Files: import.log Log Message: auto-import glunarclock-0.32.2-1 on branch devel from glunarclock-0.32.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/glunarclock/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 27 Jan 2005 18:03:47 -0000 1.3 +++ import.log 27 Jan 2005 18:06:15 -0000 1.4 @@ -1,2 +1,3 @@ glunarclock-0_32_1-0_fdr_1_2:HEAD:glunarclock-0.32.1-0.fdr.1.2.src.rpm:1099887972 glunarclock-0_32_2-0_fdr_1_2:FC-2:glunarclock-0.32.2-0.fdr.1.2.src.rpm:1106849018 +glunarclock-0_32_2-1:HEAD:glunarclock-0.32.2-1.src.rpm:1106849165 From fedora-extras-commits at redhat.com Thu Jan 27 18:06:17 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:06:17 -0500 Subject: rpms/glunarclock/devel .cvsignore, 1.2, 1.3 glunarclock.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200501271806.j0RI6H4x005643@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/glunarclock/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv5630/devel Modified Files: .cvsignore glunarclock.spec sources Log Message: auto-import glunarclock-0.32.2-1 on branch devel from glunarclock-0.32.2-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glunarclock/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:26:12 -0000 1.2 +++ .cvsignore 27 Jan 2005 18:06:15 -0000 1.3 @@ -1 +1 @@ -glunarclock-0.32.1.tar.gz +glunarclock-0.32.2.tar.gz Index: glunarclock.spec =================================================================== RCS file: /cvs/extras/rpms/glunarclock/devel/glunarclock.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- glunarclock.spec 10 Dec 2004 22:03:03 -0000 1.2 +++ glunarclock.spec 27 Jan 2005 18:06:15 -0000 1.3 @@ -1,5 +1,5 @@ Name: glunarclock -Version: 0.32.1 +Version: 0.32.2 Release: 1 Epoch: 0 Summary: GNOME applet that displays the current lunar phase @@ -7,7 +7,7 @@ Group: User Interface/Desktops License: GPL URL: http://glunarclock.sourceforge.net/ -Source0: http://download.sourceforge.net/glunarclock/glunarclock-0.32.1.tar.gz +Source0: http://download.sourceforge.net/glunarclock/glunarclock-0.32.2.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel @@ -16,6 +16,7 @@ BuildRequires: gnome-panel BuildRequires: scrollkeeper BuildRequires: gnome-panel-devel +BuildRequires: libxklavier-devel Requires(post): GConf2 Requires(preun): GConf2 Requires(post): scrollkeeper @@ -86,6 +87,9 @@ %changelog +* Sun Jan 16 2005 Marius L. J??hndal - 0:0.32.2-1 +- Updated to 0.32.2. + * Fri Jun 18 2004 Marius L. J??hndal - 0:0.32.1-0.fdr.1 - Updated to 0.32.1. Index: sources =================================================================== RCS file: /cvs/extras/rpms/glunarclock/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:26:12 -0000 1.2 +++ sources 27 Jan 2005 18:06:15 -0000 1.3 @@ -1 +1 @@ -599dbc6074982456ec68d20ca8ff9069 glunarclock-0.32.1.tar.gz +3ac61aa62af4e0d53c90c18f09ee988f glunarclock-0.32.2.tar.gz From fedora-extras-commits at redhat.com Thu Jan 27 18:15:50 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:15:50 -0500 Subject: rpms/fontforge import.log,1.7,1.8 Message-ID: <200501271815.j0RIFoVi005769@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/fontforge In directory cvs.fedora.redhat.com:/tmp/cvs-serv5760 Modified Files: import.log Log Message: auto-import fontforge-0.0-0.fdr.1.20041231.rh90 on branch RHL-9 from fontforge-0.0-0.fdr.1.20041231.rh90.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fontforge/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 8 Nov 2004 04:21:27 -0000 1.7 +++ import.log 27 Jan 2005 18:15:48 -0000 1.8 @@ -4,3 +4,4 @@ fontforge-0_0-0_fdr_1_20040824_rh90:RHL-9:fontforge-0.0-0.fdr.1.20040824.rh90.src.rpm:1099887662 fontforge-0_0-0_fdr_1_20040824_1:FC-1:fontforge-0.0-0.fdr.1.20040824.1.src.rpm:1099887684 fontforge-0_0-0_fdr_1_20040824_2:HEAD:fontforge-0.0-0.fdr.1.20040824.2.src.rpm:1099887687 +fontforge-0_0-0_fdr_1_20041231_rh90:RHL-9:fontforge-0.0-0.fdr.1.20041231.rh90.src.rpm:1106849741 From fedora-extras-commits at redhat.com Thu Jan 27 18:15:50 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:15:50 -0500 Subject: rpms/fontforge/RHL-9 .cvsignore, 1.3, 1.4 fontforge.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200501271815.j0RIFoZG005773@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/fontforge/RHL-9 In directory cvs.fedora.redhat.com:/tmp/cvs-serv5760/RHL-9 Modified Files: .cvsignore fontforge.spec sources Log Message: auto-import fontforge-0.0-0.fdr.1.20041231.rh90 on branch RHL-9 from fontforge-0.0-0.fdr.1.20041231.rh90.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fontforge/RHL-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:21:02 -0000 1.3 +++ .cvsignore 27 Jan 2005 18:15:48 -0000 1.4 @@ -1,2 +1,2 @@ -fontforge_full-20040824.tgz -fontforge_htdocs-20040824.tgz +fontforge_full-20041231.tgz +fontforge_htdocs-20041231.tgz Index: fontforge.spec =================================================================== RCS file: /cvs/extras/rpms/fontforge/RHL-9/fontforge.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fontforge.spec 8 Nov 2004 04:21:02 -0000 1.2 +++ fontforge.spec 27 Jan 2005 18:15:48 -0000 1.3 @@ -1,15 +1,15 @@ Name: fontforge Version: 0.0 -Release: 0.fdr.1.20040824.rh90 +Release: 0.fdr.1.20041231.rh90 Epoch: 0 Summary: An outline and bitmap font editor Group: Applications/Publishing License: BSD URL: http://fontforge.sourceforge.net/ -Source0: http://fontforge.sourceforge.net/fontforge_full-20040824.tgz +Source0: http://dl.sf.net/fontforge/fontforge_full-20041231.tgz Source1: fontforge.desktop -Source2: http://fontforge.sourceforge.net/fontforge_htdocs-20040824.tgz +Source2: http://dl.sf.net/fontforge/fontforge_htdocs-20041231.tgz Source3: pfaicon.gif Patch1: fontforge-20040618-docview.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -34,7 +34,7 @@ (Type2) and CID-keyed fonts. %prep -%setup -q -n fontforge-20040824 +%setup -q -n fontforge-20041231 %patch1 -p2 -b .docview mkdir htdocs @@ -84,6 +84,7 @@ %doc AUTHORS INSTALL LICENSE README htdocs %{_bindir}/* %{_libdir}/*.so.* +%{_libdir}/pkgconfig/fontforge.pc %{_datadir}/applications/*.desktop %{_datadir}/%{name} %{_datadir}/pixmaps/*.png @@ -91,6 +92,12 @@ %changelog +* Mon Jan 17 2005 Marius L. J??hndal - 0:0.0-0.fdr.1.20041231 +- Updated to 20041231. + +* Thu Oct 28 2004 Marius L. J??hndal - 0:0.0-0.fdr.1.20041014 +- Updated to 20041014. + * Sun Sep 19 2004 Marius L. J??hndal - 0:0.0-0.fdr.1.20040824 - Updated to 20040824. Index: sources =================================================================== RCS file: /cvs/extras/rpms/fontforge/RHL-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:21:02 -0000 1.3 +++ sources 27 Jan 2005 18:15:48 -0000 1.4 @@ -1,2 +1,2 @@ -7e589796d0cd715df6db4aab2cd48f7b fontforge_full-20040824.tgz -fade846419ab9c6a78d2194bd4f731a4 fontforge_htdocs-20040824.tgz +5b8668881d9c7474f916ee0dd2f33ba8 fontforge_full-20041231.tgz +bbcf36cae97a6cb7ea86368b22a3f805 fontforge_htdocs-20041231.tgz From fedora-extras-commits at redhat.com Thu Jan 27 18:17:31 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:17:31 -0500 Subject: rpms/fontforge/FC-1 .cvsignore, 1.3, 1.4 fontforge.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200501271817.j0RIHVpo005885@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/fontforge/FC-1 In directory cvs.fedora.redhat.com:/tmp/cvs-serv5871/FC-1 Modified Files: .cvsignore fontforge.spec sources Log Message: auto-import fontforge-0.0-0.fdr.1.20041231.1 on branch FC-1 from fontforge-0.0-0.fdr.1.20041231.1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fontforge/FC-1/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:21:24 -0000 1.3 +++ .cvsignore 27 Jan 2005 18:17:29 -0000 1.4 @@ -1,2 +1,2 @@ -fontforge_full-20040824.tgz -fontforge_htdocs-20040824.tgz +fontforge_full-20041231.tgz +fontforge_htdocs-20041231.tgz Index: fontforge.spec =================================================================== RCS file: /cvs/extras/rpms/fontforge/FC-1/fontforge.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fontforge.spec 8 Nov 2004 04:21:24 -0000 1.3 +++ fontforge.spec 27 Jan 2005 18:17:29 -0000 1.4 @@ -1,15 +1,15 @@ Name: fontforge Version: 0.0 -Release: 0.fdr.1.20040824.1 +Release: 0.fdr.1.20041231.1 Epoch: 0 Summary: An outline and bitmap font editor Group: Applications/Publishing License: BSD URL: http://fontforge.sourceforge.net/ -Source0: http://fontforge.sourceforge.net/fontforge_full-20040824.tgz +Source0: http://dl.sf.net/fontforge/fontforge_full-20041231.tgz Source1: fontforge.desktop -Source2: http://fontforge.sourceforge.net/fontforge_htdocs-20040824.tgz +Source2: http://dl.sf.net/fontforge/fontforge_htdocs-20041231.tgz Source3: pfaicon.gif Patch1: fontforge-20040618-docview.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -34,7 +34,7 @@ (Type2) and CID-keyed fonts. %prep -%setup -q -n fontforge-20040824 +%setup -q -n fontforge-20041231 %patch1 -p2 -b .docview mkdir htdocs @@ -84,6 +84,7 @@ %doc AUTHORS INSTALL LICENSE README htdocs %{_bindir}/* %{_libdir}/*.so.* +%{_libdir}/pkgconfig/fontforge.pc %{_datadir}/applications/*.desktop %{_datadir}/%{name} %{_datadir}/pixmaps/*.png @@ -91,6 +92,12 @@ %changelog +* Mon Jan 17 2005 Marius L. J??hndal - 0:0.0-0.fdr.1.20041231 +- Updated to 20041231. + +* Thu Oct 28 2004 Marius L. J??hndal - 0:0.0-0.fdr.1.20041014 +- Updated to 20041014. + * Sun Sep 19 2004 Marius L. J??hndal - 0:0.0-0.fdr.1.20040824 - Updated to 20040824. Index: sources =================================================================== RCS file: /cvs/extras/rpms/fontforge/FC-1/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:21:24 -0000 1.3 +++ sources 27 Jan 2005 18:17:29 -0000 1.4 @@ -1,2 +1,2 @@ -7e589796d0cd715df6db4aab2cd48f7b fontforge_full-20040824.tgz -fade846419ab9c6a78d2194bd4f731a4 fontforge_htdocs-20040824.tgz +5b8668881d9c7474f916ee0dd2f33ba8 fontforge_full-20041231.tgz +bbcf36cae97a6cb7ea86368b22a3f805 fontforge_htdocs-20041231.tgz From fedora-extras-commits at redhat.com Thu Jan 27 18:17:31 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:17:31 -0500 Subject: rpms/fontforge import.log,1.8,1.9 Message-ID: <200501271817.j0RIHVuR005881@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/fontforge In directory cvs.fedora.redhat.com:/tmp/cvs-serv5871 Modified Files: import.log Log Message: auto-import fontforge-0.0-0.fdr.1.20041231.1 on branch FC-1 from fontforge-0.0-0.fdr.1.20041231.1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fontforge/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 27 Jan 2005 18:15:48 -0000 1.8 +++ import.log 27 Jan 2005 18:17:29 -0000 1.9 @@ -5,3 +5,4 @@ fontforge-0_0-0_fdr_1_20040824_1:FC-1:fontforge-0.0-0.fdr.1.20040824.1.src.rpm:1099887684 fontforge-0_0-0_fdr_1_20040824_2:HEAD:fontforge-0.0-0.fdr.1.20040824.2.src.rpm:1099887687 fontforge-0_0-0_fdr_1_20041231_rh90:RHL-9:fontforge-0.0-0.fdr.1.20041231.rh90.src.rpm:1106849741 +fontforge-0_0-0_fdr_1_20041231_1:FC-1:fontforge-0.0-0.fdr.1.20041231.1.src.rpm:1106849841 From fedora-extras-commits at redhat.com Thu Jan 27 18:18:45 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:18:45 -0500 Subject: rpms/fontforge/FC-2 .cvsignore, 1.3, 1.4 fontforge.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200501271818.j0RIIjvl005999@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/fontforge/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv5989/FC-2 Modified Files: .cvsignore fontforge.spec sources Log Message: auto-import fontforge-0.0-0.fdr.1.20041231.2 on branch FC-2 from fontforge-0.0-0.fdr.1.20041231.2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fontforge/FC-2/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:21:27 -0000 1.3 +++ .cvsignore 27 Jan 2005 18:18:43 -0000 1.4 @@ -1,2 +1,2 @@ -fontforge_full-20040824.tgz -fontforge_htdocs-20040824.tgz +fontforge_full-20041231.tgz +fontforge_htdocs-20041231.tgz Index: fontforge.spec =================================================================== RCS file: /cvs/extras/rpms/fontforge/FC-2/fontforge.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fontforge.spec 8 Nov 2004 04:21:27 -0000 1.4 +++ fontforge.spec 27 Jan 2005 18:18:43 -0000 1.5 @@ -1,15 +1,15 @@ Name: fontforge Version: 0.0 -Release: 0.fdr.1.20040824.2 +Release: 0.fdr.1.20041231.2 Epoch: 0 Summary: An outline and bitmap font editor Group: Applications/Publishing License: BSD URL: http://fontforge.sourceforge.net/ -Source0: http://fontforge.sourceforge.net/fontforge_full-20040824.tgz +Source0: http://dl.sf.net/fontforge/fontforge_full-20041231.tgz Source1: fontforge.desktop -Source2: http://fontforge.sourceforge.net/fontforge_htdocs-20040824.tgz +Source2: http://dl.sf.net/fontforge/fontforge_htdocs-20041231.tgz Source3: pfaicon.gif Patch1: fontforge-20040618-docview.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -34,7 +34,7 @@ (Type2) and CID-keyed fonts. %prep -%setup -q -n fontforge-20040824 +%setup -q -n fontforge-20041231 %patch1 -p2 -b .docview mkdir htdocs @@ -84,6 +84,7 @@ %doc AUTHORS INSTALL LICENSE README htdocs %{_bindir}/* %{_libdir}/*.so.* +%{_libdir}/pkgconfig/fontforge.pc %{_datadir}/applications/*.desktop %{_datadir}/%{name} %{_datadir}/pixmaps/*.png @@ -91,6 +92,12 @@ %changelog +* Mon Jan 17 2005 Marius L. J??hndal - 0:0.0-0.fdr.1.20041231 +- Updated to 20041231. + +* Thu Oct 28 2004 Marius L. J??hndal - 0:0.0-0.fdr.1.20041014 +- Updated to 20041014. + * Sun Sep 19 2004 Marius L. J??hndal - 0:0.0-0.fdr.1.20040824 - Updated to 20040824. Index: sources =================================================================== RCS file: /cvs/extras/rpms/fontforge/FC-2/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:21:27 -0000 1.3 +++ sources 27 Jan 2005 18:18:43 -0000 1.4 @@ -1,2 +1,2 @@ -7e589796d0cd715df6db4aab2cd48f7b fontforge_full-20040824.tgz -fade846419ab9c6a78d2194bd4f731a4 fontforge_htdocs-20040824.tgz +5b8668881d9c7474f916ee0dd2f33ba8 fontforge_full-20041231.tgz +bbcf36cae97a6cb7ea86368b22a3f805 fontforge_htdocs-20041231.tgz From fedora-extras-commits at redhat.com Thu Jan 27 18:18:45 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:18:45 -0500 Subject: rpms/fontforge import.log,1.9,1.10 Message-ID: <200501271818.j0RIIjtg006003@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/fontforge In directory cvs.fedora.redhat.com:/tmp/cvs-serv5989 Modified Files: import.log Log Message: auto-import fontforge-0.0-0.fdr.1.20041231.2 on branch FC-2 from fontforge-0.0-0.fdr.1.20041231.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fontforge/import.log,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- import.log 27 Jan 2005 18:17:29 -0000 1.9 +++ import.log 27 Jan 2005 18:18:42 -0000 1.10 @@ -6,3 +6,4 @@ fontforge-0_0-0_fdr_1_20040824_2:HEAD:fontforge-0.0-0.fdr.1.20040824.2.src.rpm:1099887687 fontforge-0_0-0_fdr_1_20041231_rh90:RHL-9:fontforge-0.0-0.fdr.1.20041231.rh90.src.rpm:1106849741 fontforge-0_0-0_fdr_1_20041231_1:FC-1:fontforge-0.0-0.fdr.1.20041231.1.src.rpm:1106849841 +fontforge-0_0-0_fdr_1_20041231_2:FC-2:fontforge-0.0-0.fdr.1.20041231.2.src.rpm:1106849914 From fedora-extras-commits at redhat.com Thu Jan 27 18:19:48 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:19:48 -0500 Subject: rpms/fontforge import.log,1.10,1.11 Message-ID: <200501271819.j0RIJmK9006116@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/fontforge In directory cvs.fedora.redhat.com:/tmp/cvs-serv6107 Modified Files: import.log Log Message: auto-import fontforge-0.0-1.20041231 on branch devel from fontforge-0.0-1.20041231.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fontforge/import.log,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- import.log 27 Jan 2005 18:18:42 -0000 1.10 +++ import.log 27 Jan 2005 18:19:46 -0000 1.11 @@ -7,3 +7,4 @@ fontforge-0_0-0_fdr_1_20041231_rh90:RHL-9:fontforge-0.0-0.fdr.1.20041231.rh90.src.rpm:1106849741 fontforge-0_0-0_fdr_1_20041231_1:FC-1:fontforge-0.0-0.fdr.1.20041231.1.src.rpm:1106849841 fontforge-0_0-0_fdr_1_20041231_2:FC-2:fontforge-0.0-0.fdr.1.20041231.2.src.rpm:1106849914 +fontforge-0_0-1_20041231:HEAD:fontforge-0.0-1.20041231.src.rpm:1106849979 From fedora-extras-commits at redhat.com Thu Jan 27 18:19:48 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:19:48 -0500 Subject: rpms/fontforge/devel .cvsignore, 1.3, 1.4 fontforge.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200501271819.j0RIJmQe006121@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/fontforge/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv6107/devel Modified Files: .cvsignore fontforge.spec sources Log Message: auto-import fontforge-0.0-1.20041231 on branch devel from fontforge-0.0-1.20041231.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fontforge/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:21:27 -0000 1.3 +++ .cvsignore 27 Jan 2005 18:19:46 -0000 1.4 @@ -1,2 +1,2 @@ -fontforge_full-20040824.tgz -fontforge_htdocs-20040824.tgz +fontforge_full-20041231.tgz +fontforge_htdocs-20041231.tgz Index: fontforge.spec =================================================================== RCS file: /cvs/extras/rpms/fontforge/devel/fontforge.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fontforge.spec 10 Dec 2004 22:03:02 -0000 1.5 +++ fontforge.spec 27 Jan 2005 18:19:46 -0000 1.6 @@ -1,15 +1,15 @@ Name: fontforge Version: 0.0 -Release: 1.20040824 +Release: 1.20041231 Epoch: 0 Summary: An outline and bitmap font editor Group: Applications/Publishing License: BSD URL: http://fontforge.sourceforge.net/ -Source0: http://fontforge.sourceforge.net/fontforge_full-20040824.tgz +Source0: http://dl.sf.net/fontforge/fontforge_full-20041231.tgz Source1: fontforge.desktop -Source2: http://fontforge.sourceforge.net/fontforge_htdocs-20040824.tgz +Source2: http://dl.sf.net/fontforge/fontforge_htdocs-20041231.tgz Source3: pfaicon.gif Patch1: fontforge-20040618-docview.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -34,7 +34,7 @@ (Type2) and CID-keyed fonts. %prep -%setup -q -n fontforge-20040824 +%setup -q -n fontforge-20041231 %patch1 -p2 -b .docview mkdir htdocs @@ -84,6 +84,7 @@ %doc AUTHORS INSTALL LICENSE README htdocs %{_bindir}/* %{_libdir}/*.so.* +%{_libdir}/pkgconfig/fontforge.pc %{_datadir}/applications/*.desktop %{_datadir}/%{name} %{_datadir}/pixmaps/*.png @@ -91,6 +92,12 @@ %changelog +* Mon Jan 17 2005 Marius L. J??hndal - 0:0.0-1.20041231 +- Updated to 20041231. + +* Thu Oct 28 2004 Marius L. J??hndal - 0:0.0-0.fdr.1.20041014 +- Updated to 20041014. + * Sun Sep 19 2004 Marius L. J??hndal - 0:0.0-0.fdr.1.20040824 - Updated to 20040824. Index: sources =================================================================== RCS file: /cvs/extras/rpms/fontforge/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:21:27 -0000 1.3 +++ sources 27 Jan 2005 18:19:46 -0000 1.4 @@ -1,2 +1,2 @@ -7e589796d0cd715df6db4aab2cd48f7b fontforge_full-20040824.tgz -fade846419ab9c6a78d2194bd4f731a4 fontforge_htdocs-20040824.tgz +5b8668881d9c7474f916ee0dd2f33ba8 fontforge_full-20041231.tgz +bbcf36cae97a6cb7ea86368b22a3f805 fontforge_htdocs-20041231.tgz From fedora-extras-commits at redhat.com Thu Jan 27 18:27:08 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:27:08 -0500 Subject: rpms/stellarium import.log,1.3,1.4 Message-ID: <200501271827.j0RIR8Oo006264@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/stellarium In directory cvs.fedora.redhat.com:/tmp/cvs-serv6255 Modified Files: import.log Log Message: auto-import stellarium-0.6.2-0.fdr.2.1 on branch FC-1 from stellarium-0.6.2-0.fdr.2.1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/stellarium/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 8 Nov 2004 05:22:20 -0000 1.3 +++ import.log 27 Jan 2005 18:27:06 -0000 1.4 @@ -1,2 +1,3 @@ stellarium-0_6_0-0_fdr_2_1:HEAD:stellarium-0.6.0-0.fdr.2.1.src.rpm:1099891334 stellarium-0_6_0-0_fdr_2_2:HEAD:stellarium-0.6.0-0.fdr.2.2.src.rpm:1099891340 +stellarium-0_6_2-0_fdr_2_1:FC-1:stellarium-0.6.2-0.fdr.2.1.src.rpm:1106850417 From fedora-extras-commits at redhat.com Thu Jan 27 18:27:09 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:27:09 -0500 Subject: rpms/stellarium/FC-1 stellarium-0.6.2-optflags.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.3, 1.4 stellarium.spec, 1.3, 1.4 stellarium-0.6.0-optflags.patch, 1.1, NONE Message-ID: <200501271827.j0RIR9ds006268@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/stellarium/FC-1 In directory cvs.fedora.redhat.com:/tmp/cvs-serv6255/FC-1 Modified Files: .cvsignore sources stellarium.spec Added Files: stellarium-0.6.2-optflags.patch Removed Files: stellarium-0.6.0-optflags.patch Log Message: auto-import stellarium-0.6.2-0.fdr.2.1 on branch FC-1 from stellarium-0.6.2-0.fdr.2.1.src.rpm stellarium-0.6.2-optflags.patch: --- NEW FILE stellarium-0.6.2-optflags.patch --- --- /home/mlj/rpm/BUILD/stellarium-0.6.2/configure.orig 2005-01-16 18:57:29.298619223 +0100 +++ /home/mlj/rpm/BUILD/stellarium-0.6.2/configure 2005-01-16 18:57:36.281755258 +0100 @@ -3341,8 +3341,6 @@ -CFLAGS=" -Wall -O3" -CXXFLAGS=" -Wall -O3" ac_ext=c ac_cpp='$CPP $CPPFLAGS' Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-1/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:22:14 -0000 1.2 +++ .cvsignore 27 Jan 2005 18:27:06 -0000 1.3 @@ -1 +1 @@ -stellarium-0.6.0.tar.gz +stellarium-0.6.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-1/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Nov 2004 04:30:10 -0000 1.3 +++ sources 27 Jan 2005 18:27:06 -0000 1.4 @@ -1 +1 @@ -1065f8ba5a47c7b91997e8bf78d7549e stellarium-0.6.1.tar.gz +f00e99b88f53273419683cf18905e39c stellarium-0.6.2.tar.gz Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-1/stellarium.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- stellarium.spec 28 Nov 2004 04:34:46 -0000 1.3 +++ stellarium.spec 27 Jan 2005 18:27:07 -0000 1.4 @@ -1,15 +1,15 @@ Name: stellarium -Version: 0.6.1 -Release: 0.fdr.1.1 +Version: 0.6.2 +Release: 0.fdr.2.1 Epoch: 0 Summary: A photo-realistic nightsky renderer Group: Amusements/Graphics License: GPL URL: http://stellarium.free.fr/ -Source0: http://dl.sf.net/stellarium/stellarium-0.6.1.tar.gz +Source0: http://dl.sf.net/stellarium/stellarium-0.6.2.tar.gz Source1: stellarium.desktop -Patch0: stellarium-0.6.0-optflags.patch +Patch0: stellarium-0.6.2-optflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel @@ -25,7 +25,7 @@ %prep %setup -q -%patch0 -p0 +%patch0 -p6 %build @@ -66,6 +66,12 @@ %changelog +* Sun Jan 23 2005 Marius L. J??hndal - 0:0.6.2-0.fdr.2 +- Fixed broken patch. + +* Sun Jan 16 2005 Marius L. J??hndal - 0:0.6.2-0.fdr.1 +- Updated to 0.6.2. + * Sun Oct 17 2004 Marius L. J??hndal - 0:0.6.1-0.fdr.1 - Updated to 0.6.1. --- stellarium-0.6.0-optflags.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jan 27 18:28:23 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:28:23 -0500 Subject: rpms/stellarium import.log,1.4,1.5 Message-ID: <200501271828.j0RISNoa006388@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/stellarium In directory cvs.fedora.redhat.com:/tmp/cvs-serv6379 Modified Files: import.log Log Message: auto-import stellarium-0.6.2-0.fdr.2.2 on branch FC-2 from stellarium-0.6.2-0.fdr.2.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/stellarium/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 27 Jan 2005 18:27:06 -0000 1.4 +++ import.log 27 Jan 2005 18:28:21 -0000 1.5 @@ -1,3 +1,4 @@ stellarium-0_6_0-0_fdr_2_1:HEAD:stellarium-0.6.0-0.fdr.2.1.src.rpm:1099891334 stellarium-0_6_0-0_fdr_2_2:HEAD:stellarium-0.6.0-0.fdr.2.2.src.rpm:1099891340 stellarium-0_6_2-0_fdr_2_1:FC-1:stellarium-0.6.2-0.fdr.2.1.src.rpm:1106850417 +stellarium-0_6_2-0_fdr_2_2:FC-2:stellarium-0.6.2-0.fdr.2.2.src.rpm:1106850493 From fedora-extras-commits at redhat.com Thu Jan 27 18:28:23 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:28:23 -0500 Subject: rpms/stellarium/FC-2 stellarium-0.6.2-optflags.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.3, 1.4 stellarium.spec, 1.4, 1.5 stellarium-0.6.0-optflags.patch, 1.1, NONE Message-ID: <200501271828.j0RISN3M006392@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/stellarium/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv6379/FC-2 Modified Files: .cvsignore sources stellarium.spec Added Files: stellarium-0.6.2-optflags.patch Removed Files: stellarium-0.6.0-optflags.patch Log Message: auto-import stellarium-0.6.2-0.fdr.2.2 on branch FC-2 from stellarium-0.6.2-0.fdr.2.2.src.rpm stellarium-0.6.2-optflags.patch: --- NEW FILE stellarium-0.6.2-optflags.patch --- --- /home/mlj/rpm/BUILD/stellarium-0.6.2/configure.orig 2005-01-16 18:57:29.298619223 +0100 +++ /home/mlj/rpm/BUILD/stellarium-0.6.2/configure 2005-01-16 18:57:36.281755258 +0100 @@ -3341,8 +3341,6 @@ -CFLAGS=" -Wall -O3" -CXXFLAGS=" -Wall -O3" ac_ext=c ac_cpp='$CPP $CPPFLAGS' Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-2/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:22:14 -0000 1.2 +++ .cvsignore 27 Jan 2005 18:28:21 -0000 1.3 @@ -1 +1 @@ -stellarium-0.6.0.tar.gz +stellarium-0.6.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-2/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Nov 2004 04:30:10 -0000 1.3 +++ sources 27 Jan 2005 18:28:21 -0000 1.4 @@ -1 +1 @@ -1065f8ba5a47c7b91997e8bf78d7549e stellarium-0.6.1.tar.gz +f00e99b88f53273419683cf18905e39c stellarium-0.6.2.tar.gz Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-2/stellarium.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- stellarium.spec 28 Nov 2004 04:34:46 -0000 1.4 +++ stellarium.spec 27 Jan 2005 18:28:21 -0000 1.5 @@ -1,15 +1,15 @@ Name: stellarium -Version: 0.6.1 -Release: 0.fdr.1.2 +Version: 0.6.2 +Release: 0.fdr.2.2 Epoch: 0 Summary: A photo-realistic nightsky renderer Group: Amusements/Graphics License: GPL URL: http://stellarium.free.fr/ -Source0: http://dl.sf.net/stellarium/stellarium-0.6.1.tar.gz +Source0: http://dl.sf.net/stellarium/stellarium-0.6.2.tar.gz Source1: stellarium.desktop -Patch0: stellarium-0.6.0-optflags.patch +Patch0: stellarium-0.6.2-optflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel @@ -25,7 +25,7 @@ %prep %setup -q -%patch0 -p0 +%patch0 -p6 %build @@ -66,6 +66,12 @@ %changelog +* Sun Jan 23 2005 Marius L. J??hndal - 0:0.6.2-0.fdr.2 +- Fixed broken patch. + +* Sun Jan 16 2005 Marius L. J??hndal - 0:0.6.2-0.fdr.1 +- Updated to 0.6.2. + * Sun Oct 17 2004 Marius L. J??hndal - 0:0.6.1-0.fdr.1 - Updated to 0.6.1. --- stellarium-0.6.0-optflags.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jan 27 18:29:17 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:29:17 -0500 Subject: rpms/stellarium import.log,1.5,1.6 Message-ID: <200501271829.j0RITHVK006519@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/stellarium In directory cvs.fedora.redhat.com:/tmp/cvs-serv6510 Modified Files: import.log Log Message: auto-import stellarium-0.6.2-2 on branch devel from stellarium-0.6.2-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/stellarium/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 27 Jan 2005 18:28:21 -0000 1.5 +++ import.log 27 Jan 2005 18:29:15 -0000 1.6 @@ -2,3 +2,4 @@ stellarium-0_6_0-0_fdr_2_2:HEAD:stellarium-0.6.0-0.fdr.2.2.src.rpm:1099891340 stellarium-0_6_2-0_fdr_2_1:FC-1:stellarium-0.6.2-0.fdr.2.1.src.rpm:1106850417 stellarium-0_6_2-0_fdr_2_2:FC-2:stellarium-0.6.2-0.fdr.2.2.src.rpm:1106850493 +stellarium-0_6_2-2:HEAD:stellarium-0.6.2-2.src.rpm:1106850548 From fedora-extras-commits at redhat.com Thu Jan 27 18:29:17 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 27 Jan 2005 13:29:17 -0500 Subject: rpms/stellarium/devel stellarium-0.6.2-optflags.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 stellarium.spec, 1.3, 1.4 stellarium-0.6.0-optflags.patch, 1.1, NONE Message-ID: <200501271829.j0RITHW6006523@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/stellarium/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv6510/devel Modified Files: .cvsignore sources stellarium.spec Added Files: stellarium-0.6.2-optflags.patch Removed Files: stellarium-0.6.0-optflags.patch Log Message: auto-import stellarium-0.6.2-2 on branch devel from stellarium-0.6.2-2.src.rpm stellarium-0.6.2-optflags.patch: --- NEW FILE stellarium-0.6.2-optflags.patch --- --- /home/mlj/rpm/BUILD/stellarium-0.6.2/configure.orig 2005-01-16 18:57:29.298619223 +0100 +++ /home/mlj/rpm/BUILD/stellarium-0.6.2/configure 2005-01-16 18:57:36.281755258 +0100 @@ -3341,8 +3341,6 @@ -CFLAGS=" -Wall -O3" -CXXFLAGS=" -Wall -O3" ac_ext=c ac_cpp='$CPP $CPPFLAGS' Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/stellarium/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 26 Nov 2004 08:21:16 -0000 1.3 +++ .cvsignore 27 Jan 2005 18:29:15 -0000 1.4 @@ -1 +1 @@ -stellarium-0.6.1.tar.gz +stellarium-0.6.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/stellarium/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 26 Nov 2004 08:21:16 -0000 1.3 +++ sources 27 Jan 2005 18:29:15 -0000 1.4 @@ -1 +1 @@ -1065f8ba5a47c7b91997e8bf78d7549e stellarium-0.6.1.tar.gz +f00e99b88f53273419683cf18905e39c stellarium-0.6.2.tar.gz Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- stellarium.spec 26 Nov 2004 08:21:16 -0000 1.3 +++ stellarium.spec 27 Jan 2005 18:29:15 -0000 1.4 @@ -1,15 +1,15 @@ Name: stellarium -Version: 0.6.1 -Release: 1 +Version: 0.6.2 +Release: 2 Epoch: 0 Summary: A photo-realistic nightsky renderer Group: Amusements/Graphics License: GPL URL: http://stellarium.free.fr/ -Source0: http://dl.sf.net/stellarium/stellarium-0.6.1.tar.gz +Source0: http://dl.sf.net/stellarium/stellarium-0.6.2.tar.gz Source1: stellarium.desktop -Patch0: stellarium-0.6.0-optflags.patch +Patch0: stellarium-0.6.2-optflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel @@ -25,7 +25,7 @@ %prep %setup -q -%patch0 -p0 +%patch0 -p6 %build @@ -66,7 +66,13 @@ %changelog -* Sun Oct 17 2004 Marius L. J??hndal - 0:0.6.1-1 +* Sun Jan 23 2005 Marius L. J??hndal - 0:0.6.2-2 +- Fixed broken patch. + +* Sun Jan 16 2005 Marius L. J??hndal - 0:0.6.2-0.fdr.1 +- Updated to 0.6.2. + +* Sun Oct 17 2004 Marius L. J??hndal - 0:0.6.1-0.fdr.1 - Updated to 0.6.1. * Sat Aug 21 2004 Marius L. J??hndal - 0:0.6.0-0.fdr.2 --- stellarium-0.6.0-optflags.patch DELETED --- From dag at wieers.com Thu Jan 27 19:10:28 2005 From: dag at wieers.com (Dag Wieers) Date: Thu, 27 Jan 2005 20:10:28 +0100 (CET) Subject: Python site-packages tricks (was: Re: rpms/scons/devel scons.spec,1.3,1.4) In-Reply-To: <1106809734.6477.186.camel@bobcat.mine.nu> References: <200501251838.j0PIcPlq025242@cvs.fedora.redhat.com> <20050125202142.17ddc3fa@python2> <1106681796.5911.2.camel@localhost.localdomain> <1106690988.6477.76.camel@bobcat.mine.nu> <1106809734.6477.186.camel@bobcat.mine.nu> Message-ID: On Thu, 27 Jan 2005, Ville Skytt? wrote: > On Wed, 2005-01-26 at 19:44 +0100, Dag Wieers wrote: > > On Wed, 26 Jan 2005, Ville Skytt? wrote: > > > > Anyway the idea is to find out the dirs where Python's distutils will > > > install stuff into by asking Python and using those in %files instead of > > > inventing/hardcoding the dirs oneself. > > > > We're using the following macros for that: > > > > %define python_sitearch %(python -c 'from distutils import sysconfig; print sysconfig.get_python_lib()') > > %define python_sitelib %(python -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)') > > > > Is this what you are using too ? > > Almost. Your version above has the argument to get_python_lib reversed; > with no arguments it returns the arch-independent path ("sitelib"), and > with 1 the arch-dependent path ("sitearch"). Additionally, your version > uses "python" instead of "%{__python}" which takes away a bit of the > flexibility. > > Here's what's in fedora-rpmdevtools' spectemplate-python.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)")} Yes, I was using %{python_dir} for both, but using different names like perl makes much more sense. -- dag wieers, dag at wieers.com, http://dag.wieers.com/ -- [all I want is a warm bed and a kind word and unlimited power] From fedora-extras-commits at redhat.com Fri Jan 28 00:48:11 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 27 Jan 2005 19:48:11 -0500 Subject: rpms/gnome-vfsmm26/devel gnome-vfsmm.spec,1.2,1.3 sources,1.2,1.3 Message-ID: <200501280048.j0S0mBcp011118@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gnome-vfsmm26/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv11112 Modified Files: gnome-vfsmm.spec sources Log Message: Merge patches from Thorsten. Index: gnome-vfsmm.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-vfsmm26/devel/gnome-vfsmm.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gnome-vfsmm.spec 10 Dec 2004 22:03:03 -0000 1.2 +++ gnome-vfsmm.spec 28 Jan 2005 00:48:09 -0000 1.3 @@ -1,6 +1,6 @@ Name: gnome-vfsmm26 Version: 2.6.1 -Release: 1 +Release: 2 Epoch: 0 Summary: C++ wrapper for gnome-vfs @@ -8,6 +8,7 @@ License: LGPL URL: http://gtkmm.sourceforge.net/ Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-vfsmm/2.6/gnome-vfsmm-%{version}.tar.bz2 +Patch0: gnome-vfsmm-2.6.1-autoreconf.patch.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -33,7 +34,10 @@ %prep %setup -q -n gnome-vfsmm-%{version} - +%ifarch x86_64 +# Patch was build after: aclocal -I scripts && automake -c -f && autoconf && libtoolize --copy --force +%patch0 -p1 +%endif %build %configure --enable-static @@ -72,6 +76,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Thu Jan 27 2005 Thorsten Leemhuis - 0:2.6.1-2 +- Add autoreconf patch; fixes build on x86_64 + * Mon Jun 27 2004 Denis Leroy - 0:2.6.1-0.fdr.1 - Upgrade to 2.6.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-vfsmm26/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:28:19 -0000 1.2 +++ sources 28 Jan 2005 00:48:09 -0000 1.3 @@ -1 +1,2 @@ a0f8006f7336b211f160224fddaf86e1 gnome-vfsmm-2.6.1.tar.bz2 +401d20708378a66e5c52e29c16c770e2 gnome-vfsmm-2.6.1-autoreconf.patch.bz2 From fedora-extras-commits at redhat.com Fri Jan 28 15:28:42 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 28 Jan 2005 10:28:42 -0500 Subject: rpms/liferea/devel liferea.desktop,1.1,NONE Message-ID: <200501281528.j0SFSgx0022548@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/liferea/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22542 Removed Files: liferea.desktop Log Message: commit removal --- liferea.desktop DELETED --- From fedora-extras-commits at redhat.com Fri Jan 28 15:55:54 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 28 Jan 2005 10:55:54 -0500 Subject: rpms/gazpacho/devel - New directory Message-ID: <200501281555.j0SFtsT7022767@cvs.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/gazpacho/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22753/gazpacho/devel Log Message: Directory /cvs/extras/rpms/gazpacho/devel added to the repository From fedora-extras-commits at redhat.com Fri Jan 28 15:55:54 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 28 Jan 2005 10:55:54 -0500 Subject: rpms/gazpacho - New directory Message-ID: <200501281555.j0SFtsh4022768@cvs.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/gazpacho In directory cvs.fedora.redhat.com:/tmp/cvs-serv22753/gazpacho Log Message: Directory /cvs/extras/rpms/gazpacho added to the repository From fedora-extras-commits at redhat.com Fri Jan 28 15:56:12 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 28 Jan 2005 10:56:12 -0500 Subject: rpms/gazpacho Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501281556.j0SFuCRx022846@cvs.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/gazpacho In directory cvs.fedora.redhat.com:/tmp/cvs-serv22829 Added Files: Makefile import.log Log Message: Setup of module gazpacho --- NEW FILE Makefile --- # Top level Makefile for module gazpacho all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 28 15:56:12 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 28 Jan 2005 10:56:12 -0500 Subject: rpms/gazpacho/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501281556.j0SFuCiC022849@cvs.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/gazpacho/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22829/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gazpacho --- NEW 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 Jan 28 15:56:34 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 28 Jan 2005 10:56:34 -0500 Subject: rpms/gazpacho import.log,1.1,1.2 Message-ID: <200501281556.j0SFuY2x022978@cvs.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/gazpacho In directory cvs.fedora.redhat.com:/tmp/cvs-serv22963 Modified Files: import.log Log Message: auto-import gazpacho-0.4.0-1 on branch devel from gazpacho-0.4.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gazpacho/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 Jan 2005 15:56:10 -0000 1.1 +++ import.log 28 Jan 2005 15:56:32 -0000 1.2 @@ -0,0 +1 @@ +gazpacho-0_4_0-1:HEAD:gazpacho-0.4.0-1.src.rpm:1106927789 From fedora-extras-commits at redhat.com Fri Jan 28 15:56:34 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 28 Jan 2005 10:56:34 -0500 Subject: rpms/gazpacho/devel gazpacho.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501281556.j0SFuYMv022982@cvs.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/gazpacho/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv22963/devel Modified Files: .cvsignore sources Added Files: gazpacho.spec Log Message: auto-import gazpacho-0.4.0-1 on branch devel from gazpacho-0.4.0-1.src.rpm --- NEW FILE gazpacho.spec --- Summary: Glade Interface Creater Name: gazpacho Version: 0.4.0 Release: 1 License: GPL Group: Development/Tools URL: http://gruppy.sicem.biz/descargas Provides: Gazpacho = %{version}-%{release} Source0: Gazpacho-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch Requires: pygtk2 >= 2.4.0, pygtk2-libglade %description This program allows you to create the Graphical User Interface (GUI) of your GTK+ program in a visual way. Yes, it is a Glade-3 clone. It is compatible with libglade. %prep %setup -q -n Gazpacho-%{version} %build python ./setup.py build %install rm -rf $RPM_BUILD_ROOT python ./setup.py install -O1 --root=$RPM_BUILD_ROOT \ --record=INSTALLED_FILES sed 's|^\(.*\.pyo\)$|%ghost \1|' < INSTALLED_FILES > %{name}-%{version}.files find $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages/* -type d \ | sed "s|^$RPM_BUILD_ROOT|%dir |" >> %{name}-%{version}.files %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}-%{version}.files %defattr(-,root,root,-) %doc README COPYING NEWS %changelog * Fri Jan 28 2005 Jeremy Katz - 0.4.0-1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gazpacho/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Jan 2005 15:56:10 -0000 1.1 +++ .cvsignore 28 Jan 2005 15:56:32 -0000 1.2 @@ -0,0 +1 @@ +Gazpacho-0.4.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gazpacho/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Jan 2005 15:56:10 -0000 1.1 +++ sources 28 Jan 2005 15:56:32 -0000 1.2 @@ -0,0 +1 @@ +b0f037944b7d100ed5991679b4728cac Gazpacho-0.4.0.tar.bz2 From fedora-extras-commits at redhat.com Fri Jan 28 16:21:58 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:21:58 -0500 Subject: rpms/php-eaccelerator - New directory Message-ID: <200501281621.j0SGLwlZ023754@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator In directory cvs.fedora.redhat.com:/tmp/cvs-serv23747/php-eaccelerator Log Message: Directory /cvs/extras/rpms/php-eaccelerator added to the repository From fedora-extras-commits at redhat.com Fri Jan 28 16:21:58 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:21:58 -0500 Subject: rpms/php-eaccelerator/devel - New directory Message-ID: <200501281621.j0SGLwM2023757@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv23747/php-eaccelerator/devel Log Message: Directory /cvs/extras/rpms/php-eaccelerator/devel added to the repository From fedora-extras-commits at redhat.com Fri Jan 28 16:22:18 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:22:18 -0500 Subject: rpms/php-eaccelerator Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501281622.j0SGMIiX023816@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator In directory cvs.fedora.redhat.com:/tmp/cvs-serv23807 Added Files: Makefile import.log Log Message: Setup of module php-eaccelerator --- NEW FILE Makefile --- # Top level Makefile for module php-eaccelerator all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 28 16:22:18 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:22:18 -0500 Subject: rpms/php-eaccelerator/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501281622.j0SGMIv2023819@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv23807/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module php-eaccelerator --- NEW 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 Jan 28 16:22:54 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:22:54 -0500 Subject: rpms/php-eaccelerator import.log,1.1,1.2 Message-ID: <200501281622.j0SGMsDN023913@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator In directory cvs.fedora.redhat.com:/tmp/cvs-serv23903 Modified Files: import.log Log Message: auto-import php-eaccelerator-4.3.10_0.9.2a-1 on branch devel from php-eaccelerator-4.3.10_0.9.2a-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 Jan 2005 16:22:16 -0000 1.1 +++ import.log 28 Jan 2005 16:22:52 -0000 1.2 @@ -0,0 +1 @@ +php-eaccelerator-4_3_10_0_9_2a-1:HEAD:php-eaccelerator-4.3.10_0.9.2a-1.src.rpm:1106929365 From fedora-extras-commits at redhat.com Fri Jan 28 16:22:54 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:22:54 -0500 Subject: rpms/php-eaccelerator/devel php-eaccelerator.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501281622.j0SGMss0023916@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv23903/devel Modified Files: .cvsignore sources Added Files: php-eaccelerator.spec Log Message: auto-import php-eaccelerator-4.3.10_0.9.2a-1 on branch devel from php-eaccelerator-4.3.10_0.9.2a-1.src.rpm --- NEW FILE php-eaccelerator.spec --- %define php_extdir %(php-config --extension-dir 2>/dev/null || echo /usr/lib/php4) %{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo 4.3.10)} %define module_version 0.9.2a Summary: PHP accelerator, optimizer, encoder and dynamic content cacher Name: php-eaccelerator Version: %{php_version}_%{module_version} Release: 1 License: GPL Group: Development/Languages URL: http://eaccelerator.sourceforge.net/ Source: http://dl.sf.net/eaccelerator/eaccelerator-%{module_version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: php = %{php_version} Provides: php-zend_extension Conflicts: php-mmcache BuildRequires: php, php-devel # Required by phpize BuildRequires: autoconf, automake, libtool, gcc-c++ %description eAccelerator is a further development of the MMCache PHP Accelerator & Encoder. It increases performance of PHP scripts by caching them in compiled state, so that the overhead of compiling is almost completely eliminated. %prep %setup -n eaccelerator %build phpize %configure %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} %{__make} install INSTALL_ROOT=%{buildroot} # The cache directory where pre-compiled files will reside %{__mkdir_p} %{buildroot}%{_localstatedir}/cache/php-eaccelerator # Drop in the bit of configuration %{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d %{__cat} > %{buildroot}%{_sysconfdir}/php.d/eaccelerator.ini << 'EOF' ; Enable eAccelerator extension module zend_extension = %{php_extdir}/eaccelerator.so ; Options for the eAccelerator module eaccelerator.cache_dir = %{_localstatedir}/cache/php-eaccelerator eaccelerator.shm_size = 0 eaccelerator.enable = 1 eaccelerator.optimizer = 1 eaccelerator.check_mtime = 1 eaccelerator.filter = "" eaccelerator.shm_max = 0 eaccelerator.shm_ttl = 3600 eaccelerator.shm_prune_period = 0 eaccelerator.shm_only = 0 eaccelerator.compress = 1 eaccelerator.compress_level = 9 eaccelerator.debug = 0 EOF %clean %{__rm} -rf %{buildroot} %files %defattr(-, root, root, 0755) %doc AUTHORS ChangeLog COPYING NEWS README* %doc eaccelerator.ini *.php %config(noreplace) %{_sysconfdir}/php.d/eaccelerator.ini %{php_extdir}/eaccelerator.so %attr(0750, apache, apache) %{_localstatedir}/cache/php-eaccelerator %changelog * Tue Jan 11 2005 Matthias Saou 4.x.x_0.9.2a-0 - Initial RPM release based on the php-mmcache spec file. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Jan 2005 16:22:16 -0000 1.1 +++ .cvsignore 28 Jan 2005 16:22:52 -0000 1.2 @@ -0,0 +1 @@ +eaccelerator-0.9.2a.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Jan 2005 16:22:16 -0000 1.1 +++ sources 28 Jan 2005 16:22:52 -0000 1.2 @@ -0,0 +1 @@ +e9059ebd49f14835534a1d96a97ababd eaccelerator-0.9.2a.tar.gz From fedora-extras-commits at redhat.com Fri Jan 28 16:29:17 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:29:17 -0500 Subject: rpms/SDL_gfx - New directory Message-ID: <200501281629.j0SGTHpB024041@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/SDL_gfx In directory cvs.fedora.redhat.com:/tmp/cvs-serv24034/SDL_gfx Log Message: Directory /cvs/extras/rpms/SDL_gfx added to the repository From fedora-extras-commits at redhat.com Fri Jan 28 16:29:17 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:29:17 -0500 Subject: rpms/SDL_gfx/devel - New directory Message-ID: <200501281629.j0SGTHcS024044@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/SDL_gfx/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24034/SDL_gfx/devel Log Message: Directory /cvs/extras/rpms/SDL_gfx/devel added to the repository From fedora-extras-commits at redhat.com Fri Jan 28 16:29:34 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:29:34 -0500 Subject: rpms/SDL_gfx Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501281629.j0SGTYxG024103@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/SDL_gfx In directory cvs.fedora.redhat.com:/tmp/cvs-serv24094 Added Files: Makefile import.log Log Message: Setup of module SDL_gfx --- NEW FILE Makefile --- # Top level Makefile for module SDL_gfx all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 28 16:29:34 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:29:34 -0500 Subject: rpms/SDL_gfx/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501281629.j0SGTYwv024106@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/SDL_gfx/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24094/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module SDL_gfx --- NEW 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 Jan 28 16:30:10 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:30:10 -0500 Subject: rpms/SDL_gfx import.log,1.1,1.2 Message-ID: <200501281630.j0SGUAYW024199@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/SDL_gfx In directory cvs.fedora.redhat.com:/tmp/cvs-serv24190 Modified Files: import.log Log Message: auto-import SDL_gfx-2.0.13-1 on branch devel from SDL_gfx-2.0.13-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/SDL_gfx/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 Jan 2005 16:29:32 -0000 1.1 +++ import.log 28 Jan 2005 16:30:08 -0000 1.2 @@ -0,0 +1 @@ +SDL_gfx-2_0_13-1:HEAD:SDL_gfx-2.0.13-1.src.rpm:1106929802 From fedora-extras-commits at redhat.com Fri Jan 28 16:30:10 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:30:10 -0500 Subject: rpms/SDL_gfx/devel SDL_gfx.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501281630.j0SGUASn024203@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/SDL_gfx/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24190/devel Modified Files: .cvsignore sources Added Files: SDL_gfx.spec Log Message: auto-import SDL_gfx-2.0.13-1 on branch devel from SDL_gfx-2.0.13-1.src.rpm --- NEW FILE SDL_gfx.spec --- Summary: Graphic primitives, rotozoomer, framerate control and image filters Name: SDL_gfx Version: 2.0.13 Release: 1 License: LGPL Group: System Environment/Libraries URL: http://www.ferzkopp.net/~aschiffler/Software/SDL_gfx-2.0/ Source: http://www.ferzkopp.net/~aschiffler/Software/SDL_gfx-2.0/SDL_gfx-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: SDL-devel, gcc-c++, automake, autoconf, perl %description The SDL_gfx library offers several components: Graphic Primitives, Rotozoomer, Framerate control, and MMX image filters. The Primitives component provides basic drawing routines: pixels, hlines, vlines, lines, aa-lines, rectangles, circles, ellipses, trigons, polygons, Bezier curves, and an 8x8 pixmap font for drawing onto any SDL Surface. Full alpha blending, hardware surface locking, and all surface depths are supported. The Rotozoomer can use interpolation for high quality output. %package devel Summary: Header files and static libraries for SDL_gfx Group: Development/Libraries Requires: %{name} = %{version}, SDL-devel %description devel This package contains the header files and static libraries for SDL_gfx. If you want to develop programs using SDL_gfx, you will need to install this package. %prep %setup %build %configure \ %ifnarch %{ix86} --disable-mmx %endif # Buildtools have problems even when -j1 is added %{__make} #%{?_smp_mflags} %install %{__rm} -rf %{buildroot} %makeinstall %clean %{__rm} -rf %{buildroot} %post /sbin/ldconfig %postun /sbin/ldconfig %files %defattr(-, root, root, 0755) %doc NEWS LICENSE README AUTHORS COPYING %{_libdir}/lib*.so.* %files devel %defattr(-, root, root, 0755) %{_libdir}/*.a %{_includedir}/SDL/*.h %exclude %{_libdir}/*.la %{_libdir}/*.so %changelog * Fri Jan 28 2005 Matthias Saou 2.0.13-1 - Initial Extras import, minor spec tweaks. * Tue Dec 21 2004 Dries Verachtert 2.0.13-1 - Updated to release 2.0.13 and removed the patch (has been applied upstream) * Thu Nov 11 2004 Matthias Saou 2.0.12-3 - Explicitly disable mmx for non-ix86 to fix build on x86_64. * Fri Oct 22 2004 Dries Verachtert 2.0.12-3 - fixed some buildrequirements so the correct version of libSDL_gfx.so can be found in the list of provides. * Fri Oct 22 2004 Dries Verachtert 2.0.12-2 - rebuild * Wed Sep 01 2004 Dries Verachtert 2.0.12-1 - Update to version 2.0.12. * Mon Apr 26 2004 Dries Verachtert 2.0.10-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/SDL_gfx/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Jan 2005 16:29:32 -0000 1.1 +++ .cvsignore 28 Jan 2005 16:30:08 -0000 1.2 @@ -0,0 +1 @@ +SDL_gfx-2.0.13.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/SDL_gfx/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Jan 2005 16:29:32 -0000 1.1 +++ sources 28 Jan 2005 16:30:08 -0000 1.2 @@ -0,0 +1 @@ +b1ce778232db0b1979695f0a5a945a13 SDL_gfx-2.0.13.tar.gz From fedora-extras-commits at redhat.com Fri Jan 28 16:39:20 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:39:20 -0500 Subject: rpms/Gtk-Perl - New directory Message-ID: <200501281639.j0SGdKVF024319@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/Gtk-Perl In directory cvs.fedora.redhat.com:/tmp/cvs-serv24312/Gtk-Perl Log Message: Directory /cvs/extras/rpms/Gtk-Perl added to the repository From fedora-extras-commits at redhat.com Fri Jan 28 16:39:21 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:39:21 -0500 Subject: rpms/Gtk-Perl/devel - New directory Message-ID: <200501281639.j0SGdL7I024322@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/Gtk-Perl/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24312/Gtk-Perl/devel Log Message: Directory /cvs/extras/rpms/Gtk-Perl/devel added to the repository From fedora-extras-commits at redhat.com Fri Jan 28 16:39:38 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:39:38 -0500 Subject: rpms/Gtk-Perl Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501281639.j0SGdcrL024381@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/Gtk-Perl In directory cvs.fedora.redhat.com:/tmp/cvs-serv24372 Added Files: Makefile import.log Log Message: Setup of module Gtk-Perl --- NEW FILE Makefile --- # Top level Makefile for module Gtk-Perl all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Jan 28 16:39:38 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:39:38 -0500 Subject: rpms/Gtk-Perl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501281639.j0SGdcmx024384@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/Gtk-Perl/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24372/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module Gtk-Perl --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jan 28 16:40:17 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:40:17 -0500 Subject: rpms/Gtk-Perl/devel Gtk-Perl.spec, NONE, 1.1 filter-depends.sh, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501281640.j0SGeHmk024487@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/Gtk-Perl/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24474/devel Modified Files: .cvsignore sources Added Files: Gtk-Perl.spec filter-depends.sh Log Message: auto-import Gtk-Perl-0.7008-37 on branch devel from Gtk-Perl-0.7008-37.src.rpm --- NEW FILE Gtk-Perl.spec --- %define _use_internal_dependency_generator 0 Summary: Perl extensions for GTK+ (the Gimp ToolKit) Name: Gtk-Perl Version: 0.7008 Release: 37 License: LGPL Group: System Environment/Libraries URL: http://www.gtkperl.org/ Source: http://www.gtkperl.org/Gtk-Perl-%{version}.tar.gz Source10: filter-depends.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gtk+-devel, gdk-pixbuf-devel, libglade-devel BuildRequires: gnome-libs-devel, Mesa-devel BuildRequires: gtkhtml-devel, gal-devel, perl-XML-Parser # Internal perl provides not caught by the find-provides Provides: perl(Gnome::Applet::Types) Provides: perl(Gtk::GLArea::Types) Provides: perl(Gtk::Gdk::Pixbuf::Types) Provides: perl(Gtk::GladeXML::Types) Provides: perl(Gtk::XmHTML::Types) %define __find_requires %{SOURCE10} Obsoletes: gtk+-perl %description This package includes Perl extensions for GTK+ (the Gimp ToolKit), a library used for creating graphical user interfaces for the X Window System. The extensions provided in this package allow you to write graphical interfaces using Perl and GTK+. If you install this package, you will need to also have Perl and GTK+ installed. %prep %setup # copied from mandrake srpm # fix for new MakeMaker (ie new perl 5.8.0) %{__perl} -pi -e '/CCCMD/ && s|/m;|/mg;|' */Makefile.PL %build CFLAGS="%{optflags}" %{__perl} Makefile.PL \ PREFIX=%{buildroot}%{_prefix} \ INSTALLDIRS=vendor \ --without-guessing %{__make} %{?_smp_mflags} for dir in GdkImlib GdkPixbuf Glade Gnome GtkXmHTML ; do pushd ${dir} CFLAGS="%{optflags}" %{__perl} Makefile.PL \ PREFIX=%{buildroot}%{_prefix} \ INSTALLDIRS=vendor %{__make} %{?_smp_mflags} popd done %install %{__rm} -rf %{buildroot} %{__make} install \ VENDORPREFIX=%{buildroot}%{_prefix} \ INSTALLDIRS=vendor for dir in GdkImlib GdkPixbuf Glade Gnome GtkXmHTML ; do pushd ${dir} %{__make} install \ VENDORPREFIX=%{buildroot}%{_prefix} \ INSTALLDIRS=vendor popd done ### Clean up buildroot %{__rm} -rf %{buildroot}%{_libdir}/perl5/*/*-linux-thread-multi/ %{__rm} -f `find %{buildroot}%{_libdir}/perl5/vendor_perl/*/*-linux*/ \ -name .packlist -o -name '*.bs'` %clean %{__rm} -rf %{buildroot} %files %defattr(-, root, root, 0755) %doc ChangeLog NOTES README VERSIONS %{_libdir}/perl5/vendor_perl/*/*-linux*/Gnome/ %{_libdir}/perl5/vendor_perl/*/*-linux*/Gtk/ %{_libdir}/perl5/vendor_perl/*/*-linux*/Gtk.pm %{_libdir}/perl5/vendor_perl/*/*-linux*/Gnome.pm %{_libdir}/perl5/vendor_perl/*/*-linux*/auto/Gnome/ %{_libdir}/perl5/vendor_perl/*/*-linux*/auto/Gtk/ %{_mandir}/man?/* %changelog * Thu Nov 4 2004 Matthias Saou 0.7008-36 - Take over where Red Hat left off : http://www.redhat.com/archives/fedora-devel-list/2004-August/msg00455.html - Major spec file cleanup. * Tue Mar 02 2004 Elliot Lee - rebuilt * Fri Feb 13 2004 Elliot Lee - rebuilt * Tue Jun 17 2003 Chip Turner 0.7008-35 - rebuild * Mon Jan 27 2003 Chip Turner - version bump and rebuild * Sat Dec 14 2002 Chip Turner - don't use internal rpm dep generator * Wed Nov 20 2002 Chip Turner - rebuild * Thu Aug 15 2002 Chip Turner - fix for perl 5.8.0 - filter out perl(XML::Writer) dependency * Tue Aug 6 2002 Chip Turner - automated release bump and build * Sat Jan 26 2002 Jeff Johnson - added perl provides. * Wed Jan 09 2002 Tim Powers - automated rebuild * Fri Dec 14 2001 Trond Eivind Glomsr?d 0.7008-4 - Don't hardcode 5.6.0 * Thu Aug 30 2001 Trond Eivind Glomsr?d 0.7008-3 - remove *::reference man pages, as we don't ship all the modules the package wants do build them (#52851) * Tue Jul 31 2001 Trond Eivind Glomsr?d - More BuildRequires * Mon Jul 23 2001 Trond Eivind Glomsr?d - Use %%{_tmppath} - 0.7008 - Update URL and file location - s/Copyright/License/ - add more buildrequires (#49784) * Thu Jul 5 2001 Tim Powers - fixed file list so that we own the dirs we need to - remove perl-temp-files * Mon May 21 2001 Tim Powers - rebuilt against newer gtk+ libs * Thu Jan 11 2001 Tim Powers - excludearched ia64 * Sun Dec 10 2000 Tim Powers - built the added modules for bug 22013 since he uses that stuff. * Mon Nov 20 2000 Tim Powers - rebuilt to fix bad dir perms * Fri Nov 10 2000 Tim Powers - updated to 0.7004 - added docs * Mon Jul 24 2000 Prospector - rebuilt * Mon Jul 17 2000 Tim Powers - added defattr * Mon Jul 10 2000 Tim Powers - rebuilt * Mon Jul 03 2000 Prospector - automatic rebuild * Mon May 22 2000 Tim Powers - updated to 0.7 - built for 7.0 * Tue Dec 21 1999 Tim Powers - updated to 0.6123 - built for 6.2 * Fri Jun 25 1999 Tim Powers - rebuilt for 6.1 * Mon May 10 1999 Cristian Gafton - version 0.5121 * Tue Dec 02 1998 Michael Maher - updated to version 0.4 * Fri Oct 08 1998 Michael Maher - cleaned up spec, built for 5.2 powertools. - added buildroot * Tue Jul 14 1998 The Rasterman - Made it rebuild on multiple architectures (still linux only tho) - this NEEDS to be buildrooted. not willign to do that quite yet. * Fri Jul 10 1998 Jeff Carr - Turned of -O2 on the ppc version - I'm not sure about the LGPL part --- NEW FILE filter-depends.sh --- #!/bin/sh /usr/lib/rpm/find-requires.perl $* | grep -v HTTP::GHTTP | grep -v OpenGL | grep -v XML::Writer Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/Gtk-Perl/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Jan 2005 16:39:36 -0000 1.1 +++ .cvsignore 28 Jan 2005 16:40:15 -0000 1.2 @@ -0,0 +1 @@ +Gtk-Perl-0.7008.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/Gtk-Perl/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Jan 2005 16:39:36 -0000 1.1 +++ sources 28 Jan 2005 16:40:15 -0000 1.2 @@ -0,0 +1 @@ +b499abb5db7794f200abbf07879dd65d Gtk-Perl-0.7008.tar.gz From fedora-extras-commits at redhat.com Fri Jan 28 16:40:17 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:40:17 -0500 Subject: rpms/Gtk-Perl import.log,1.1,1.2 Message-ID: <200501281640.j0SGeHx5024484@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/Gtk-Perl In directory cvs.fedora.redhat.com:/tmp/cvs-serv24474 Modified Files: import.log Log Message: auto-import Gtk-Perl-0.7008-37 on branch devel from Gtk-Perl-0.7008-37.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/Gtk-Perl/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 Jan 2005 16:39:36 -0000 1.1 +++ import.log 28 Jan 2005 16:40:15 -0000 1.2 @@ -0,0 +1 @@ +Gtk-Perl-0_7008-37:HEAD:Gtk-Perl-0.7008-37.src.rpm:1106930408 From fedora-extras-commits at redhat.com Fri Jan 28 16:42:56 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:42:56 -0500 Subject: rpms/perl-libintl - New directory Message-ID: <200501281642.j0SGgu0M024601@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/perl-libintl In directory cvs.fedora.redhat.com:/tmp/cvs-serv24594/perl-libintl Log Message: Directory /cvs/extras/rpms/perl-libintl added to the repository From fedora-extras-commits at redhat.com Fri Jan 28 16:42:56 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:42:56 -0500 Subject: rpms/perl-libintl/devel - New directory Message-ID: <200501281642.j0SGgug9024604@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/perl-libintl/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24594/perl-libintl/devel Log Message: Directory /cvs/extras/rpms/perl-libintl/devel added to the repository From fedora-extras-commits at redhat.com Fri Jan 28 16:43:12 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:43:12 -0500 Subject: rpms/perl-libintl Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501281643.j0SGhCjv024663@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/perl-libintl In directory cvs.fedora.redhat.com:/tmp/cvs-serv24654 Added Files: Makefile import.log Log Message: Setup of module perl-libintl --- NEW FILE Makefile --- # Top level Makefile for module perl-libintl all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 28 16:43:12 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:43:12 -0500 Subject: rpms/perl-libintl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501281643.j0SGhCgI024666@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/perl-libintl/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24654/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-libintl --- NEW 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 Jan 28 16:43:47 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:43:47 -0500 Subject: rpms/perl-libintl import.log,1.1,1.2 Message-ID: <200501281643.j0SGhl94024760@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/perl-libintl In directory cvs.fedora.redhat.com:/tmp/cvs-serv24750 Modified Files: import.log Log Message: auto-import perl-libintl-1.11-2 on branch devel from perl-libintl-1.11-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-libintl/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 Jan 2005 16:43:10 -0000 1.1 +++ import.log 28 Jan 2005 16:43:45 -0000 1.2 @@ -0,0 +1 @@ +perl-libintl-1_11-2:HEAD:perl-libintl-1.11-2.src.rpm:1106930619 From fedora-extras-commits at redhat.com Fri Jan 28 16:43:47 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:43:47 -0500 Subject: rpms/perl-libintl/devel perl-libintl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501281643.j0SGhlwd024764@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/perl-libintl/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24750/devel Modified Files: .cvsignore sources Added Files: perl-libintl.spec Log Message: auto-import perl-libintl-1.11-2 on branch devel from perl-libintl-1.11-2.src.rpm --- NEW FILE perl-libintl.spec --- %define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib) %define perl_vendorarch %(eval "`perl -V:installvendorarch`"; echo $installvendorarch) %define real_name libintl-perl Summary: Internationalization library for Perl, compatible with gettext Name: perl-libintl Version: 1.11 Release: 2 License: LGPL Group: Applications/CPAN URL: http://search.cpan.org/dist/libintl-perl/ Source: http://search.cpan.org/CPAN/authors/id/G/GU/GUIDO/libintl-perl-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl Provides: perl-libintl-perl = %{version}-%{release} Provides: perl(Locale::gettext_xs) BuildArch: noarch %description The package libintl-perl is an internationalization library for Perl that aims to be compatible with the Uniforum message translations system as implemented for example in GNU gettext. %prep %setup -n libintl-perl-%{version} %build %{__perl} Makefile.PL \ PREFIX="%{buildroot}%{_prefix}" \ INSTALLDIRS="vendor" %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} %makeinstall ### Clean up buildroot %{__rm} -rf %{buildroot}%{perl_archlib} \ %{buildroot}%{perl_vendorarch} %clean %{__rm} -rf %{buildroot} %files %defattr(-, root, root, 0755) %doc ChangeLog COPYING* NEWS README THANKS TODO %{perl_vendorlib}/Locale/ %{_mandir}/man?/* %changelog * Tue Nov 9 2004 Matthias Saou 1.11-2 - Fix : Added perl(Locale::gettext_xs) provides. * Thu Nov 4 2004 Matthias Saou 1.11-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-libintl/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Jan 2005 16:43:10 -0000 1.1 +++ .cvsignore 28 Jan 2005 16:43:45 -0000 1.2 @@ -0,0 +1 @@ +libintl-perl-1.11.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-libintl/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Jan 2005 16:43:10 -0000 1.1 +++ sources 28 Jan 2005 16:43:45 -0000 1.2 @@ -0,0 +1 @@ +091e05542e36f030c785f2919f05b73f libintl-perl-1.11.tar.gz From fedora-extras-commits at redhat.com Fri Jan 28 16:44:43 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:44:43 -0500 Subject: rpms/liboil - New directory Message-ID: <200501281644.j0SGihDG024876@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/liboil In directory cvs.fedora.redhat.com:/tmp/cvs-serv24869/liboil Log Message: Directory /cvs/extras/rpms/liboil added to the repository From fedora-extras-commits at redhat.com Fri Jan 28 16:44:43 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:44:43 -0500 Subject: rpms/liboil/devel - New directory Message-ID: <200501281644.j0SGihV5024879@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/liboil/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24869/liboil/devel Log Message: Directory /cvs/extras/rpms/liboil/devel added to the repository From fedora-extras-commits at redhat.com Fri Jan 28 16:44:55 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:44:55 -0500 Subject: rpms/liboil Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501281644.j0SGitFu024938@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/liboil In directory cvs.fedora.redhat.com:/tmp/cvs-serv24929 Added Files: Makefile import.log Log Message: Setup of module liboil --- NEW FILE Makefile --- # Top level Makefile for module liboil all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 28 16:44:55 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:44:55 -0500 Subject: rpms/liboil/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501281644.j0SGituU024941@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/liboil/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv24929/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module liboil --- NEW 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 Jan 28 16:45:31 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:45:31 -0500 Subject: rpms/liboil import.log,1.1,1.2 Message-ID: <200501281645.j0SGjVJd025036@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/liboil In directory cvs.fedora.redhat.com:/tmp/cvs-serv25027 Modified Files: import.log Log Message: auto-import liboil-0.3.0-1 on branch devel from liboil-0.3.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/liboil/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 Jan 2005 16:44:53 -0000 1.1 +++ import.log 28 Jan 2005 16:45:29 -0000 1.2 @@ -0,0 +1 @@ +liboil-0_3_0-1:HEAD:liboil-0.3.0-1.src.rpm:1106930722 From fedora-extras-commits at redhat.com Fri Jan 28 16:45:31 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 28 Jan 2005 11:45:31 -0500 Subject: rpms/liboil/devel liboil.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501281645.j0SGjVJg025040@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/liboil/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25027/devel Modified Files: .cvsignore sources Added Files: liboil.spec Log Message: auto-import liboil-0.3.0-1 on branch devel from liboil-0.3.0-1.src.rpm --- NEW FILE liboil.spec --- Summary: Library of Optimized Inner Loops, CPU optimized functions Name: liboil Version: 0.3.0 Release: 1 License: LGPL Group: System Environment/Libraries URL: http://www.schleef.org/liboil/ Source: http://www.schleef.org/liboil/download/liboil-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: glib2-devel, gcc-c++ %description Liboil is a library of simple functions that are optimized for various CPUs. These functions are generally loops implementing simple algorithms, such as converting an array of N integers to floating-poing numbers or multiplying and summing an array of N numbers. Clearly such functions are candidates for significant optimization using various techniques, especially by using extended instructions provided by modern CPUs (Altivec, MMX, SSE, etc.). %package devel Summary: Development files and static library for liboil Group: Development/Libraries Requires: %{name} = %{version}, pkgconfig %description devel Liboil is a library of simple functions that are optimized for various CPUs. These functions are generally loops implementing simple algorithms, such as converting an array of N integers to floating-poing numbers or multiplying and summing an array of N numbers. Clearly such functions are candidates for significant optimization using various techniques, especially by using extended instructions provided by modern CPUs (Altivec, MMX, SSE, etc.). %prep %setup %build %configure %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} %makeinstall %clean %{__rm} -rf %{buildroot} %post /sbin/ldconfig %postun /sbin/ldconfig %files %defattr(-, root, root, 0755) %doc ChangeLog %{_libdir}/*.so.* %files devel %defattr(-, root, root, 0755) %{_includedir}/* %{_libdir}/*.a %exclude %{_libdir}/*.la %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %changelog * Fri Jan 28 2005 Matthias Saou 0.3.0-1 - Update to 0.3.0. * Wed Nov 24 2004 Matthias Saou 0.2.2-1 - Update to 0.2.2. * Thu Nov 4 2004 Matthias Saou 0.2.0-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liboil/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Jan 2005 16:44:53 -0000 1.1 +++ .cvsignore 28 Jan 2005 16:45:29 -0000 1.2 @@ -0,0 +1 @@ +liboil-0.3.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/liboil/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Jan 2005 16:44:53 -0000 1.1 +++ sources 28 Jan 2005 16:45:29 -0000 1.2 @@ -0,0 +1 @@ +db1dc6b0dc1263a99075d5e34725636d liboil-0.3.0.tar.gz From fedora-extras-commits at redhat.com Fri Jan 28 17:21:43 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 28 Jan 2005 12:21:43 -0500 Subject: rpms/libgnomemm26/devel libgnomemm.spec,1.2,1.3 sources,1.2,1.3 Message-ID: <200501281721.j0SHLhBc025866@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libgnomemm26/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25860 Modified Files: libgnomemm.spec sources Log Message: Merge patches from Thorsten. Index: libgnomemm.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomemm26/devel/libgnomemm.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libgnomemm.spec 10 Dec 2004 22:03:05 -0000 1.2 +++ libgnomemm.spec 28 Jan 2005 17:21:41 -0000 1.3 @@ -1,6 +1,6 @@ Name: libgnomemm26 Version: 2.6.0 -Release: 1 +Release: 2 Epoch: 0 Summary: A C++ interface for Gnome libs (a GUI library for X). @@ -8,6 +8,7 @@ License: LGPL URL: http://gtkmm.sourceforge.net/ Source0: http://ftp.gnome.org/pub/GNOME/sources/libgnomemm/2.6/libgnomemm-%{version}.tar.bz2 +Patch0: libgnomemm-2.6.0-autoreconf.patch.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -36,6 +37,10 @@ %prep %setup -q -n libgnomemm-%{version} +%ifarch x86_64 +# Patch was build after: aclocal -I scripts && automake -c -f && autoconf && libtoolize --copy --force +%patch0 -p1 +%endif %build @@ -76,6 +81,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Thu Jan 27 2005 Thorsten Leemhuis - 2.6.0-2 +- Add autoreconf patch; fixes build on x86_64 + * Mon Jun 27 2004 Denis Leroy - 0:2.6.0-0.fdr.1 - Upgrade to 2.6.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgnomemm26/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:44:16 -0000 1.2 +++ sources 28 Jan 2005 17:21:41 -0000 1.3 @@ -1 +1,2 @@ 684a11aa4726e4f9b148866d1662fc24 libgnomemm-2.6.0.tar.bz2 +f2aa1d551aebdf2de0fda18c7d789caa libgnomemm-2.6.0-autoreconf.patch.bz2 From fedora-extras-commits at redhat.com Fri Jan 28 17:36:47 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 28 Jan 2005 12:36:47 -0500 Subject: rpms/perl-MLDBM/devel perl-MLDBM.spec,1.1,1.2 Message-ID: <200501281736.j0SHaliT025936@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/perl-MLDBM/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25929 Modified Files: perl-MLDBM.spec Log Message: Fix release number, #146430, from Jose. Index: perl-MLDBM.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MLDBM/devel/perl-MLDBM.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-MLDBM.spec 11 Dec 2004 16:03:28 -0000 1.1 +++ perl-MLDBM.spec 28 Jan 2005 17:36:45 -0000 1.2 @@ -2,7 +2,7 @@ Name: perl-MLDBM Version: 2.01 -Release: 0.fdr.1.2 +Release: 1 Epoch: 0 Summary: Store multi-level hash structure in single level tied hash From fedora-extras-commits at redhat.com Fri Jan 28 17:38:30 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 28 Jan 2005 12:38:30 -0500 Subject: rpms/libgnomeuimm26/devel libgnomeuimm.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200501281738.j0SHcU2p025978@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libgnomeuimm26/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25972 Modified Files: libgnomeuimm.spec sources Log Message: Merge patches from Thorsten. Index: libgnomeuimm.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomeuimm26/devel/libgnomeuimm.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libgnomeuimm.spec 10 Dec 2004 22:03:05 -0000 1.2 +++ libgnomeuimm.spec 28 Jan 2005 17:38:28 -0000 1.3 @@ -1,6 +1,6 @@ Name: libgnomeuimm26 Version: 2.6.0 -Release: 1 +Release: 2 Epoch: 0 Summary: A C++ interface for Gnome libs (a GUI library for X). @@ -8,6 +8,7 @@ License: LGPL URL: http://gtkmm.sourceforge.net/ Source0: http://ftp.gnome.org/pub/GNOME/sources/libgnomeuimm/2.6/libgnomeuimm-%{version}.tar.bz2 +Patch0: libgnomeuimm-2.6.0-autoreconf.patch.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -44,6 +45,11 @@ %prep %setup -q -n libgnomeuimm-%{version} +%ifarch x86_64 +# Patch was build after: +#aclocal -I scripts && automake -c -f && autoconf && libtoolize --copy --force +%patch0 -p1 +%endif %build @@ -83,6 +89,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Thu Jan 27 2005 Thorsten Leemhuis - 2.6.0-2 +- Add autoreconf patch; fixes build on x86_64 + * Mon Jun 27 2004 Denis Leroy - 0:2.6.0-0.fdr.1 - Upgrade to 2.6.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgnomeuimm26/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:44:19 -0000 1.2 +++ sources 28 Jan 2005 17:38:28 -0000 1.3 @@ -1 +1,2 @@ 88cef74f116ba3272d1cec46f6566d85 libgnomeuimm-2.6.0.tar.bz2 +38304421cb8ee4b099e60996cf6ca84d libgnomeuimm-2.6.0-autoreconf.patch.bz2 From fedora-extras-commits at redhat.com Fri Jan 28 21:13:11 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 28 Jan 2005 16:13:11 -0500 Subject: rpms/apt/devel apt.spec,1.6,1.7 default.conf,1.3,1.4 Message-ID: <200501282113.j0SLDBoc029222@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/apt/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv29216 Modified Files: apt.spec default.conf Log Message: Allow-Duplicated += kernel-xen*, kernel-*-devel. Index: apt.spec =================================================================== RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- apt.spec 23 Jan 2005 18:22:45 -0000 1.6 +++ apt.spec 28 Jan 2005 21:13:08 -0000 1.7 @@ -17,7 +17,7 @@ Summary: Debian's Advanced Packaging Tool with RPM support. Name: apt Version: 0.5.15cnc6 -Release: 13.%{svnver} +Release: 14.%{svnver} Epoch: 0 Group: System Environment/Base URL: https://moin.conectiva.com.br/AptRpm @@ -360,6 +360,10 @@ %changelog +* Fri Jan 28 2005 Ville Skytt?? - 0:0.5.15cnc6-14.r362 +- Add xen kernels and more kernel-*-devel variants to Allow-Duplicated in + apt.conf.d/default.conf. + * Sun Jan 23 2005 Ville Skytt?? - 0:0.5.15cnc6-13.r362 - Add kernel-devel to Allow-Duplicated in apt.conf.d/default.conf. Index: default.conf =================================================================== RCS file: /cvs/extras/rpms/apt/devel/default.conf,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- default.conf 23 Jan 2005 18:22:45 -0000 1.3 +++ default.conf 28 Jan 2005 21:13:08 -0000 1.4 @@ -26,9 +26,9 @@ // 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|source|sourcecode|devel))?(-(unsupported-modules))?$"; "^gpg-pubkey$"; }; + Allow-Duplicated { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|xen[0U]))?(-(devel|source(code)?|unsupported-modules))?$"; "^gpg-pubkey$"; }; // XXX: not used currently - //Allow-Duplicated-Upgrade { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|source|sourcecode|devel))?(-(unsupported-modules))?$"; }; + //Allow-Duplicated-Upgrade { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|xen[0U]))?(-(devel|source(code)?|unsupported-modules))?$"; }; // "Upgrade" allow-duplicated packages as well Upgrade-Virtual "true"; // Enable source rebuilds From fedora-extras-commits at redhat.com Sat Jan 29 16:28:32 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 29 Jan 2005 11:28:32 -0500 Subject: rpms/gc import.log,1.5,1.6 Message-ID: <200501291628.j0TGSW8D011277@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gc In directory cvs.fedora.redhat.com:/tmp/cvs-serv11268 Modified Files: import.log Log Message: auto-import gc-6.4-2 on branch devel from gc-6.4-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gc/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 8 Nov 2004 04:22:03 -0000 1.5 +++ import.log 29 Jan 2005 16:28:30 -0000 1.6 @@ -2,3 +2,4 @@ gc-6_3-0_fdr_1_rh90:HEAD:gc-6.3-0.fdr.1.rh90.src.rpm:1099887705 gc-6_3-0_fdr_1_1:HEAD:gc-6.3-0.fdr.1.1.src.rpm:1099887711 gc-6_3-0_fdr_1_2:HEAD:gc-6.3-0.fdr.1.2.src.rpm:1099887723 +gc-6_4-2:HEAD:gc-6.4-2.src.rpm:1107016107 From fedora-extras-commits at redhat.com Sat Jan 29 16:28:32 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 29 Jan 2005 11:28:32 -0500 Subject: rpms/gc/devel gc6.4-opendl.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gc.spec, 1.5, 1.6 sources, 1.3, 1.4 gc-6.3-opendl.patch, 1.1, NONE Message-ID: <200501291628.j0TGSWhB011281@cvs.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gc/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv11268/devel Modified Files: .cvsignore gc.spec sources Added Files: gc6.4-opendl.patch Removed Files: gc-6.3-opendl.patch Log Message: auto-import gc-6.4-2 on branch devel from gc-6.4-2.src.rpm gc6.4-opendl.patch: --- NEW FILE gc6.4-opendl.patch --- --- gc6.4/Makefile.am.opendl 2004-12-16 18:27:52.000000000 -0600 +++ gc6.4/Makefile.am 2005-01-10 09:58:12.000000000 -0600 @@ -55,7 +55,7 @@ # Include THREADDLLIBS here to ensure that the correct versions of # linuxthread semaphore functions get linked: -libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) +libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) libgc_la_DEPENDENCIES = @addobjs@ libgc_la_LDFLAGS = -version-info 1:2:0 @@ -65,7 +65,7 @@ sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s libgccpp_la_SOURCES = gc_cpp.cc -libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) +libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) libgccpp_la_LDFLAGS = -version-info 1:2:0 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 test_cpp_SOURCES = tests/test_cpp.cc -test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +test_cpp_LDADD = ./libgc.la ./libgccpp.la TESTS = gctest $(extra_checks) --- gc6.4/Makefile.in.opendl 2004-12-20 20:00:44.000000000 -0600 +++ gc6.4/Makefile.in 2005-01-10 09:59:11.000000000 -0600 @@ -188,7 +188,7 @@ # Include THREADDLLIBS here to ensure that the correct versions of # linuxthread semaphore functions get linked: -libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) +libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) libgc_la_DEPENDENCIES = @addobjs@ libgc_la_LDFLAGS = -version-info 1:2:0 @@ -199,7 +199,7 @@ libgccpp_la_SOURCES = gc_cpp.cc -libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) +libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) libgccpp_la_LDFLAGS = -version-info 1:2:0 AM_CXXFLAGS = @GC_CFLAGS@ @@ -212,9 +212,9 @@ # gctest_OBJECTS = test.o gctest_SOURCES = tests/test.c -gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +gctest_LDADD = ./libgc.la test_cpp_SOURCES = tests/test_cpp.cc -test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +test_cpp_LDADD = ./libgc.la ./libgccpp.la TESTS = gctest $(extra_checks) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gc/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:21:45 -0000 1.3 +++ .cvsignore 29 Jan 2005 16:28:30 -0000 1.4 @@ -1 +1 @@ -gc6.3.tar.gz +gc6.4.tar.gz Index: gc.spec =================================================================== RCS file: /cvs/extras/rpms/gc/devel/gc.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gc.spec 10 Dec 2004 22:03:02 -0000 1.5 +++ gc.spec 29 Jan 2005 16:28:30 -0000 1.6 @@ -1,22 +1,20 @@ # $Id$ -# define to --enable-threads, --enable-parallel-mark -%define threads 1 - -#define beta alpha6 - Summary: C++ Garbage Collector Name: gc Epoch: 0 -Version: 6.3 -Release: 1%{?dist_tag} +Version: 6.4 +# For Extras +Release: 2 +# For kde-redhat +#Release: 0.2%{?dist_tag}.kde Group: System Environment/Libraries License: BSD Url: http://www.hpl.hp.com/personal/Hans_Boehm/gc/ -Source: http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.3.tar.gz +Source: http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.4.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Patch1: gc-6.3-opendl.patch +Patch1: gc6.4-opendl.patch %description @@ -42,7 +40,10 @@ %configure \ --disable-static \ --enable-cplusplus \ - %{?threads: --enable-threads=posix --enable-parallel-mark} + --enable-threads=posix \ +%ifarch %{ix86} + --enable-parallel-mark +%endif make %{?_smp_mflags} @@ -84,6 +85,14 @@ %changelog +* Wed Jan 26 2005 Rex Dieter 0:6.4-2 +- --enable-threads unconditionally +- --enable-parallel-mark only on %%ix86 (#144681) + +* Mon Jan 10 2005 Rex Dieter 0:6.4-1 +- 6.4 +- update opendl patch + * Fri Jul 09 2004 Rex Dieter 0:6.3-0.fdr.1 - 6.3(final) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gc/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:21:45 -0000 1.3 +++ sources 29 Jan 2005 16:28:30 -0000 1.4 @@ -1 +1 @@ -8b37ee18cbeb1dfd1866958e280db871 gc6.3.tar.gz +ef03495e980b834a99c0e27eedaa546e gc6.4.tar.gz --- gc-6.3-opendl.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jan 29 16:42:15 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Sat, 29 Jan 2005 11:42:15 -0500 Subject: devel/irssi irssi.spec,1.4,1.5 Message-ID: <200501291642.j0TGgFtT011375@cvs.fedora.redhat.com> Author: anvil Update of /cvs/extras/devel/irssi In directory cvs.fedora.redhat.com:/tmp/cvs-serv11368 Modified Files: irssi.spec Log Message: irssi.spec: Reduce Perl dir ownership and add MODULE_COMPAT dependency. (#143703) Index: irssi.spec =================================================================== RCS file: /cvs/extras/devel/irssi/irssi.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- irssi.spec 10 Dec 2004 22:03:04 -0000 1.4 +++ irssi.spec 29 Jan 2005 16:42:13 -0000 1.5 @@ -3,7 +3,7 @@ Summary: Modular text mode IRC client with Perl scripting Name: irssi Version: 0.8.9 -Release: 4 +Release: 5 Epoch: 0 License: GPL Group: Applications/Communications @@ -18,6 +18,8 @@ %{?_with_glib1:BuildRequires: glib-devel} %{!?_with_glib1:BuildRequires: glib2-devel} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + # ---------------------------------------------------------------------------- %description @@ -73,10 +75,6 @@ %defattr(-,root,root,-) %doc docs/*.txt docs/*.html AUTHORS COPYING NEWS README TODO convert-replace-trigger.pl %config(noreplace) %{_sysconfdir}/%{name}.conf -%dir %{_libdir}/perl*/* -%dir %(eval "`perl -V:installvendorlib`"; echo $installvendorlib) -%dir %{perl_vendorarch} -%dir %{perl_vendorarch}/auto %{_bindir}/%{name} %{_bindir}/botti %{_datadir}/%{name} @@ -88,6 +86,9 @@ # ---------------------------------------------------------------------------- %changelog +* Fri Dec 24 2004 Michael Schwendt 0:0.8.9-5 +- Reduce Perl dir ownership and add MODULE_COMPAT dependency. + * Fri Apr 2 2004 Dams 0:0.8.9-0.fdr.4 - Rebuilt to use new perl to prevent random segmentation fault at load time From fedora-extras-commits at redhat.com Sat Jan 29 20:37:57 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 15:37:57 -0500 Subject: rpms/rpmlint/devel .cvsignore, 1.3, 1.4 rpmlint-fedora-config, 1.1, 1.2 rpmlint.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200501292037.j0TKbvkM014373@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/rpmlint/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv14367 Modified Files: .cvsignore rpmlint-fedora-config rpmlint.spec sources Log Message: Update to 0.65, improve default config. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rpmlint/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 05:18:56 -0000 1.3 +++ .cvsignore 29 Jan 2005 20:37:55 -0000 1.4 @@ -1 +1 @@ -rpmlint-0.61.tar.bz2 +rpmlint-0.65.tar.bz2 Index: rpmlint-fedora-config =================================================================== RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint-fedora-config,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rpmlint-fedora-config 8 Nov 2004 05:18:23 -0000 1.1 +++ rpmlint-fedora-config 29 Jan 2005 20:37:55 -0000 1.2 @@ -6,12 +6,12 @@ setOption("Vendor", "Fedora Linux") setOption("Distribution", "Fedora Linux") -setOption("ReleaseExtension", "(\d+\.)+fdr\.\d+(\..*)?") +setOption("ReleaseExtension", None) setOption("ValidBuildHost", ".*") setOption("Packager", ".*") setOption("UseVersionInChangeLog", 1) setOption("UseBzip2", 0) -setOption("UseEpoch", 1) +setOption("UseEpoch", 0) setOption("ValidSrcPerms", (0644, )) setOption("ValidGroups", ( "Amusements/Games", @@ -78,5 +78,5 @@ # Output filters addFilter("W: .* source-or-patch-not-[bg]zipped .*") addFilter("E: .* lib-package-without-%mklibname") -addFilter("E: .* no-dependancy (perl|python)-base.*") +addFilter("E: .* no-dependency (perl|python)-base.*") addFilter("W: .* (python|perl5)-naming-policy-not-applied.*") Index: rpmlint.spec =================================================================== RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- rpmlint.spec 10 Dec 2004 22:03:10 -0000 1.6 +++ rpmlint.spec 29 Jan 2005 20:37:55 -0000 1.7 @@ -1,18 +1,18 @@ Name: rpmlint -Version: 0.61 -Release: 2 +Version: 0.65 +Release: 1 Epoch: 0 Summary: RPM correctness checker Group: Development/Tools License: GPL URL: http://people.mandrakesoft.com/~flepied/projects/rpmlint/ -Source0: http://people.mandrakesoft.com/~flepied/projects/rpmlint/dist/rpmlint-0.61.tar.bz2 +Source0: http://people.mandrakesoft.com/~flepied/projects/rpmlint/dist/rpmlint-0.65.tar.bz2 Source1: %{name}-fedora-config BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python >= 0:1.5.2, rpm-python, make, perl +BuildRequires: python >= 0:1.5.2, rpm-python, make, %{__perl} Requires: rpm-python, python >= 0:1.5.2, cpio %description @@ -22,6 +22,8 @@ %prep %setup -q +%{__perl} -pi -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \ + FilesCheck.py I18NCheck.py %build @@ -31,9 +33,10 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT - -# Install Fedora config as the default. -install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config +install -pm 644 rpmlint.bash-completion $RPM_BUILD_ROOT%{_datadir}/rpmlint +install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d +touch $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/rpmlint +install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config # Take care of files that may be generated later. touch $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config{c,o} @@ -56,16 +59,35 @@ rm -rf $RPM_BUILD_ROOT +%triggerin -- bash-completion +if [ ! -e %{_sysconfdir}/bash_completion.d/rpmlint ] ; then + ln -s %{_datadir}/rpmlint/rpmlint.bash-completion \ + %{_sysconfdir}/bash_completion.d/rpmlint +fi + +%triggerun -- bash-completion +[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/rpmlint + + %files -f %{name}-%{version}-files.list %defattr(-,root,root,0755) %doc AUTHORS COPYING ChangeLog README %{_bindir}/rpm* %dir %{_datadir}/rpmlint +%{_datadir}/rpmlint/rpmlint.bash-completion %dir %{_sysconfdir}/rpmlint %config(noreplace) %{_sysconfdir}/rpmlint/config +%ghost %{_sysconfdir}/bash_completion.d/rpmlint %changelog +* Sat Jan 29 2005 Ville Skytt?? - 0:0.65-1 +- Update to 0.65. + +* Sat Jan 1 2005 Ville Skytt?? - 0:0.64-1 +- Update to 0.64. +- Default config tweaks: don't mandate Epochs nor "fdr" in Release. + * Tue Oct 19 2004 Ville Skytt?? - 0:0.61-0.fdr.2 - Requires cpio (bug 2169). Index: sources =================================================================== RCS file: /cvs/extras/rpms/rpmlint/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 05:18:56 -0000 1.3 +++ sources 29 Jan 2005 20:37:55 -0000 1.4 @@ -1 +1 @@ -1e43509038848f1d8256a7ab2efe527b rpmlint-0.61.tar.bz2 +7e238f5121e2451fc1e100a4f13f26f0 rpmlint-0.65.tar.bz2 From fedora-extras-commits at redhat.com Sat Jan 29 21:07:18 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 29 Jan 2005 16:07:18 -0500 Subject: rpms/libsafe/devel libsafe-2.0-16.spec,1.2,1.3 Message-ID: <200501292107.j0TL7IAl015135@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/libsafe/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv15123 Modified Files: libsafe-2.0-16.spec Log Message: ExclusiveArch: i386 Index: libsafe-2.0-16.spec =================================================================== RCS file: /cvs/extras/rpms/libsafe/devel/libsafe-2.0-16.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libsafe-2.0-16.spec 17 Dec 2004 01:38:37 -0000 1.2 +++ libsafe-2.0-16.spec 29 Jan 2005 21:07:16 -0000 1.3 @@ -10,6 +10,7 @@ Patch0: libsafe-2.0-16c.patch URL: http://www.research.avayalabs.com/project/libsafe/index.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +ExclusiveArch: i386 %description The libsafe library protects a process against the exploitation of buffer @@ -87,6 +88,8 @@ rm -f /etc/ld.so.preload.tmp %changelog +* Sat Jan 29 2005 Warren Togami + * Thu Dec 16 2004 Warren Togami 2.0-16c - Patch with Steve Grubb's libsafe-2.0-16c improvements From fedora-extras-commits at redhat.com Sat Jan 29 21:12:55 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 29 Jan 2005 16:12:55 -0500 Subject: rpms/synaptic/devel synaptic.spec,1.6,1.7 Message-ID: <200501292112.j0TLCtAN015193@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/synaptic/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv15180 Modified Files: synaptic.spec Log Message: ExclusiveArch: i386 Index: synaptic.spec =================================================================== RCS file: /cvs/extras/rpms/synaptic/devel/synaptic.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- synaptic.spec 18 Jan 2005 18:31:07 -0000 1.6 +++ synaptic.spec 29 Jan 2005 21:12:53 -0000 1.7 @@ -4,7 +4,7 @@ Summary: Graphical frontend for APT package manager. Name: synaptic Version: 0.55.3 -Release: 1 +Release: 2 License: GPL Group: Applications/System Source: http://savannah.nongnu.org/download/synaptic/synaptic-%{version}.tar.gz @@ -20,6 +20,7 @@ BuildRequires: libstdc++-devel, gettext BuildRequires: xmlto, perl-XML-Parser BuildRequires: scrollkeeper +ExclusiveArch: i386 %description Synaptic is a graphical package management @@ -102,6 +103,9 @@ %{_mandir}/man8/%{name}.8* %changelog +* Sat Jan 29 2005 Warren Togami 0.55.3-2 +- ExclusiveArch: i386 + * Tue Nov 09 2004 Panu Matilainen 0.55.3-1 - update to 0.55.3 From fedora-extras-commits at redhat.com Sat Jan 29 21:19:53 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 29 Jan 2005 16:19:53 -0500 Subject: rpms/apt/devel apt.spec,1.7,1.8 Message-ID: <200501292119.j0TLJrLJ015279@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/apt/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv15263 Modified Files: apt.spec Log Message: also exclude ppc64 Index: apt.spec =================================================================== RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- apt.spec 28 Jan 2005 21:13:08 -0000 1.7 +++ apt.spec 29 Jan 2005 21:19:50 -0000 1.8 @@ -17,12 +17,12 @@ Summary: Debian's Advanced Packaging Tool with RPM support. Name: apt Version: 0.5.15cnc6 -Release: 14.%{svnver} +Release: 15.%{svnver} Epoch: 0 Group: System Environment/Base URL: https://moin.conectiva.com.br/AptRpm License: GPL -ExcludeArch: x86_64 +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.15cnc6.tar.bz2 @@ -360,6 +360,9 @@ %changelog +* Sat Jan 29 2005 Warren Togami - 0:0.5.15cnc6-15.r362 +- ExcludeArch: ppc64 + * Fri Jan 28 2005 Ville Skytt?? - 0:0.5.15cnc6-14.r362 - Add xen kernels and more kernel-*-devel variants to Allow-Duplicated in apt.conf.d/default.conf. From fedora-extras-commits at redhat.com Sat Jan 29 21:20:58 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sat, 29 Jan 2005 16:20:58 -0500 Subject: rpms/synaptic/devel synaptic.spec,1.7,1.8 Message-ID: <200501292120.j0TLKwLA015354@cvs.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/synaptic/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv15332 Modified Files: synaptic.spec Log Message: exclude multilib archs instead Index: synaptic.spec =================================================================== RCS file: /cvs/extras/rpms/synaptic/devel/synaptic.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- synaptic.spec 29 Jan 2005 21:12:53 -0000 1.7 +++ synaptic.spec 29 Jan 2005 21:20:56 -0000 1.8 @@ -20,7 +20,7 @@ BuildRequires: libstdc++-devel, gettext BuildRequires: xmlto, perl-XML-Parser BuildRequires: scrollkeeper -ExclusiveArch: i386 +ExcludeArch: x86_64 ppc64 %description Synaptic is a graphical package management @@ -104,7 +104,7 @@ %changelog * Sat Jan 29 2005 Warren Togami 0.55.3-2 -- ExclusiveArch: i386 +- ExcludeArch: x86_64 ppc64 * Tue Nov 09 2004 Panu Matilainen 0.55.3-1 - update to 0.55.3 From fedora-extras-commits at redhat.com Sat Jan 29 21:20:59 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 16:20:59 -0500 Subject: rpms/fontforge/devel fontforge.spec,1.6,1.7 pfaicon.gif,1.1,NONE Message-ID: <200501292120.j0TLKxjo015371@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/fontforge/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv15343 Modified Files: fontforge.spec Removed Files: pfaicon.gif Log Message: Miscellaneous small improvements. Index: fontforge.spec =================================================================== RCS file: /cvs/extras/rpms/fontforge/devel/fontforge.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fontforge.spec 27 Jan 2005 18:19:46 -0000 1.6 +++ fontforge.spec 29 Jan 2005 21:20:57 -0000 1.7 @@ -1,6 +1,6 @@ Name: fontforge Version: 0.0 -Release: 1.20041231 +Release: 2.20041231 Epoch: 0 Summary: An outline and bitmap font editor @@ -10,7 +10,6 @@ Source0: http://dl.sf.net/fontforge/fontforge_full-20041231.tgz Source1: fontforge.desktop Source2: http://dl.sf.net/fontforge/fontforge_htdocs-20041231.tgz -Source3: pfaicon.gif Patch1: fontforge-20040618-docview.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -22,7 +21,6 @@ BuildRequires: libxml2-devel BuildRequires: freetype-devel BuildRequires: XFree86-devel -BuildRequires: ImageMagick BuildRequires: desktop-file-utils BuildRequires: libuninameslist-devel Obsoletes: pfaedit @@ -34,34 +32,40 @@ (Type2) and CID-keyed fonts. %prep -%setup -q -n fontforge-20041231 +%setup -q -n %{name}-20041231 %patch1 -p2 -b .docview mkdir htdocs tar xzf %{SOURCE2} -C htdocs rm -rf htdocs/scripts +chmod 644 htdocs/* mkdir cidmaps tar xzf htdocs/cidmaps.tgz -C cidmaps find . -name "CVS" -type d -print | xargs rm -r +for i in fontforge/fontforge.1 fontforge/sfddiff.1 ; do + iconv -f iso-8859-1 -t utf-8 $i -o $i.utf8 ; mv $i.utf8 $i +done + +sed -i -e 's/-rpath $(libdir)//' fontforge/Makefile*.in + %build %configure --with-regular-link --with-freetype-bytecode=no -# Parallell make not working. +# Parallel make not working. make DOCDIR=%{_docdir}/%{name}-%{version}/htdocs + %install rm -rf $RPM_BUILD_ROOT # make install DESTDIR=$RPM_BUILD_ROOT fails. %makeinstall install -p -m 644 cidmaps/Adobe* $RPM_BUILD_ROOT%{_datadir}/fontforge -rm -f $RPM_BUILD_ROOT%{_libdir}/libgunicode.la $RPM_BUILD_ROOT%{_libdir}/libgdraw.la -rm -f $RPM_BUILD_ROOT%{_libdir}/libgunicode.so $RPM_BUILD_ROOT%{_libdir}/libgdraw.so +rm -f $RPM_BUILD_ROOT%{_libdir}/libg{draw,unicode}.{la,so} -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -convert %{SOURCE3} fontforge.png -install -m 644 fontforge.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ +install -Dpm 644 htdocs/ffanvil32.png \ + $RPM_BUILD_ROOT%{_datadir}/pixmaps/fontforge.png desktop-file-install \ --vendor fedora \ @@ -69,6 +73,8 @@ --add-category X-Fedora \ %{SOURCE1} +chmod -x $RPM_BUILD_ROOT%{_libdir}/pkgconfig/fontforge.pc + %clean rm -rf $RPM_BUILD_ROOT @@ -81,17 +87,24 @@ %files %defattr(-,root,root,-) -%doc AUTHORS INSTALL LICENSE README htdocs +%doc AUTHORS LICENSE htdocs %{_bindir}/* -%{_libdir}/*.so.* +%{_libdir}/libg*.so.* %{_libdir}/pkgconfig/fontforge.pc -%{_datadir}/applications/*.desktop -%{_datadir}/%{name} -%{_datadir}/pixmaps/*.png +%{_datadir}/applications/*fontforge.desktop +%{_datadir}/fontforge +%{_datadir}/pixmaps/fontforge.png %{_mandir}/man1/*.1* %changelog +* Sat Jan 29 2005 Ville Skytt?? - 0:0.0-2.20041231 +- Avoid RPATH. +- Convert man pages to UTF-8. +- Fix pkgconfig and doc file permissions. +- Use updated upstream icon. +- Don't include installation documentation. + * Mon Jan 17 2005 Marius L. J??hndal - 0:0.0-1.20041231 - Updated to 20041231. From fedora-extras-commits at redhat.com Sat Jan 29 22:23:14 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 17:23:14 -0500 Subject: rpms/imlib2 import.log,1.7,1.8 Message-ID: <200501292223.j0TMNE96016195@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/imlib2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv16186 Modified Files: import.log Log Message: auto-import imlib2-1.2.0-0.fdr.4.1 on branch FC-1 from imlib2-1.2.0-0.fdr.4.1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/imlib2/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 8 Nov 2004 04:35:58 -0000 1.7 +++ import.log 29 Jan 2005 22:23:12 -0000 1.8 @@ -4,3 +4,4 @@ imlib2-1_0_6-0_fdr_3_2:HEAD:imlib2-1.0.6-0.fdr.3.2.src.rpm:1099888552 imlib2-1_1_2-0_fdr_1_1:FC-1:imlib2-1.1.2-0.fdr.1.1.src.rpm:1099888555 imlib2-1_1_2-0_fdr_1_2:HEAD:imlib2-1.1.2-0.fdr.1.2.src.rpm:1099888558 +imlib2-1_2_0-0_fdr_4_1:FC-1:imlib2-1.2.0-0.fdr.4.1.src.rpm:1107037385 From fedora-extras-commits at redhat.com Sat Jan 29 22:23:14 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 17:23:14 -0500 Subject: rpms/imlib2/FC-1 imlib2-1.2.0-configure-xlib64.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 imlib2.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200501292223.j0TMNEqR016199@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/imlib2/FC-1 In directory cvs.fedora.redhat.com:/tmp/cvs-serv16186/FC-1 Modified Files: .cvsignore imlib2.spec sources Added Files: imlib2-1.2.0-configure-xlib64.patch Log Message: auto-import imlib2-1.2.0-0.fdr.4.1 on branch FC-1 from imlib2-1.2.0-0.fdr.4.1.src.rpm imlib2-1.2.0-configure-xlib64.patch: --- NEW FILE imlib2-1.2.0-configure-xlib64.patch --- --- configure.old 2005-01-09 18:36:09.314185880 +0100 +++ configure 2005-01-09 18:37:15.840072408 +0100 @@ -20262,7 +20262,7 @@ if test "x$have_x" = "xyes"; then x_dir="/usr/X11R6"; x_cflags="-I"$x_dir"/include" - x_libs="-L"$x_dir"/lib -lX11 -lXext" + x_libs="-L"$x_dir"/lib64 -lX11 -lXext" echo "$as_me:$LINENO: result: enabling X11 support" >&5 echo "${ECHO_T}enabling X11 support" >&6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/imlib2/FC-1/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:35:55 -0000 1.3 +++ .cvsignore 29 Jan 2005 22:23:12 -0000 1.4 @@ -1 +1 @@ -imlib2-1.1.2.tar.gz +imlib2-1.2.0.tar.gz Index: imlib2.spec =================================================================== RCS file: /cvs/extras/rpms/imlib2/FC-1/imlib2.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- imlib2.spec 8 Nov 2004 04:35:55 -0000 1.4 +++ imlib2.spec 29 Jan 2005 22:23:12 -0000 1.5 @@ -1,15 +1,19 @@ Summary: A graphic library for file loading, saving, rendering, and manipulation Name: imlib2 -Version: 1.1.2 -Release: 0.fdr.1.1 +Version: 1.2.0 +Release: 0.fdr.4.1 Epoch: 0 License: BSD Group: System Environment/Libraries URL: http://www.enlightenment.org/pages/imlib2.html Source0: http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz +Patch0: imlib2-1.2.0-configure-xlib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: XFree86-devel libjpeg-devel libpng-devel libtiff-devel BuildRequires: libungif-devel freetype-devel libtool bzip2-devel +%ifarch x86_64 +BuildRequires: perl +%endif %package devel Summary: Development package for %{name} @@ -39,33 +43,45 @@ %prep %setup -q +%ifarch x86_64 +%patch0 -b .patch0 +%endif # ----------------------------------------------------------------------------- %build %configure \ -%ifarch %{ix86} x86_64 ia64 + --x-libraries=%{_prefix}/X11R6/%{_lib} \ + --with-pic \ +%ifarch %{ix86} ia64 --enable-mmx +%else + --disable-mmx +%endif +%ifarch x86_64 +# fix hardcoded rpath im Makefiles on x86_64 due to freetype-config --libs +# returning "-L/usr/lib64 -Wl,--rpath -Wl,/usr/lib64 -lfreetype -lz": +perl -pi.orig -e 's|-Wl,--rpath -Wl,/usr/lib64||g;' Makefile */Makefile */*/Makefile imlib2-config %endif -make %{?_smp_mflags} -make -C demo +make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool # ----------------------------------------------------------------------------- %install rm -rf $RPM_BUILD_ROOT __doc -make install DESTDIR=$RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -C demo +make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool cp -a doc __doc rm -f __doc/Makefile* rm -f \ - $RPM_BUILD_ROOT%{_libdir}/libImlib2.la \ - $RPM_BUILD_ROOT%{_libdir}/imlib2_loaders/*/*.*a \ + $RPM_BUILD_ROOT%{_libdir}/imlib2/{loaders,filters}/*.a \ $RPM_BUILD_ROOT%{_bindir}/{color_spaces,imlib2,*test} +# ship .la files due to a bug in kdelibs (see changelog): +# $RPM_BUILD_ROOT%{_libdir}/libImlib2.la \ + # ----------------------------------------------------------------------------- %clean @@ -79,22 +95,62 @@ %files %defattr(-,root,root,-) %doc COPYING AUTHORS README ChangeLog TODO __doc/* -%{_bindir}/imconvert %{_bindir}/imlib2_view +%{_bindir}/imlib2_bumpmap +%{_bindir}/imlib2_colorspace +%{_bindir}/imlib2_conv +%{_bindir}/imlib2_poly +%{_bindir}/imlib2_show %{_libdir}/libImlib2.so.* -%{_libdir}/imlib2_loaders +%{_datadir}/imlib2/data/ +%dir %{_libdir}/imlib2/filters/ +%{_libdir}/imlib2/filters/*.so +%{_libdir}/imlib2/filters/*.la +%dir %{_libdir}/imlib2/loaders/ +%{_libdir}/imlib2/loaders/*.so +%{_libdir}/imlib2/loaders/*.la %files devel %defattr(-,root,root,-) %{_bindir}/imlib2-config %{_includedir}/Imlib2.h %{_libdir}/libImlib2.a +%{_libdir}/libImlib2.la %{_libdir}/libImlib2.so %{_libdir}/pkgconfig/imlib2.pc # ----------------------------------------------------------------------------- %changelog +* Tue Jan 18 2005 Michael Schwendt - 0:1.2.0-4 +- Make this 1.2.0-0.fdr.4 for FC2 and older. +- Really include libtool archives to fix fedora.us bug #2284. + +* Fri Jan 14 2005 Thorsten Leemhuis - 0:1.2.0-3 +- Move filters and loaders back into main package where they belong + +* Mon Jan 10 2005 Thorsten Leemhuis - 0:1.2.0-2 +- Don't ship *.?.a in {_libdir}/imlib/filters/ and loaders/ + +* Sun Jan 09 2005 Thorsten Leemhuis - 0:1.2.0-1 +- Ship .la files ue to a bug in kdelibs; see + https://bugzilla.fedora.us/show_bug.cgi?id=2284 + http://bugzilla.redhat.com/bugzilla/142244 + http://bugs.kde.org/93359 +- Use make param LIBTOOL=/usr/bin/libtool - fixes hardcoded rpath on x86_64 +- fix hardcoded rpath im Makefiles on x86_64 due to freetype-config --libs + returning "-L/usr/lib64 -Wl,--rpath -Wl,/usr/lib64 -lfreetype -lz" +- Update to 1.2.0 -- fixes several security issues +- remove explicit libdir=_libdir - 1.2.9 does not need it anymore +- removeddemo compile/install; +- use configure param --x-libraries={_prefix}/X11R6/{_lib} and patch to fix + "cannot find -lX11" + +* Thu Dec 30 2004 Thorsten Leemhuis - 0:1.1.2-2 +- Disable mmx on x86_64 (fixes Build error) +- Add explicit libdir=_libdir to make calls to avoid install errors on x86_64 +- Add --with-pic configure option (taken from Matthias Saou's package) + * Sat Sep 25 2004 Ville Skytt?? - 0:1.1.2-0.fdr.1 - Update to 1.1.2, fixes CAN-2004-0802. - Enable MMX on all ix86, x86_64 and ia64, it seems runtime-detected. Index: sources =================================================================== RCS file: /cvs/extras/rpms/imlib2/FC-1/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:35:55 -0000 1.3 +++ sources 29 Jan 2005 22:23:12 -0000 1.4 @@ -1 +1 @@ -3389bad516032c951fda4fe620df0cef imlib2-1.1.2.tar.gz +853fb77100ee3c3ca944f52c892ab49b imlib2-1.2.0.tar.gz From fedora-extras-commits at redhat.com Sat Jan 29 22:24:01 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 17:24:01 -0500 Subject: rpms/imlib2 import.log,1.8,1.9 Message-ID: <200501292224.j0TMO1CU016314@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/imlib2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv16304 Modified Files: import.log Log Message: auto-import imlib2-1.2.0-0.fdr.4.2 on branch FC-2 from imlib2-1.2.0-0.fdr.4.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/imlib2/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 29 Jan 2005 22:23:12 -0000 1.8 +++ import.log 29 Jan 2005 22:23:59 -0000 1.9 @@ -5,3 +5,4 @@ imlib2-1_1_2-0_fdr_1_1:FC-1:imlib2-1.1.2-0.fdr.1.1.src.rpm:1099888555 imlib2-1_1_2-0_fdr_1_2:HEAD:imlib2-1.1.2-0.fdr.1.2.src.rpm:1099888558 imlib2-1_2_0-0_fdr_4_1:FC-1:imlib2-1.2.0-0.fdr.4.1.src.rpm:1107037385 +imlib2-1_2_0-0_fdr_4_2:FC-2:imlib2-1.2.0-0.fdr.4.2.src.rpm:1107037432 From fedora-extras-commits at redhat.com Sat Jan 29 22:24:01 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 17:24:01 -0500 Subject: rpms/imlib2/FC-2 imlib2-1.2.0-configure-xlib64.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 imlib2.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200501292224.j0TMO1bT016318@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/imlib2/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv16304/FC-2 Modified Files: .cvsignore imlib2.spec sources Added Files: imlib2-1.2.0-configure-xlib64.patch Log Message: auto-import imlib2-1.2.0-0.fdr.4.2 on branch FC-2 from imlib2-1.2.0-0.fdr.4.2.src.rpm imlib2-1.2.0-configure-xlib64.patch: --- NEW FILE imlib2-1.2.0-configure-xlib64.patch --- --- configure.old 2005-01-09 18:36:09.314185880 +0100 +++ configure 2005-01-09 18:37:15.840072408 +0100 @@ -20262,7 +20262,7 @@ if test "x$have_x" = "xyes"; then x_dir="/usr/X11R6"; x_cflags="-I"$x_dir"/include" - x_libs="-L"$x_dir"/lib -lX11 -lXext" + x_libs="-L"$x_dir"/lib64 -lX11 -lXext" echo "$as_me:$LINENO: result: enabling X11 support" >&5 echo "${ECHO_T}enabling X11 support" >&6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/imlib2/FC-2/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:35:58 -0000 1.3 +++ .cvsignore 29 Jan 2005 22:23:59 -0000 1.4 @@ -1 +1 @@ -imlib2-1.1.2.tar.gz +imlib2-1.2.0.tar.gz Index: imlib2.spec =================================================================== RCS file: /cvs/extras/rpms/imlib2/FC-2/imlib2.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- imlib2.spec 8 Nov 2004 04:35:58 -0000 1.5 +++ imlib2.spec 29 Jan 2005 22:23:59 -0000 1.6 @@ -1,15 +1,19 @@ Summary: A graphic library for file loading, saving, rendering, and manipulation Name: imlib2 -Version: 1.1.2 -Release: 0.fdr.1.2 +Version: 1.2.0 +Release: 0.fdr.4.2 Epoch: 0 License: BSD Group: System Environment/Libraries URL: http://www.enlightenment.org/pages/imlib2.html Source0: http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz +Patch0: imlib2-1.2.0-configure-xlib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: XFree86-devel libjpeg-devel libpng-devel libtiff-devel BuildRequires: libungif-devel freetype-devel libtool bzip2-devel +%ifarch x86_64 +BuildRequires: perl +%endif %package devel Summary: Development package for %{name} @@ -39,33 +43,45 @@ %prep %setup -q +%ifarch x86_64 +%patch0 -b .patch0 +%endif # ----------------------------------------------------------------------------- %build %configure \ -%ifarch %{ix86} x86_64 ia64 + --x-libraries=%{_prefix}/X11R6/%{_lib} \ + --with-pic \ +%ifarch %{ix86} ia64 --enable-mmx +%else + --disable-mmx +%endif +%ifarch x86_64 +# fix hardcoded rpath im Makefiles on x86_64 due to freetype-config --libs +# returning "-L/usr/lib64 -Wl,--rpath -Wl,/usr/lib64 -lfreetype -lz": +perl -pi.orig -e 's|-Wl,--rpath -Wl,/usr/lib64||g;' Makefile */Makefile */*/Makefile imlib2-config %endif -make %{?_smp_mflags} -make -C demo +make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool # ----------------------------------------------------------------------------- %install rm -rf $RPM_BUILD_ROOT __doc -make install DESTDIR=$RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -C demo +make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool cp -a doc __doc rm -f __doc/Makefile* rm -f \ - $RPM_BUILD_ROOT%{_libdir}/libImlib2.la \ - $RPM_BUILD_ROOT%{_libdir}/imlib2_loaders/*/*.*a \ + $RPM_BUILD_ROOT%{_libdir}/imlib2/{loaders,filters}/*.a \ $RPM_BUILD_ROOT%{_bindir}/{color_spaces,imlib2,*test} +# ship .la files due to a bug in kdelibs (see changelog): +# $RPM_BUILD_ROOT%{_libdir}/libImlib2.la \ + # ----------------------------------------------------------------------------- %clean @@ -79,22 +95,62 @@ %files %defattr(-,root,root,-) %doc COPYING AUTHORS README ChangeLog TODO __doc/* -%{_bindir}/imconvert %{_bindir}/imlib2_view +%{_bindir}/imlib2_bumpmap +%{_bindir}/imlib2_colorspace +%{_bindir}/imlib2_conv +%{_bindir}/imlib2_poly +%{_bindir}/imlib2_show %{_libdir}/libImlib2.so.* -%{_libdir}/imlib2_loaders +%{_datadir}/imlib2/data/ +%dir %{_libdir}/imlib2/filters/ +%{_libdir}/imlib2/filters/*.so +%{_libdir}/imlib2/filters/*.la +%dir %{_libdir}/imlib2/loaders/ +%{_libdir}/imlib2/loaders/*.so +%{_libdir}/imlib2/loaders/*.la %files devel %defattr(-,root,root,-) %{_bindir}/imlib2-config %{_includedir}/Imlib2.h %{_libdir}/libImlib2.a +%{_libdir}/libImlib2.la %{_libdir}/libImlib2.so %{_libdir}/pkgconfig/imlib2.pc # ----------------------------------------------------------------------------- %changelog +* Tue Jan 18 2005 Michael Schwendt - 0:1.2.0-4 +- Make this 1.2.0-0.fdr.4 for FC2 and older. +- Really include libtool archives to fix fedora.us bug #2284. + +* Fri Jan 14 2005 Thorsten Leemhuis - 0:1.2.0-3 +- Move filters and loaders back into main package where they belong + +* Mon Jan 10 2005 Thorsten Leemhuis - 0:1.2.0-2 +- Don't ship *.?.a in {_libdir}/imlib/filters/ and loaders/ + +* Sun Jan 09 2005 Thorsten Leemhuis - 0:1.2.0-1 +- Ship .la files ue to a bug in kdelibs; see + https://bugzilla.fedora.us/show_bug.cgi?id=2284 + http://bugzilla.redhat.com/bugzilla/142244 + http://bugs.kde.org/93359 +- Use make param LIBTOOL=/usr/bin/libtool - fixes hardcoded rpath on x86_64 +- fix hardcoded rpath im Makefiles on x86_64 due to freetype-config --libs + returning "-L/usr/lib64 -Wl,--rpath -Wl,/usr/lib64 -lfreetype -lz" +- Update to 1.2.0 -- fixes several security issues +- remove explicit libdir=_libdir - 1.2.9 does not need it anymore +- removeddemo compile/install; +- use configure param --x-libraries={_prefix}/X11R6/{_lib} and patch to fix + "cannot find -lX11" + +* Thu Dec 30 2004 Thorsten Leemhuis - 0:1.1.2-2 +- Disable mmx on x86_64 (fixes Build error) +- Add explicit libdir=_libdir to make calls to avoid install errors on x86_64 +- Add --with-pic configure option (taken from Matthias Saou's package) + * Sat Sep 25 2004 Ville Skytt?? - 0:1.1.2-0.fdr.1 - Update to 1.1.2, fixes CAN-2004-0802. - Enable MMX on all ix86, x86_64 and ia64, it seems runtime-detected. Index: sources =================================================================== RCS file: /cvs/extras/rpms/imlib2/FC-2/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:35:58 -0000 1.3 +++ sources 29 Jan 2005 22:23:59 -0000 1.4 @@ -1 +1 @@ -3389bad516032c951fda4fe620df0cef imlib2-1.1.2.tar.gz +853fb77100ee3c3ca944f52c892ab49b imlib2-1.2.0.tar.gz From fedora-extras-commits at redhat.com Sat Jan 29 22:57:19 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 17:57:19 -0500 Subject: rpms/zope import.log,1.2,1.3 Message-ID: <200501292257.j0TMvJoe016510@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/zope In directory cvs.fedora.redhat.com:/tmp/cvs-serv16501 Modified Files: import.log Log Message: auto-import zope-2.7.4-1 on branch devel from zope-2.7.4-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/zope/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 9 Jan 2005 12:09:24 -0000 1.2 +++ import.log 29 Jan 2005 22:57:17 -0000 1.3 @@ -1 +1,2 @@ zope-2_7_3-6:HEAD:zope-2.7.3-6.src.rpm:1105272558 +zope-2_7_4-1:HEAD:zope-2.7.4-1.src.rpm:1107039430 From fedora-extras-commits at redhat.com Sat Jan 29 22:57:19 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 17:57:19 -0500 Subject: rpms/zope/devel zope.logrotate.cron.in, NONE, 1.1 zope.logrotate.in, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 zope.spec, 1.1, 1.2 Message-ID: <200501292257.j0TMvJJg016514@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/zope/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv16501/devel Modified Files: .cvsignore sources zope.spec Added Files: zope.logrotate.cron.in zope.logrotate.in Log Message: auto-import zope-2.7.4-1 on branch devel from zope-2.7.4-1.src.rpm --- NEW FILE zope.logrotate.cron.in --- #!/bin/bash . <>/sysconfig/zope for instance in $ZOPE_INSTANCES; do logrotate $instance/etc/logrotate.conf done --- NEW FILE zope.logrotate.in --- <>/log/*.log { missingok sharedscripts rotate 4 weekly compress postrotate <>/bin/zopectl logreopen >/dev/null 2>&1 endscript } Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/zope/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Jan 2005 12:09:24 -0000 1.2 +++ .cvsignore 29 Jan 2005 22:57:17 -0000 1.3 @@ -1 +1 @@ -Zope-2.7.3-0.tgz +Zope-2.7.4-0.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/zope/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Jan 2005 12:09:24 -0000 1.2 +++ sources 29 Jan 2005 22:57:17 -0000 1.3 @@ -1 +1 @@ -15001ab6d429dc80b1f49735e8d2ee10 Zope-2.7.3-0.tgz +97c310f1de4609956c176588b08b25c5 Zope-2.7.4-0.tgz Index: zope.spec =================================================================== RCS file: /cvs/extras/rpms/zope/devel/zope.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- zope.spec 9 Jan 2005 12:09:24 -0000 1.1 +++ zope.spec 29 Jan 2005 22:57:17 -0000 1.2 @@ -12,19 +12,20 @@ Name: zope Summary: Web application server for flexible content management applications -Version: 2.7.3 -Release: 6 +Version: 2.7.4 +Release: 1 License: ZPL Group: System Environment/Daemons URL: http://www.zope.org/ -Source: http://zope.org/Products/Zope/2.7.3/Zope-2.7.3-0.tgz +Source: http://zope.org/Products/Zope/2.7.4/Zope-2.7.4-0.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: zope.init.in -#Source2: http://plope.com/software/zope-rpm/zope.logrotate.in Source2: zope.sysconfig.in Source3: zope.zopectl.in Source4: zope-README.Fedora +Source5: zope.logrotate.in +Source6: zope.logrotate.cron.in Patch0: zope-2.7.3-config.patch BuildRequires: python-devel >= %{python_minver} @@ -47,7 +48,9 @@ # Do not use -b option, or we'll install the backup too %patch0 -p1 -b .config rm -f skel/etc/zope.conf.in.config +chmod -x skel/import/README.txt cp -p %{SOURCE4} README.Fedora +cp -p %{SOURCE5} skel/etc/logrotate.conf.in %build @@ -75,6 +78,7 @@ install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/zope install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/zope install -D -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/zopectl +install -D -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/zope-logrotate perl -pi -e 's,<>,%{_sysconfdir},g; s,<>,%{_bindir},g; s,<>,%{_localstatedir},g; @@ -82,12 +86,13 @@ $RPM_BUILD_ROOT%{_initrddir}/zope \ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/zope \ $RPM_BUILD_ROOT%{_bindir}/zopectl \ + $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/zope-logrotate \ README.Fedora skel/etc/zope.conf.in # Install the skel, translating paths, into the build root %{__python} "utilities/copyzopeskel.py" \ --sourcedir="skel" \ - --targetdir="$RPM_BUILD_ROOT%{_localstatedir}/lib/zope" \ + --targetdir="$RPM_BUILD_ROOT%{instance_home}" \ --replace="INSTANCE_HOME:%{instance_home}" \ --replace="SOFTWARE_HOME:%{software_home}" \ --replace="ZOPE_HOME:%{zope_home}" \ @@ -96,7 +101,8 @@ # Actually copy all the other files over make install -chmod 700 $RPM_BUILD_ROOT%{_localstatedir}/lib/zope +chmod 700 $RPM_BUILD_ROOT%{instance_home} +chmod 755 $RPM_BUILD_ROOT%{zope_home} # Symlink to include in the docs ln -sf %{zope_home}/doc docs @@ -110,6 +116,8 @@ compileall.compile_dir(\"$RPM_BUILD_ROOT%{zope_home}\", \ ddir=\"%{zope_home}\", force=1)" + + %clean rm -rf $RPM_BUILD_ROOT @@ -137,18 +145,50 @@ fi + %files %defattr(-, root, root, -) +%doc %{zope_home}/doc %doc docs README.Fedora %config(noreplace) %{_sysconfdir}/sysconfig/zope %config %{_initrddir}/zope +%config %{_sysconfdir}/cron.daily/zope-logrotate %attr(0755, root, root) %{_bindir}/zopectl -%{zope_home} -%attr(-, %{zope_user}, %{zope_group}) %verify(not md5 size mtime) %{instance_home} +%dir %{zope_home} +%{zope_home}/bin +%{zope_home}/import +%{zope_home}/lib +%dir %{zope_home}/skel +%{zope_home}/skel/bin +%{zope_home}/skel/Extensions +%{zope_home}/skel/import +%{zope_home}/skel/log +%{zope_home}/skel/Products +%{zope_home}/skel/README.txt +%{zope_home}/skel/var +%config %{zope_home}/skel/etc +%attr(-, %{zope_user}, %{zope_group}) %dir %{instance_home} +%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/bin +%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/Extensions +%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/import +%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/log +%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/Products +%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/README.txt +%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/var +%attr(-, %{zope_user}, %{zope_group}) %config %{instance_home}/etc + %changelog -* Fri Dec 10 2004 Aurelien Bompard 2.7.3-6 +* Wed Jan 26 2005 Aurelien Bompard 2.7.4-1 +- version 2.7.4 +- flag the documentation as %%doc +- make %%zope_home go+rx to allow users to create instances and to allow + access to docs +- add a logrotate cron job +- flag config files as %%config even in %%zope_home and %%instance_home + +* Fri Dec 10 2004 Aurelien Bompard 2.7.3-0.fdr.6 - activate "security-policy-implementation python" in zope.conf * Sun Nov 21 2004 Aurelien Bompard 2.7.3-0.fdr.5 From fedora-extras-commits at redhat.com Sat Jan 29 23:29:38 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:29:38 -0500 Subject: rpms/awstats import.log,1.2,1.3 Message-ID: <200501292329.j0TNTc4x017332@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/awstats In directory cvs.fedora.redhat.com:/tmp/cvs-serv17323 Modified Files: import.log Log Message: auto-import awstats-6.3-0.fdr.0.1.20050122.2 on branch FC-2 from awstats-6.3-0.fdr.0.1.20050122.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/awstats/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 8 Nov 2004 04:04:34 -0000 1.2 +++ import.log 29 Jan 2005 23:29:36 -0000 1.3 @@ -1 +1,2 @@ awstats-6_1-0_fdr_6:HEAD:awstats-6.1-0.fdr.6.src.rpm:1099886674 +awstats-6_3-0_fdr_0_1_20050122_2:FC-2:awstats-6.3-0.fdr.0.1.20050122.2.src.rpm:1107041369 From fedora-extras-commits at redhat.com Sat Jan 29 23:29:38 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:29:38 -0500 Subject: rpms/awstats/FC-2 .cvsignore, 1.2, 1.3 awstats.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200501292329.j0TNTc2o017336@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/awstats/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv17323/FC-2 Modified Files: .cvsignore awstats.spec sources Log Message: auto-import awstats-6.3-0.fdr.0.1.20050122.2 on branch FC-2 from awstats-6.3-0.fdr.0.1.20050122.2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-2/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:04:34 -0000 1.2 +++ .cvsignore 29 Jan 2005 23:29:36 -0000 1.3 @@ -1 +1 @@ -awstats-6.1.tgz +awstats-6.3.tgz Index: awstats.spec =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-2/awstats.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- awstats.spec 8 Nov 2004 04:04:34 -0000 1.1 +++ awstats.spec 29 Jan 2005 23:29:36 -0000 1.2 @@ -1,11 +1,12 @@ Name: awstats -Version: 6.1 -Release: 0.fdr.6 +Version: 6.3 +Release: 0.fdr.0.1.20050122.2 Summary: Advanced Web Statistics License: GPL Group: Applications/Internet URL: http://awstats.sourceforge.net -Source0: http://dl.sf.net/awstats/awstats-6.1.tgz +Source0: http://awstats.sourceforge.net/files/awstats-6.3.tgz +#Source0: http://dl.sf.net/awstats/awstats-6.3.tgz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: httpd @@ -150,6 +151,12 @@ %{_datadir}/%{name}/wwwroot/js %changelog +* Thu Jan 27 2005 Aurelien Bompard 6.3-0.fdr.0.1.20050122 +- update to 6.3pre to fix vulnerability + +* Sun Nov 28 2004 Aurelien Bompard 6.2-0.fdr.1 +- version 6.2 + * Thu May 20 2004 Aurelien Bompard 6.1-0.fdr.6 - remove redundant substitution Index: sources =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-2/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:04:34 -0000 1.2 +++ sources 29 Jan 2005 23:29:36 -0000 1.3 @@ -1 +1 @@ -4f02c0fc4f1a0f946fcae3b3768bf113 awstats-6.1.tgz +4335067362c3033ca2c03e08abc67d73 awstats-6.3.tgz From fedora-extras-commits at redhat.com Sat Jan 29 23:30:44 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:30:44 -0500 Subject: rpms/awstats import.log,1.3,1.4 Message-ID: <200501292330.j0TNUiln017442@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/awstats In directory cvs.fedora.redhat.com:/tmp/cvs-serv17433 Modified Files: import.log Log Message: auto-import awstats-6.3-0.1.20050122 on branch devel from awstats-6.3-0.1.20050122.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/awstats/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 29 Jan 2005 23:29:36 -0000 1.3 +++ import.log 29 Jan 2005 23:30:42 -0000 1.4 @@ -1,2 +1,3 @@ awstats-6_1-0_fdr_6:HEAD:awstats-6.1-0.fdr.6.src.rpm:1099886674 awstats-6_3-0_fdr_0_1_20050122_2:FC-2:awstats-6.3-0.fdr.0.1.20050122.2.src.rpm:1107041369 +awstats-6_3-0_1_20050122:HEAD:awstats-6.3-0.1.20050122.src.rpm:1107041435 From fedora-extras-commits at redhat.com Sat Jan 29 23:30:44 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:30:44 -0500 Subject: rpms/awstats/devel .cvsignore, 1.2, 1.3 awstats.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200501292330.j0TNUilD017446@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/awstats/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17433/devel Modified Files: .cvsignore awstats.spec sources Log Message: auto-import awstats-6.3-0.1.20050122 on branch devel from awstats-6.3-0.1.20050122.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/awstats/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:04:34 -0000 1.2 +++ .cvsignore 29 Jan 2005 23:30:42 -0000 1.3 @@ -1 +1 @@ -awstats-6.1.tgz +awstats-6.3.tgz Index: awstats.spec =================================================================== RCS file: /cvs/extras/rpms/awstats/devel/awstats.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- awstats.spec 10 Dec 2004 22:03:01 -0000 1.2 +++ awstats.spec 29 Jan 2005 23:30:42 -0000 1.3 @@ -1,11 +1,12 @@ Name: awstats -Version: 6.1 -Release: 6 +Version: 6.3 +Release: 0.1.20050122 Summary: Advanced Web Statistics License: GPL Group: Applications/Internet URL: http://awstats.sourceforge.net -Source0: http://dl.sf.net/awstats/awstats-6.1.tgz +Source0: http://awstats.sourceforge.net/files/awstats-6.3.tgz +#Source0: http://dl.sf.net/awstats/awstats-6.3.tgz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: httpd @@ -150,6 +151,12 @@ %{_datadir}/%{name}/wwwroot/js %changelog +* Thu Jan 27 2005 Aurelien Bompard 6.3-0.1.20050122 +- update to 6.3pre to fix vulnerability + +* Sun Nov 28 2004 Aurelien Bompard 6.2-0.fdr.1 +- version 6.2 + * Thu May 20 2004 Aurelien Bompard 6.1-0.fdr.6 - remove redundant substitution Index: sources =================================================================== RCS file: /cvs/extras/rpms/awstats/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:04:34 -0000 1.2 +++ sources 29 Jan 2005 23:30:42 -0000 1.3 @@ -1 +1 @@ -4f02c0fc4f1a0f946fcae3b3768bf113 awstats-6.1.tgz +4335067362c3033ca2c03e08abc67d73 awstats-6.3.tgz From fedora-extras-commits at redhat.com Sat Jan 29 23:32:27 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:32:27 -0500 Subject: rpms/libkexif import.log,1.2,1.3 Message-ID: <200501292332.j0TNWRak017567@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libkexif In directory cvs.fedora.redhat.com:/tmp/cvs-serv17557 Modified Files: import.log Log Message: auto-import libkexif-0.2.1-1 on branch devel from libkexif-0.2.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libkexif/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 12 Jan 2005 20:12:52 -0000 1.2 +++ import.log 29 Jan 2005 23:32:25 -0000 1.3 @@ -1 +1,2 @@ libkexif-0_1-2:HEAD:libkexif-0.1-2.src.rpm:1105560811 +libkexif-0_2_1-1:HEAD:libkexif-0.2.1-1.src.rpm:1107041539 From fedora-extras-commits at redhat.com Sat Jan 29 23:32:27 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:32:27 -0500 Subject: rpms/libkexif/devel .cvsignore, 1.2, 1.3 libkexif.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200501292332.j0TNWRqa017570@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libkexif/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17557/devel Modified Files: .cvsignore libkexif.spec sources Log Message: auto-import libkexif-0.2.1-1 on branch devel from libkexif-0.2.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libkexif/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Jan 2005 20:12:52 -0000 1.2 +++ .cvsignore 29 Jan 2005 23:32:25 -0000 1.3 @@ -1 +1 @@ -libkexif-0.1.tar.bz2 +libkexif-0.2.1.tar.bz2 Index: libkexif.spec =================================================================== RCS file: /cvs/extras/rpms/libkexif/devel/libkexif.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libkexif.spec 12 Jan 2005 20:12:52 -0000 1.1 +++ libkexif.spec 29 Jan 2005 23:32:25 -0000 1.2 @@ -1,19 +1,18 @@ Name: libkexif -Version: 0.1 -Release: 2 +Version: 0.2.1 +Release: 1 Epoch: 0 Summary: Allow Kipi plugins to extract EXIF information Group: System Environment/Libraries License: GPL -URL: http://extragear.kde.org/apps/kipi.php -Source0: http://dl.sf.net/digikam/libkexif-0.1.tar.bz2 +URL: http://extragear.kde.org/apps/kipi +Source0: http://dl.sf.net/digikam/libkexif-0.2.1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libexif-devel >= 0:0.5.7, kdelibs-devel >= 6:3.0 BuildRequires: gettext - %description This library allows Kipi plugins to extract EXIF information from JPEG files. @@ -72,7 +71,11 @@ %changelog -* Wed Jan 05 2005 Aurelien Bompard 0:0.1-2 +* Mon Jan 24 2005 Aurelien Bompard 0:0.2.1-1 +- version 0.2.1 +- update URL tag + +* Wed Jan 05 2005 Aurelien Bompard 0:0.1-0.fdr.2 - Licence is GPL not LGPL - Fix -devel description and requirements - Switch group to "System Environment/Libraries" Index: sources =================================================================== RCS file: /cvs/extras/rpms/libkexif/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Jan 2005 20:12:52 -0000 1.2 +++ sources 29 Jan 2005 23:32:25 -0000 1.3 @@ -1 +1 @@ -2d1ed6285fd9490c72327ff6dacd9185 libkexif-0.1.tar.bz2 +28a7eb727d6a884343ce8cbe061cb58f libkexif-0.2.1.tar.bz2 From fedora-extras-commits at redhat.com Sat Jan 29 23:45:10 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:45:10 -0500 Subject: rpms/gwenview import.log,1.3,1.4 Message-ID: <200501292345.j0TNjA9X017702@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/gwenview In directory cvs.fedora.redhat.com:/tmp/cvs-serv17693 Modified Files: import.log Log Message: auto-import gwenview-1.1.6-0.fdr.2.2 on branch FC-2 from gwenview-1.1.6-0.fdr.2.2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gwenview/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 8 Nov 2004 04:33:22 -0000 1.3 +++ import.log 29 Jan 2005 23:45:08 -0000 1.4 @@ -1,2 +1,3 @@ gwenview-1_0_1-0_fdr_4_1:HEAD:gwenview-1.0.1-0.fdr.4.1.src.rpm:1099888393 gwenview-1_0_1-0_fdr_4_1_90:HEAD:gwenview-1.0.1-0.fdr.4.1.90.src.rpm:1099888402 +gwenview-1_1_6-0_fdr_2_2:FC-2:gwenview-1.1.6-0.fdr.2.2.src.rpm:1107042302 From fedora-extras-commits at redhat.com Sat Jan 29 23:45:10 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:45:10 -0500 Subject: rpms/gwenview/FC-2 .cvsignore, 1.2, 1.3 gwenview.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200501292345.j0TNjAie017707@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/gwenview/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv17693/FC-2 Modified Files: .cvsignore gwenview.spec sources Log Message: auto-import gwenview-1.1.6-0.fdr.2.2 on branch FC-2 from gwenview-1.1.6-0.fdr.2.2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gwenview/FC-2/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:33:13 -0000 1.2 +++ .cvsignore 29 Jan 2005 23:45:08 -0000 1.3 @@ -1 +1 @@ -gwenview-1.0.1.tar.bz2 +gwenview-1.1.6.tar.bz2 Index: gwenview.spec =================================================================== RCS file: /cvs/extras/rpms/gwenview/FC-2/gwenview.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gwenview.spec 8 Nov 2004 04:33:22 -0000 1.2 +++ gwenview.spec 29 Jan 2005 23:45:08 -0000 1.3 @@ -1,32 +1,20 @@ - -# Fedora Core 2 support. -%define fedora_release %(if test -n "$(rpm -ql fedora-release | grep -m1 etc)"; then rpm -q --qf "%%{version}" fedora-release; else echo 0; fi ) -%if "%fedora_release" > "1" -%define target_kde32 1 -%endif -%{?_with_kde32: %define target_kde32 1} - Name: gwenview -Version: 1.0.1 -Release: 0.fdr.4.1.90 +Version: 1.1.6 +Release: 0.fdr.2.2 Epoch: 0 Summary: Simple image viewer for KDE. Group: Applications/Multimedia License: GPL URL: http://gwenview.sf.net -Source0: http://dl.sf.net/gwenview/gwenview-1.0.1.tar.bz2 +Source0: http://dl.sf.net/gwenview/gwenview-1.1.6.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdelibs-devel >= 6:3.0.0, arts-devel -BuildRequires: XFree86-devel, zlib-devel, libjpeg-devel -BuildRequires: libart_lgpl-devel, desktop-file-utils -BuildRequires: libpng-devel, gettext - -%if 0%{?target_kde32} -BuildRequires: libmng-devel fam-devel glib2-devel -%endif - +BuildRequires: kdelibs-devel >= 6:3.1 +BuildRequires: desktop-file-utils +BuildRequires: libkipi-devel +BuildRequires: gettext +#BuildRequires: fam-devel glib2-devel %description Gwenview is an image viewer for KDE. @@ -38,14 +26,15 @@ %prep %setup -q -perl -pi -e 's,Categories=Qt;KDE;Graphics,Categories=Qt;KDE;Graphics;,' desktopfiles/gwenview.desktop perl -pi -e 's,Commend\[ko\]=,Comment\[ko\]=,' desktopfiles/gwenview.desktop +#perl -pi -e 's,Categories=Qt;KDE;Graphics,Categories=Qt;KDE;Graphics;,' desktopfiles/gwenview.desktop %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh %configure --disable-rpath \ --disable-debug \ - --enable-final + --enable-kipi +# --enable-final \ make %{?_smp_mflags} @@ -54,22 +43,19 @@ make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install --vendor fedora --delete-original \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ --add-category X-Fedora \ --add-category Application \ --add-category Viewer \ $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop -# KDE 3.2: -%if 0%{?target_kde32} -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/kde -mv $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop $RPM_BUILD_ROOT%{_datadir}/applications/kde/ -%endif +rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/{xx,ven,nso} +%find_lang %{name} -rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/{xx,ven,nso} +%post -p /sbin/ldconfig -%find_lang %{name} +%postun -p /sbin/ldconfig %clean @@ -80,18 +66,24 @@ %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README TODO CREDITS %{_bindir}/* -%if 0%{?target_kde32} %{_datadir}/applications/kde/*.desktop -%else -%{_datadir}/applications/*.desktop -%endif %{_datadir}/apps/konqueror/servicemenus/* %{_datadir}/icons/*/*/apps/* -%{_datadir}/apps/%{name} +%{_datadir}/apps/* +%{_datadir}/services/*.desktop %{_mandir}/man1/* +%{_libdir}/lib* +%{_libdir}/kde3/lib* %changelog +* Wed Nov 24 2004 Aurelien Bompard 0:1.1.6-0.fdr.2 +- remove hardcoded requirement to kipi-plugins + +* Mon Oct 25 2004 Aurelien Bompard 0:1.1.6-0.fdr.1 +- version 1.1.6 +- drop FC1 support + * Wed Mar 17 2004 Aurelien Bompard 0:1.0.1-0.fdr.4 - fix typo in desktop file Index: sources =================================================================== RCS file: /cvs/extras/rpms/gwenview/FC-2/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:33:13 -0000 1.2 +++ sources 29 Jan 2005 23:45:08 -0000 1.3 @@ -1 +1 @@ -98bc89e3bda282cf192f84bd1fc03fdf gwenview-1.0.1.tar.bz2 +2c1bf6f363165273350888e0a7e00168 gwenview-1.1.6.tar.bz2 From fedora-extras-commits at redhat.com Sat Jan 29 23:45:59 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:45:59 -0500 Subject: rpms/gwenview import.log,1.4,1.5 Message-ID: <200501292345.j0TNjxxW017814@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/gwenview In directory cvs.fedora.redhat.com:/tmp/cvs-serv17804 Modified Files: import.log Log Message: auto-import gwenview-1.1.6-2 on branch devel from gwenview-1.1.6-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gwenview/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 29 Jan 2005 23:45:08 -0000 1.4 +++ import.log 29 Jan 2005 23:45:57 -0000 1.5 @@ -1,3 +1,4 @@ gwenview-1_0_1-0_fdr_4_1:HEAD:gwenview-1.0.1-0.fdr.4.1.src.rpm:1099888393 gwenview-1_0_1-0_fdr_4_1_90:HEAD:gwenview-1.0.1-0.fdr.4.1.90.src.rpm:1099888402 gwenview-1_1_6-0_fdr_2_2:FC-2:gwenview-1.1.6-0.fdr.2.2.src.rpm:1107042302 +gwenview-1_1_6-2:HEAD:gwenview-1.1.6-2.src.rpm:1107042351 From fedora-extras-commits at redhat.com Sat Jan 29 23:45:59 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:45:59 -0500 Subject: rpms/gwenview/devel .cvsignore, 1.2, 1.3 gwenview.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200501292345.j0TNjxPE017817@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/gwenview/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17804/devel Modified Files: .cvsignore gwenview.spec sources Log Message: auto-import gwenview-1.1.6-2 on branch devel from gwenview-1.1.6-2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gwenview/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:33:13 -0000 1.2 +++ .cvsignore 29 Jan 2005 23:45:57 -0000 1.3 @@ -1 +1 @@ -gwenview-1.0.1.tar.bz2 +gwenview-1.1.6.tar.bz2 Index: gwenview.spec =================================================================== RCS file: /cvs/extras/rpms/gwenview/devel/gwenview.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gwenview.spec 10 Dec 2004 22:03:03 -0000 1.3 +++ gwenview.spec 29 Jan 2005 23:45:57 -0000 1.4 @@ -1,32 +1,20 @@ - -# Fedora Core 2 support. -%define fedora_release %(if test -n "$(rpm -ql fedora-release | grep -m1 etc)"; then rpm -q --qf "%%{version}" fedora-release; else echo 0; fi ) -%if "%fedora_release" > "1" -%define target_kde32 1 -%endif -%{?_with_kde32: %define target_kde32 1} - Name: gwenview -Version: 1.0.1 -Release: 4 +Version: 1.1.6 +Release: 2 Epoch: 0 Summary: Simple image viewer for KDE. Group: Applications/Multimedia License: GPL URL: http://gwenview.sf.net -Source0: http://dl.sf.net/gwenview/gwenview-1.0.1.tar.bz2 +Source0: http://dl.sf.net/gwenview/gwenview-1.1.6.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdelibs-devel >= 6:3.0.0, arts-devel -BuildRequires: XFree86-devel, zlib-devel, libjpeg-devel -BuildRequires: libart_lgpl-devel, desktop-file-utils -BuildRequires: libpng-devel, gettext - -%if 0%{?target_kde32} -BuildRequires: libmng-devel fam-devel glib2-devel -%endif - +BuildRequires: kdelibs-devel >= 6:3.1 +BuildRequires: desktop-file-utils +BuildRequires: libkipi-devel +BuildRequires: gettext +#BuildRequires: fam-devel glib2-devel %description Gwenview is an image viewer for KDE. @@ -38,14 +26,15 @@ %prep %setup -q -perl -pi -e 's,Categories=Qt;KDE;Graphics,Categories=Qt;KDE;Graphics;,' desktopfiles/gwenview.desktop perl -pi -e 's,Commend\[ko\]=,Comment\[ko\]=,' desktopfiles/gwenview.desktop +#perl -pi -e 's,Categories=Qt;KDE;Graphics,Categories=Qt;KDE;Graphics;,' desktopfiles/gwenview.desktop %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh %configure --disable-rpath \ --disable-debug \ - --enable-final + --enable-kipi +# --enable-final \ make %{?_smp_mflags} @@ -54,22 +43,19 @@ make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install --vendor fedora --delete-original \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ --add-category X-Fedora \ --add-category Application \ --add-category Viewer \ $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop -# KDE 3.2: -%if 0%{?target_kde32} -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/kde -mv $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop $RPM_BUILD_ROOT%{_datadir}/applications/kde/ -%endif +rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/{xx,ven,nso} +%find_lang %{name} -rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/{xx,ven,nso} +%post -p /sbin/ldconfig -%find_lang %{name} +%postun -p /sbin/ldconfig %clean @@ -80,18 +66,24 @@ %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README TODO CREDITS %{_bindir}/* -%if 0%{?target_kde32} %{_datadir}/applications/kde/*.desktop -%else -%{_datadir}/applications/*.desktop -%endif %{_datadir}/apps/konqueror/servicemenus/* %{_datadir}/icons/*/*/apps/* -%{_datadir}/apps/%{name} +%{_datadir}/apps/* +%{_datadir}/services/*.desktop %{_mandir}/man1/* +%{_libdir}/lib* +%{_libdir}/kde3/lib* %changelog +* Wed Nov 24 2004 Aurelien Bompard 0:1.1.6-2 +- remove hardcoded requirement to kipi-plugins + +* Mon Oct 25 2004 Aurelien Bompard 0:1.1.6-0.fdr.1 +- version 1.1.6 +- drop FC1 support + * Wed Mar 17 2004 Aurelien Bompard 0:1.0.1-0.fdr.4 - fix typo in desktop file Index: sources =================================================================== RCS file: /cvs/extras/rpms/gwenview/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:33:13 -0000 1.2 +++ sources 29 Jan 2005 23:45:57 -0000 1.3 @@ -1 +1 @@ -98bc89e3bda282cf192f84bd1fc03fdf gwenview-1.0.1.tar.bz2 +2c1bf6f363165273350888e0a7e00168 gwenview-1.1.6.tar.bz2 From fedora-extras-commits at redhat.com Sat Jan 29 23:47:58 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:47:58 -0500 Subject: rpms/showimg - New directory Message-ID: <200501292347.j0TNlwgA017940@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/showimg In directory cvs.fedora.redhat.com:/tmp/cvs-serv17933/showimg Log Message: Directory /cvs/extras/rpms/showimg added to the repository From fedora-extras-commits at redhat.com Sat Jan 29 23:47:58 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:47:58 -0500 Subject: rpms/showimg/devel - New directory Message-ID: <200501292347.j0TNlw7F017943@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/showimg/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17933/showimg/devel Log Message: Directory /cvs/extras/rpms/showimg/devel added to the repository From fedora-extras-commits at redhat.com Sat Jan 29 23:48:16 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:48:16 -0500 Subject: rpms/showimg Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501292348.j0TNmGZx018002@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/showimg In directory cvs.fedora.redhat.com:/tmp/cvs-serv17993 Added Files: Makefile import.log Log Message: Setup of module showimg --- NEW FILE Makefile --- # Top level Makefile for module showimg all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 29 23:48:16 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:48:16 -0500 Subject: rpms/showimg/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501292348.j0TNmGuc018005@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/showimg/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv17993/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module showimg --- NEW 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 Jan 29 23:49:58 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:49:58 -0500 Subject: rpms/showimg import.log,1.1,1.2 Message-ID: <200501292349.j0TNnwNC018100@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/showimg In directory cvs.fedora.redhat.com:/tmp/cvs-serv18091 Modified Files: import.log Log Message: auto-import showimg-0.9.4.1-2 on branch devel from showimg-0.9.4.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/showimg/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 29 Jan 2005 23:48:14 -0000 1.1 +++ import.log 29 Jan 2005 23:49:56 -0000 1.2 @@ -0,0 +1 @@ +showimg-0_9_4_1-2:HEAD:showimg-0.9.4.1-2.src.rpm:1107042589 From fedora-extras-commits at redhat.com Sat Jan 29 23:49:58 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 29 Jan 2005 18:49:58 -0500 Subject: rpms/showimg/devel showimg.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501292349.j0TNnwEZ018104@cvs.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/showimg/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv18091/devel Modified Files: .cvsignore sources Added Files: showimg.spec Log Message: auto-import showimg-0.9.4.1-2 on branch devel from showimg-0.9.4.1-2.src.rpm --- NEW FILE showimg.spec --- Name: showimg Version: 0.9.4.1 Release: 2 Epoch: 0 Summary: Feature-rich image viewer for KDE. Group: Applications/Multimedia License: GPL URL: http://www.jalix.org/projects/showimg Source0: http://www.jalix.org/projects/showimg/download/0.9.4-1/showimg-0.9.4-1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils BuildRequires: kdebase-devel >= 6:3.0.0 BuildRequires: gettext BuildRequires: glib2-devel BuildRequires: libkipi-devel, libkexif-devel, libexif-devel Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig %description ShowImg is a feature-rich image viewer for KDE including an image management system. It is highly configurable and supports numerous image formats. %prep %setup -q -n %{name}-0.9.4-1 #perl -pi -e 's/KDE_DOCS=AUTO/KDE_DOCS=showimg/g' doc/??/Makefile.am %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh %configure --disable-rpath \ --disable-debug \ # --enable-final \ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/kde desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ --add-category X-Fedora \ --add-category Application \ --add-category Viewer \ --add-category Graphics \ $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/%{name}.desktop rm -f $RPM_BUILD_ROOT%{_datadir}/apps/showimg/convert2png.pl #find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %find_lang %{name} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README %{_bindir}/* %{_datadir}/applications/kde/*.desktop %{_datadir}/apps/%{name} %{_datadir}/apps/konqueror/servicemenus/* %{_datadir}/apps/showimgpart/showimgpart.rc %{_datadir}/services/showimgpart.desktop %{_datadir}/icons/*/*/apps/* %{_mandir}/man1/* %{_datadir}/doc/HTML/*/%{name} %{_datadir}/mimelnk/image/*.desktop %{_libdir}/kde3/libshowimgpart.* %{_libdir}/libshowimgcore.* %changelog * Mon Jan 24 2005 Aurelien Bompard 0:0.9.4.1-2 - rebuild for libkexif 0.2.1 * Thu Jan 20 2005 Aurelien Bompard 0:0.9.4.1-0.fdr.1 - version 0.9.4-1: fixes a dependency problem on libkexif 0.2.x * Wed Dec 01 2004 Aurelien Bompard 0:0.9.4-0.fdr.2 - fix BuildRequires * Tue Nov 30 2004 Aurelien Bompard 0:0.9.4-0.fdr.1 - version 0.9.4 final - remove perl script requiring the GIMP module until it is packaged * Mon Nov 22 2004 Aurelien Bompard 0:0.9.4-0.fdr.0.3.rc2 - update to rc2 * Mon Nov 15 2004 Aurelien Bompard 0:0.9.4-0.fdr.0.2.rc1 - update to rc1 * Sun Sep 26 2004 Aurelien Bompard 0:0.9.4-0.fdr.1 - version 0.9.4 - drop support for FC1 (EOL) - use libkipi for plugins * Tue Jul 06 2004 Aurelien Bompard 0:0.9.3-0.fdr.1 - version 0.9.3 - make digikam support conditionnal * Tue Mar 23 2004 Aurelien Bompard 0:0.9.2-0.fdr.1 - version 0.9.2 * Mon Mar 22 2004 Aurelien Bompard 0:0.9.1-0.fdr.2 - let rpm set dependencies on libjpeg and kdelibs - desktop file for kde32 should not have the fedora prefix * Sun Mar 21 2004 Aurelien Bompard 0:0.9.1-0.fdr.1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/showimg/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 29 Jan 2005 23:48:14 -0000 1.1 +++ .cvsignore 29 Jan 2005 23:49:56 -0000 1.2 @@ -0,0 +1 @@ +showimg-0.9.4-1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/showimg/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 29 Jan 2005 23:48:14 -0000 1.1 +++ sources 29 Jan 2005 23:49:56 -0000 1.2 @@ -0,0 +1 @@ +d6cebe9a627aaa4f0ec57e95f403d5fa showimg-0.9.4-1.tar.bz2 From fedora-extras-commits at redhat.com Sun Jan 30 22:28:08 2005 From: fedora-extras-commits at redhat.com (Phillip Compton (pcompton)) Date: Sun, 30 Jan 2005 17:28:08 -0500 Subject: devel/firestarter .cvsignore, 1.6, 1.7 firestarter.spec, 1.6, 1.7 sources, 1.6, 1.7 Message-ID: <200501302228.j0UMS81E010284@cvs.fedora.redhat.com> Author: pcompton Update of /cvs/extras/devel/firestarter In directory cvs.fedora.redhat.com:/tmp/cvs-serv10273 Modified Files: .cvsignore firestarter.spec sources Log Message: firestarter 1.0.3 (many bugfixes, especially for samba users) Index: .cvsignore =================================================================== RCS file: /cvs/extras/devel/firestarter/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 19 Dec 2004 15:39:05 -0000 1.6 +++ .cvsignore 30 Jan 2005 22:28:05 -0000 1.7 @@ -1 +1,2 @@ firestarter-1.0.1.tar.gz +firestarter-1.0.3.tar.gz Index: firestarter.spec =================================================================== RCS file: /cvs/extras/devel/firestarter/firestarter.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- firestarter.spec 19 Dec 2004 15:39:05 -0000 1.6 +++ firestarter.spec 30 Jan 2005 22:28:05 -0000 1.7 @@ -1,12 +1,12 @@ Name: firestarter -Version: 1.0.1 +Version: 1.0.3 Release: 1 Summary: The Firestarter firewall tool for GNOME Group: Applications/Internet License: GPL URL: http://firestarter.sourceforge.net -Source0: http://download.sourceforge.net/firestarter/firestarter-1.0.1.tar.gz +Source0: http://download.sourceforge.net/firestarter/firestarter-1.0.3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -148,6 +148,9 @@ %changelog +* Sun Jan 30 2005 Phillip Compton 1.0.3-1 +- 1.0.3. + * Sun Dec 19 2004 Phillip Compton 1.0.1-1 - 1.0.1. Index: sources =================================================================== RCS file: /cvs/extras/devel/firestarter/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 19 Dec 2004 15:39:05 -0000 1.6 +++ sources 30 Jan 2005 22:28:05 -0000 1.7 @@ -1 +1,2 @@ ef5afad42201639f282dec4eda20720d firestarter-1.0.1.tar.gz +f46860a9e16dac4b693bd05f16370b03 firestarter-1.0.3.tar.gz From fedora-extras-commits at redhat.com Mon Jan 31 17:17:32 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 31 Jan 2005 12:17:32 -0500 Subject: rpms/rrdtool/devel rrdtool.spec,1.5,1.6 Message-ID: <200501311717.j0VHHWYK025402@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/rrdtool/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25396 Modified Files: rrdtool.spec Log Message: Fix for bug #146513. Index: rrdtool.spec =================================================================== RCS file: /cvs/extras/rpms/rrdtool/devel/rrdtool.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- rrdtool.spec 13 Jan 2005 18:27:47 -0000 1.5 +++ rrdtool.spec 31 Jan 2005 17:17:30 -0000 1.6 @@ -3,7 +3,7 @@ Summary: Round Robin Database Tool to store and display time-series data Name: rrdtool Version: 1.0.49 -Release: 2 +Release: 3 License: GPL Group: Applications/Databases URL: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/ @@ -96,8 +96,8 @@ EOF # Put perl files back where they belong -%{__mkdir_p} %{buildroot}%{perl_sitearch}/ -%{__mv} %{buildroot}%{_libdir}/perl/* %{buildroot}%{perl_sitearch}/ +%{__mkdir_p} %{buildroot}%{perl_vendorarch}/ +%{__mv} %{buildroot}%{_libdir}/perl/* %{buildroot}%{perl_vendorarch}/ # We only want .txt and .html files for the main documentation %{__mkdir_p} doc2/doc @@ -122,8 +122,8 @@ %doc CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO doc2/doc %{_bindir}/* %{_libdir}/*.so.* -%{perl_sitearch}/*.pm -%{perl_sitearch}/auto/* +%{perl_vendorarch}/*.pm +%{perl_vendorarch}/auto/* %{_mandir}/man1/* @@ -147,6 +147,9 @@ %changelog +* Mon Jan 31 2005 Matthias Saou 1.0.49-3 +- Put perl modules in vendor_perl and not site_perl. #146513 + * Thu Jan 13 2005 Matthias Saou 1.0.49-2 - Minor cleanups. From fedora-extras-commits at redhat.com Mon Jan 31 17:30:18 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 31 Jan 2005 12:30:18 -0500 Subject: rpms/yasm - New directory Message-ID: <200501311730.j0VHUI8E025512@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/yasm In directory cvs.fedora.redhat.com:/tmp/cvs-serv25505/yasm Log Message: Directory /cvs/extras/rpms/yasm added to the repository From fedora-extras-commits at redhat.com Mon Jan 31 17:30:18 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 31 Jan 2005 12:30:18 -0500 Subject: rpms/yasm/devel - New directory Message-ID: <200501311730.j0VHUI2B025515@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/yasm/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25505/yasm/devel Log Message: Directory /cvs/extras/rpms/yasm/devel added to the repository From fedora-extras-commits at redhat.com Mon Jan 31 17:30:36 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 31 Jan 2005 12:30:36 -0500 Subject: rpms/yasm Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200501311730.j0VHUaTF025574@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/yasm In directory cvs.fedora.redhat.com:/tmp/cvs-serv25565 Added Files: Makefile import.log Log Message: Setup of module yasm --- NEW FILE Makefile --- # Top level Makefile for module yasm all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jan 31 17:30:36 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 31 Jan 2005 12:30:36 -0500 Subject: rpms/yasm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200501311730.j0VHUa9H025577@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/yasm/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25565/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module yasm --- NEW 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 Jan 31 17:31:17 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 31 Jan 2005 12:31:17 -0500 Subject: rpms/yasm import.log,1.1,1.2 Message-ID: <200501311731.j0VHVHxx025670@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/yasm In directory cvs.fedora.redhat.com:/tmp/cvs-serv25661 Modified Files: import.log Log Message: auto-import yasm-0.4.0-1 on branch devel from yasm-0.4.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/yasm/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 31 Jan 2005 17:30:34 -0000 1.1 +++ import.log 31 Jan 2005 17:31:15 -0000 1.2 @@ -0,0 +1 @@ +yasm-0_4_0-1:HEAD:yasm-0.4.0-1.src.rpm:1107192665 From fedora-extras-commits at redhat.com Mon Jan 31 17:31:17 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 31 Jan 2005 12:31:17 -0500 Subject: rpms/yasm/devel yasm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200501311731.j0VHVHP9025674@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/yasm/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25661/devel Modified Files: .cvsignore sources Added Files: yasm.spec Log Message: auto-import yasm-0.4.0-1 on branch devel from yasm-0.4.0-1.src.rpm --- NEW FILE yasm.spec --- Summary: Complete rewrite of the NASM assembler Name: yasm Version: 0.4.0 Release: 1 License: BSD Group: Development/Languages URL: http://www.tortall.net/projects/yasm/ Source: http://www.tortall.net/projects/yasm/releases/yasm-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: bison, byacc, xmlto, gettext-devel %description Yasm is a complete rewrite of the NASM assembler under the "new" BSD License (some portions are under other licenses, see COPYING for details). It is designed from the ground up to allow for multiple assembler syntaxes to be supported (eg, NASM, TASM, GAS, etc.) in addition to multiple output object formats and even multiple instruction sets. Another primary module of the overall design is an optimizer module. %package devel Summary: Header files and static libraries for yasm Group: Development/Libraries Requires: %{name} = %{version} %description devel Yasm is a complete rewrite of the NASM assembler under the "new" BSD License (some portions are under other licenses, see COPYING for details). It is designed from the ground up to allow for multiple assembler syntaxes to be supported (eg, NASM, TASM, GAS, etc.) in addition to multiple output object formats and even multiple instruction sets. Another primary module of the overall design is an optimizer module. Install this package if you need to rebuild applications that use yasm. %prep %setup %build %configure %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} %makeinstall %clean %{__rm} -rf %{buildroot} %post /sbin/ldconfig %postun /sbin/ldconfig %files %defattr(-, root, root, 0755) %doc Artistic.txt AUTHORS BSD.txt ChangeLog COPYING GNU* NEWS README %{_bindir}/yasm %{_libdir}/*.so.* %dir %{_libdir}/yasm/ %{_libdir}/yasm/*.so %{_mandir}/man1/yasm.1* %files devel %defattr(-, root, root, 0755) %{_includedir}/libyasm.h %{_includedir}/libyasm/ %{_libdir}/*.a %exclude %{_libdir}/*.la %{_libdir}/*.so %dir %{_libdir}/yasm/ %{_libdir}/yasm/*.a %exclude %{_libdir}/yasm/*.la %{_mandir}/man7/yasm_arch.7* %changelog * Fri Jan 28 2005 Matthias Saou 0.4.0-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yasm/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 31 Jan 2005 17:30:34 -0000 1.1 +++ .cvsignore 31 Jan 2005 17:31:15 -0000 1.2 @@ -0,0 +1 @@ +yasm-0.4.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yasm/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 31 Jan 2005 17:30:34 -0000 1.1 +++ sources 31 Jan 2005 17:31:15 -0000 1.2 @@ -0,0 +1 @@ +2360e20c4e105ba95f4e9135a7901183 yasm-0.4.0.tar.gz From fedora-extras-commits at redhat.com Mon Jan 31 17:41:24 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 31 Jan 2005 12:41:24 -0500 Subject: rpms/lmarbles/devel .cvsignore, 1.2, 1.3 lmarbles.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200501311741.j0VHfOLb025802@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/lmarbles/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25795 Modified Files: .cvsignore lmarbles.spec sources Log Message: Update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lmarbles/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Nov 2004 02:47:45 -0000 1.2 +++ .cvsignore 31 Jan 2005 17:41:22 -0000 1.3 @@ -1 +1 @@ -lmarbles-1.0.6.tar.gz +lmarbles-1.0.7.tar.gz Index: lmarbles.spec =================================================================== RCS file: /cvs/extras/rpms/lmarbles/devel/lmarbles.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- lmarbles.spec 16 Nov 2004 17:57:17 -0000 1.4 +++ lmarbles.spec 31 Jan 2005 17:41:22 -0000 1.5 @@ -1,12 +1,10 @@ -# $Id$ - Summary: Atomix clone where you create figures out of marbles Name: lmarbles -Version: 1.0.6 -Release: 4 +Version: 1.0.7 +Release: 1 License: GPL Group: Amusements/Games -URL: http://www.lgames.org/ +URL: http://lgames.sourceforge.net/ Source: http://dl.sf.net/lgames/lmarbles-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: SDL >= 1.1.4, SDL_mixer @@ -28,23 +26,23 @@ %build -%configure +%configure --localstatedir=%{_var}/lib/games %{__make} %{?_smp_mflags} # Having it as png seems more consistent -convert lmarbles48.gif %{name}.png +convert lmarbles48.gif lmarbles.png %install %{__rm} -rf %{buildroot} %{__make} install DESTDIR=%{buildroot} -%{__install} -D %{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}.png +%{__install} -D lmarbles.png %{buildroot}%{_datadir}/pixmaps/lmarbles.png %{__cat} > %{name}.desktop << EOF [Desktop Entry] Name=LMarbles Comment=Atomix clone where you create figures out of marbles -Exec=%{name} -Icon=%{name}.png +Exec=lmarbles +Icon=lmarbles.png Terminal=false Type=Application Categories=Application;Game; @@ -61,20 +59,27 @@ %{__rm} -rf %{buildroot} +%post +update-desktop-database %{_datadir}/applications &>/dev/null || : + +%postun +update-desktop-database %{_datadir}/applications &>/dev/null || : + + %files %defattr(-, root, root, 0755) %doc AUTHORS COPYING ChangeLog README TODO -%attr(2551, root, games) %{_bindir}/%{name} -%{_datadir}/applications/fedora-%{name}.desktop -%{_datadir}/games/%{name}/ -%{_datadir}/pixmaps/%{name}.png -%{_mandir}/man6/%{name}* -%config(noreplace) %attr(664, games, games) %{_var}/lib/games/marbles.prfs +%attr(2551, root, games) %{_bindir}/lmarbles +%{_datadir}/applications/fedora-lmarbles.desktop +%{_datadir}/lmarbles/ +%{_datadir}/pixmaps/lmarbles.png +%{_mandir}/man6/lmarbles.6* +%config(noreplace) %attr(664, games, games) %{_var}/lib/games/lmarbles.prfs %changelog -* Tue Nov 16 2004 Matthias Saou 1.0.6-4 -- Bump release to provide Extras upgrade path. +* Wed Jan 26 2005 Matthias Saou 1.0.7-1 +- Update to 1.0.7. * Wed May 19 2004 Matthias Saou 1.0.6-3 - Rebuild for Fedora Core 2. Index: sources =================================================================== RCS file: /cvs/extras/rpms/lmarbles/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Nov 2004 02:47:45 -0000 1.2 +++ sources 31 Jan 2005 17:41:22 -0000 1.3 @@ -1 +1 @@ -ad162da8fa298cac680e13c02fea258c lmarbles-1.0.6.tar.gz +b29156bc5021877d080e5e268012f4ec lmarbles-1.0.7.tar.gz From fedora-extras-commits at redhat.com Mon Jan 31 17:44:36 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 31 Jan 2005 12:44:36 -0500 Subject: rpms/synergy/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 synergy.spec, 1.4, 1.5 Message-ID: <200501311744.j0VHiaXM025864@cvs.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/synergy/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv25855 Modified Files: .cvsignore sources synergy.spec Log Message: Update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/synergy/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Jan 2005 14:52:55 -0000 1.3 +++ .cvsignore 31 Jan 2005 17:44:34 -0000 1.4 @@ -1 +1 @@ -synergy-1.2.1.tar.gz +synergy-1.2.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/synergy/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Jan 2005 14:52:55 -0000 1.3 +++ sources 31 Jan 2005 17:44:34 -0000 1.4 @@ -1 +1 @@ -6f004011141ccd3292798ec2a3aef2c2 synergy-1.2.1.tar.gz +d43fe74fc3aeb541bb38f0dceaffebb4 synergy-1.2.2.tar.gz Index: synergy.spec =================================================================== RCS file: /cvs/extras/rpms/synergy/devel/synergy.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- synergy.spec 13 Jan 2005 14:52:55 -0000 1.4 +++ synergy.spec 31 Jan 2005 17:44:34 -0000 1.5 @@ -1,6 +1,6 @@ Summary: Mouse and keyboard sharing utility Name: synergy -Version: 1.2.1 +Version: 1.2.2 Release: 1 License: GPL Group: System Environment/Daemons @@ -44,6 +44,9 @@ %changelog +* Mon Jan 31 2005 Matthias Saou 1.2.2-1 +- Update to 1.2.2. + * Thu Jan 13 2005 Matthias Saou 1.2.1-1 - Update to 1.2.1.