From fedora-extras-commits at redhat.com Tue Feb 1 09:43:33 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 1 Feb 2005 04:43:33 -0500
Subject: rpms/perl-Cache-Cache/devel .cvsignore, 1.2,
1.3 perl-Cache-Cache.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200502010943.j119hX1k006496@cvs.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/perl-Cache-Cache/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv6490
Modified Files:
.cvsignore perl-Cache-Cache.spec sources
Log Message:
Merge fedora.us pending package changes.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Cache/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 9 Nov 2004 02:48:41 -0000 1.2
+++ .cvsignore 1 Feb 2005 09:43:31 -0000 1.3
@@ -1 +1 @@
-Cache-Cache-1.02.tar.gz
+Cache-Cache-1.03.tar.gz
Index: perl-Cache-Cache.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Cache/devel/perl-Cache-Cache.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Cache-Cache.spec 16 Nov 2004 18:08:26 -0000 1.3
+++ perl-Cache-Cache.spec 1 Feb 2005 09:43:31 -0000 1.4
@@ -1,19 +1,16 @@
-# $Id$
+%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-%define real_name Cache-Cache
-
-Summary: Cache-Cache module for perl
+Summary: Generic cache interface and implementations
Name: perl-Cache-Cache
-Version: 1.02
-Release: 4
+Version: 1.03
+Release: 1
License: GPL or Artistic
Group: Applications/CPAN
URL: http://search.cpan.org/dist/Cache-Cache/
Source: http://search.cpan.org/CPAN/authors/id/D/DC/DCLINTON/Cache-Cache-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: perl >= 0:5.8.0
-Requires: perl(Error), perl(Storable), perl(IPC::ShareLite)
-BuildRequires: perl >= 0:5.8.0
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires: perl(IPC::ShareLite), perl(Digest::SHA1), perl(Error)
BuildArch: noarch
%description
@@ -27,24 +24,20 @@
%prep
-%setup -n %{real_name}-%{version}
+%setup -n Cache-Cache-%{version}
%build
-CFLAGS="%{optflags}" %{__perl} Makefile.PL \
- PREFIX="%{buildroot}%{_prefix}" \
- INSTALLDIRS="vendor"
-%{__make} %{?_smp_mflags} \
- OPTIMIZE="%{optflags}"
+%{__perl} Makefile.PL INSTALLDIRS="vendor"
+%{__make} %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} pure_install PERL_INSTALL_ROOT="%{buildroot}"
-### Clean up buildroot
-%{__rm} -rf %{buildroot}%{_libdir}/perl5/*/*-linux-thread-multi/
-%{__rm} -f %{buildroot}%{_libdir}/perl5/vendor_perl/*/*-linux-thread-multi/auto/*{,/*}/.packlist
+# Clean up buildroot
+find %{buildroot} -type f -name .packlist -exec rm -f {} \;
%clean
@@ -53,12 +46,16 @@
%files
%defattr(-, root, root, 0755)
-%doc COPYING* MANIFEST README
-%{_libdir}/perl5/vendor_perl/*/*
-%{_mandir}/man?/*
+%doc CHANGES COPYING* CREDITS DISCLAIMER README
+%{perl_vendorlib}/Cache/
+%{_mandir}/man3/*.3*
%changelog
+* Tue Feb 1 2005 Matthias Saou 1.03-1
+- Merge in changes from Jose Pedro Oliveira's fedora.us package : #146741.
+- Update to 1.03.
+
* Tue Nov 16 2004 Matthias Saou 1.02-4
- Bump release to provide Extras upgrade path.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Cache/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 9 Nov 2004 02:48:41 -0000 1.2
+++ sources 1 Feb 2005 09:43:31 -0000 1.3
@@ -1 +1 @@
-9dfff47f2317a59a15546a972b2a67ba Cache-Cache-1.02.tar.gz
+5482dea509c2133d1ffbfbd031d2f1c9 Cache-Cache-1.03.tar.gz
From fedora-extras-commits at redhat.com Tue Feb 1 14:04:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 1 Feb 2005 09:04:15 -0500
Subject: rpms/fillets-ng - New directory
Message-ID: <200502011404.j11E4FkX010556@cvs.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/fillets-ng
In directory cvs.fedora.redhat.com:/tmp/cvs-serv10549/fillets-ng
Log Message:
Directory /cvs/extras/rpms/fillets-ng added to the repository
From fedora-extras-commits at redhat.com Tue Feb 1 14:04:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 1 Feb 2005 09:04:15 -0500
Subject: rpms/fillets-ng/devel - New directory
Message-ID: <200502011404.j11E4FNM010559@cvs.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/fillets-ng/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv10549/fillets-ng/devel
Log Message:
Directory /cvs/extras/rpms/fillets-ng/devel added to the repository
From fedora-extras-commits at redhat.com Tue Feb 1 14:04:33 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 1 Feb 2005 09:04:33 -0500
Subject: rpms/fillets-ng Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200502011404.j11E4XFZ010622@cvs.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/fillets-ng
In directory cvs.fedora.redhat.com:/tmp/cvs-serv10611
Added Files:
Makefile import.log
Log Message:
Setup of module fillets-ng
--- NEW FILE Makefile ---
# Top level Makefile for module fillets-ng
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like 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 Feb 1 14:04:33 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 1 Feb 2005 09:04:33 -0500
Subject: rpms/fillets-ng/devel .cvsignore, NONE, 1.1 Makefile, NONE,
1.1 sources, NONE, 1.1
Message-ID: <200502011404.j11E4XDM010621@cvs.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/fillets-ng/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv10611/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module fillets-ng
--- NEW FILE .cvsignore ---
***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'
--- NEW FILE sources ---
From fedora-extras-commits at redhat.com Tue Feb 1 14:05:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 1 Feb 2005 09:05:15 -0500
Subject: rpms/fillets-ng import.log,1.1,1.2
Message-ID: <200502011405.j11E5F8b010728@cvs.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/fillets-ng
In directory cvs.fedora.redhat.com:/tmp/cvs-serv10719
Modified Files:
import.log
Log Message:
auto-import fillets-ng-0.6.0-1 on branch devel from fillets-ng-0.6.0-1.src.rpm
Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log 1 Feb 2005 14:04:31 -0000 1.1
+++ import.log 1 Feb 2005 14:05:13 -0000 1.2
@@ -0,0 +1 @@
+fillets-ng-0_6_0-1:HEAD:fillets-ng-0.6.0-1.src.rpm:1107266703
From fedora-extras-commits at redhat.com Tue Feb 1 14:05:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 1 Feb 2005 09:05:15 -0500
Subject: rpms/fillets-ng/devel fillets-ng.spec, NONE, 1.1 fillets.desktop,
NONE, 1.1 fillets.png, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
1.1, 1.2
Message-ID: <200502011405.j11E5FL7010732@cvs.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/fillets-ng/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv10719/devel
Modified Files:
.cvsignore sources
Added Files:
fillets-ng.spec fillets.desktop fillets.png
Log Message:
auto-import fillets-ng-0.6.0-1 on branch devel from fillets-ng-0.6.0-1.src.rpm
--- NEW FILE fillets-ng.spec ---
Summary: Fish Fillets Next Generation, a puzzle game with 70 levels
Name: fillets-ng
Version: 0.6.0
Release: 1
License: GPL
Group: Amusements/Games
URL: http://fillets.sourceforge.net/
Source0: http://dl.sf.net/fillets/fillets-ng-%{version}.tar.gz
Source1: fillets.desktop
Source2: fillets.png
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: fillets-ng-data >= 0.6.1
BuildRequires: SDL-devel, SDL_mixer-devel, SDL_image-devel, SDL_ttf-devel
BuildRequires: lua-devel, desktop-file-utils
%description
Fish Fillets is strictly a puzzle game. The goal in every of the
seventy levels is always the same: find a safe way out. The fish utter
witty remarks about their surroundings, the various inhabitants of
their underwater realm quarrel among themselves or comment on the
efforts of your fish. The whole game is accompanied by quiet,
comforting music.
%prep
%setup -q
%build
%configure
%{__make} %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
%makeinstall
# Install desktop file
%{__mkdir_p} %{buildroot}%{_datadir}/applications
desktop-file-install --vendor=fedora \
--dir %{buildroot}%{_datadir}/applications \
%{SOURCE1}
# Install themeable icon
%{__install} -D -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/fillets.png
%clean
%{__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 ChangeLog COPYING NEWS README TODO
%{_bindir}/fillets
%{_datadir}/applications/fedora-fillets.desktop
%{_datadir}/pixmaps/fillets.png
%{_mandir}/man6/fillets.6*
%changelog
* Tue Feb 1 2005 Matthias Saou 0.6.0-1
- Split sources into separate source rpms (for data to be noarch).
- Minor spec file tweaks.
- Include icon from 0.6.1 data for the desktop entry.
- Remove unneeded explicit vorbis dependency.
- Added update-desktop-database calls.
* Sun Aug 22 2004 Michal Ambroz (O_O)
- rebuild 0.5.1 for Fedora Core 2
* Thu Jul 15 2004 Michal Ambroz (O_O)
- rebuild 0.4.1 for Fedora Core 2
* Thu Jul 15 2004 Michal Ambroz (O_O)
- rebuild 0.4 for Fedora Core 2
* Mon May 10 2004 Michal Ambroz (O_O)
- initial build for Fedora Core 2
--- NEW FILE fillets.desktop ---
[Desktop Entry]
Name=Fish Fillets
Name[fr]=Fish Fillets
Name[es]=Fish Fillets
Comment=Puzzle game with 70 levels
Comment[fr]=Jeu de r??flexion avec 70 niveaux
Comment[es]=Juego de mente con 70 niveles
Exec=fillets
Icon=fillets.png
Terminal=false
Type=Application
Categories=Application;Game;
Encoding=UTF-8
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Feb 2005 14:04:31 -0000 1.1
+++ .cvsignore 1 Feb 2005 14:05:13 -0000 1.2
@@ -0,0 +1 @@
+fillets-ng-0.6.0.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Feb 2005 14:04:31 -0000 1.1
+++ sources 1 Feb 2005 14:05:13 -0000 1.2
@@ -0,0 +1 @@
+89b894c9f6fcf23078b0d5f54f99cb05 fillets-ng-0.6.0.tar.gz
From fedora-extras-commits at redhat.com Tue Feb 1 14:10:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 1 Feb 2005 09:10:30 -0500
Subject: rpms/fillets-ng-data - New directory
Message-ID: <200502011410.j11EAUiK010852@cvs.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/fillets-ng-data
In directory cvs.fedora.redhat.com:/tmp/cvs-serv10845/fillets-ng-data
Log Message:
Directory /cvs/extras/rpms/fillets-ng-data added to the repository
From fedora-extras-commits at redhat.com Tue Feb 1 14:10:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 1 Feb 2005 09:10:30 -0500
Subject: rpms/fillets-ng-data/devel - New directory
Message-ID: <200502011410.j11EAUxP010855@cvs.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/fillets-ng-data/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv10845/fillets-ng-data/devel
Log Message:
Directory /cvs/extras/rpms/fillets-ng-data/devel added to the repository
From fedora-extras-commits at redhat.com Tue Feb 1 14:10:49 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 1 Feb 2005 09:10:49 -0500
Subject: rpms/fillets-ng-data Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200502011410.j11EAn6d010914@cvs.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/fillets-ng-data
In directory cvs.fedora.redhat.com:/tmp/cvs-serv10905
Added Files:
Makefile import.log
Log Message:
Setup of module fillets-ng-data
--- NEW FILE Makefile ---
# Top level Makefile for module fillets-ng-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 Tue Feb 1 14:10:49 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 1 Feb 2005 09:10:49 -0500
Subject: rpms/fillets-ng-data/devel .cvsignore, NONE, 1.1 Makefile, NONE,
1.1 sources, NONE, 1.1
Message-ID: <200502011410.j11EAnQY010917@cvs.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/fillets-ng-data/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv10905/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module fillets-ng-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 Tue Feb 1 14:19:36 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 1 Feb 2005 09:19:36 -0500
Subject: rpms/fillets-ng-data import.log,1.1,1.2
Message-ID: <200502011419.j11EJark011024@cvs.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/fillets-ng-data
In directory cvs.fedora.redhat.com:/tmp/cvs-serv11015
Modified Files:
import.log
Log Message:
auto-import fillets-ng-data-0.6.1-1 on branch devel from fillets-ng-data-0.6.1-1.src.rpm
Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng-data/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log 1 Feb 2005 14:10:47 -0000 1.1
+++ import.log 1 Feb 2005 14:19:34 -0000 1.2
@@ -0,0 +1 @@
+fillets-ng-data-0_6_1-1:HEAD:fillets-ng-data-0.6.1-1.src.rpm:1107267564
From fedora-extras-commits at redhat.com Tue Feb 1 14:19:36 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 1 Feb 2005 09:19:36 -0500
Subject: rpms/fillets-ng-data/devel fillets-ng-data.spec, NONE,
1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200502011419.j11EJaPI011028@cvs.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/fillets-ng-data/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv11015/devel
Modified Files:
.cvsignore sources
Added Files:
fillets-ng-data.spec
Log Message:
auto-import fillets-ng-data-0.6.1-1 on branch devel from fillets-ng-data-0.6.1-1.src.rpm
--- NEW FILE fillets-ng-data.spec ---
Summary: Game data files for Fish Fillets Next Generation
Name: fillets-ng-data
Version: 0.6.1
Release: 1
License: GPL
Group: Amusements/Games
URL: http://fillets.sourceforge.net/
Source: http://dl.sf.net/fillets/fillets-ng-data-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: fillets-ng >= 0.6.0
BuildArch: noarch
%description
Fish Fillets is strictly a puzzle game. The goal in every of the
seventy levels is always the same: find a safe way out. The fish utter
witty remarks about their surroundings, the various inhabitants of
their underwater realm quarrel among themselves or comment on the
efforts of your fish. The whole game is accompanied by quiet,
comforting music.
This package contains the data files required to run the game.
%prep
%setup -q
%build
# Move along, nothing to see here! :-)
%install
%{__rm} -rf %{buildroot}
%{__mkdir_p} %{buildroot}%{_datadir}/games/fillets-ng
%{__cp} -a * %{buildroot}%{_datadir}/games/fillets-ng/
# Move away the license to not have it conflict with the data-cs one
%{__mv} %{buildroot}%{_datadir}/games/fillets-ng/COPYING \
%{buildroot}%{_datadir}/games/fillets-ng/COPYING.data
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(0644, root, root, 0755)
%{_datadir}/games/fillets-ng/
%doc %{_datadir}/games/fillets-ng/COPYING.data
%doc %{_datadir}/games/fillets-ng/doc/
%changelog
* Tue Feb 1 2005 Matthias Saou 0.6.1-1
- Split sources into separate source rpms (for data to be noarch).
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng-data/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Feb 2005 14:10:47 -0000 1.1
+++ .cvsignore 1 Feb 2005 14:19:34 -0000 1.2
@@ -0,0 +1 @@
+fillets-ng-data-0.6.1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng-data/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Feb 2005 14:10:47 -0000 1.1
+++ sources 1 Feb 2005 14:19:34 -0000 1.2
@@ -0,0 +1 @@
+3a7cc38a790decc0c5679323804e54f5 fillets-ng-data-0.6.1.tar.gz
From fedora-extras-commits at redhat.com Tue Feb 1 14:20:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 1 Feb 2005 09:20:15 -0500
Subject: rpms/fillets-ng-data-cs - New directory
Message-ID: <200502011420.j11EKFis011141@cvs.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/fillets-ng-data-cs
In directory cvs.fedora.redhat.com:/tmp/cvs-serv11134/fillets-ng-data-cs
Log Message:
Directory /cvs/extras/rpms/fillets-ng-data-cs added to the repository
From fedora-extras-commits at redhat.com Tue Feb 1 14:20:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 1 Feb 2005 09:20:15 -0500
Subject: rpms/fillets-ng-data-cs/devel - New directory
Message-ID: <200502011420.j11EKFPN011144@cvs.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/fillets-ng-data-cs/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv11134/fillets-ng-data-cs/devel
Log Message:
Directory /cvs/extras/rpms/fillets-ng-data-cs/devel added to the repository
From fedora-extras-commits at redhat.com Tue Feb 1 14:20:33 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 1 Feb 2005 09:20:33 -0500
Subject: rpms/fillets-ng-data-cs Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200502011420.j11EKXLE011203@cvs.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/fillets-ng-data-cs
In directory cvs.fedora.redhat.com:/tmp/cvs-serv11194
Added Files:
Makefile import.log
Log Message:
Setup of module fillets-ng-data-cs
--- NEW FILE Makefile ---
# Top level Makefile for module fillets-ng-data-cs
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like 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 Feb 1 14:20:33 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 1 Feb 2005 09:20:33 -0500
Subject: rpms/fillets-ng-data-cs/devel .cvsignore, NONE, 1.1 Makefile, NONE,
1.1 sources, NONE, 1.1
Message-ID: <200502011420.j11EKX8x011206@cvs.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/fillets-ng-data-cs/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv11194/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module fillets-ng-data-cs
--- NEW FILE .cvsignore ---
***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'
--- NEW FILE sources ---
From fedora-extras-commits at redhat.com Tue Feb 1 14:25:17 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 1 Feb 2005 09:25:17 -0500
Subject: rpms/fillets-ng-data-cs import.log,1.1,1.2
Message-ID: <200502011425.j11EPHZK011321@cvs.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/fillets-ng-data-cs
In directory cvs.fedora.redhat.com:/tmp/cvs-serv11312
Modified Files:
import.log
Log Message:
auto-import fillets-ng-data-cs-0.6.0-1 on branch devel from fillets-ng-data-cs-0.6.0-1.src.rpm
Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng-data-cs/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log 1 Feb 2005 14:20:31 -0000 1.1
+++ import.log 1 Feb 2005 14:25:15 -0000 1.2
@@ -0,0 +1 @@
+fillets-ng-data-cs-0_6_0-1:HEAD:fillets-ng-data-cs-0.6.0-1.src.rpm:1107267905
From fedora-extras-commits at redhat.com Tue Feb 1 14:25:18 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 1 Feb 2005 09:25:18 -0500
Subject: rpms/fillets-ng-data-cs/devel fillets-ng-data-cs.spec, NONE,
1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200502011425.j11EPIBP011325@cvs.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/fillets-ng-data-cs/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv11312/devel
Modified Files:
.cvsignore sources
Added Files:
fillets-ng-data-cs.spec
Log Message:
auto-import fillets-ng-data-cs-0.6.0-1 on branch devel from fillets-ng-data-cs-0.6.0-1.src.rpm
--- NEW FILE fillets-ng-data-cs.spec ---
Summary: Czech audio data files for Fish Fillets Next Generation
Name: fillets-ng-data-cs
Version: 0.6.0
Release: 1
License: GPL
Group: Amusements/Games
URL: http://fillets.sourceforge.net/
Source: http://dl.sf.net/fillets/fillets-ng-data-cs-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: fillets-ng-data >= 0.6.0
BuildArch: noarch
%description
Fish Fillets is strictly a puzzle game. The goal in every of the
seventy levels is always the same: find a safe way out. The fish utter
witty remarks about their surroundings, the various inhabitants of
their underwater realm quarrel among themselves or comment on the
efforts of your fish. The whole game is accompanied by quiet,
comforting music.
This package contains audio files only useful for Czech speaking people.
%prep
%setup -q
%build
# Move along, nothing to see here! :-)
%install
%{__rm} -rf %{buildroot}
%{__mkdir_p} %{buildroot}%{_datadir}/games/fillets-ng
%{__cp} -a * %{buildroot}%{_datadir}/games/fillets-ng/
# Move away the license to not have it conflict with the main data one
%{__mv} %{buildroot}%{_datadir}/games/fillets-ng/COPYING \
%{buildroot}%{_datadir}/games/fillets-ng/COPYING.data-cs
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(0644, root, root, 0755)
%{_datadir}/games/fillets-ng/
%doc %{_datadir}/games/fillets-ng/COPYING.data-cs
%changelog
* Tue Feb 1 2005 Matthias Saou 0.6.0-1
- Split sources into separate source rpms (for data to be noarch).
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng-data-cs/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Feb 2005 14:20:31 -0000 1.1
+++ .cvsignore 1 Feb 2005 14:25:15 -0000 1.2
@@ -0,0 +1 @@
+fillets-ng-data-cs-0.6.0.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng-data-cs/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Feb 2005 14:20:31 -0000 1.1
+++ sources 1 Feb 2005 14:25:15 -0000 1.2
@@ -0,0 +1 @@
+c51f4385d29b1e1d3b7d068d5ffa6c25 fillets-ng-data-cs-0.6.0.tar.gz
From fedora-extras-commits at redhat.com Tue Feb 1 16:15:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 1 Feb 2005 11:15:30 -0500
Subject: rpms/lua/devel lua.spec,1.5,1.6
Message-ID: <200502011615.j11GFUn7012988@cvs.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/lua/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv12982
Modified Files:
lua.spec
Log Message:
Update from Panu.
Index: lua.spec
===================================================================
RCS file: /cvs/extras/rpms/lua/devel/lua.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lua.spec 10 Dec 2004 22:03:07 -0000 1.5
+++ lua.spec 1 Feb 2005 16:15:27 -0000 1.6
@@ -1,17 +1,16 @@
Name: lua
-Version: 5.0
-Release: 2
-Epoch: 0
+Version: 5.0.2
+Release: 1
Summary: A powerful light-weight programming language
Group: Development/Languages
License: MIT
URL: http://www.lua.org/
-Source0: http://www.lua.org/ftp/lua-5.0.tar.gz
+Source0: http://www.lua.org/ftp/lua-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: readline-devel, ncurses-devel
-Provides: %{name}-devel = %{epoch}:%{version}-%{release}
+Provides: %{name}-devel = %{version}-%{release}
%description
Lua is a powerful light-weight programming language designed for
@@ -69,6 +68,10 @@
%changelog
+* Tue Feb 01 2005 Panu Matilainen - 5.0.2-1
+- update to 5.0.2
+- remove epoch 0, drop fedora.us release tag
+
* Mon Nov 17 2003 Oren Tirosh - 0:5.0-0.fdr.2
- Enable readline support.
From fedora-extras-commits at redhat.com Tue Feb 1 19:30:22 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 1 Feb 2005 14:30:22 -0500
Subject: rpms/libassuan import.log,1.2,1.3
Message-ID: <200502011930.j11JUM04015358@cvs.fedora.redhat.com>
Author: mschwendt
Update of /cvs/extras/rpms/libassuan
In directory cvs.fedora.redhat.com:/tmp/cvs-serv15349
Modified Files:
import.log
Log Message:
auto-import libassuan-0.6.9-1 on branch devel from libassuan-0.6.9-1.src.rpm
Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libassuan/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log 8 Dec 2004 16:45:02 -0000 1.2
+++ import.log 1 Feb 2005 19:30:20 -0000 1.3
@@ -1 +1,2 @@
libassuan-0_6_7-0_fdr_3_2:HEAD:libassuan-0.6.7-0.fdr.3.2.src.rpm:1102524362
+libassuan-0_6_9-1:HEAD:libassuan-0.6.9-1.src.rpm:1107286225
From fedora-extras-commits at redhat.com Tue Feb 1 19:30:22 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 1 Feb 2005 14:30:22 -0500
Subject: rpms/libassuan/devel libassuan-0.6.9.tar.gz.sig, NONE,
1.1 .cvsignore, 1.2, 1.3 libassuan.spec, 1.2, 1.3 sources, 1.2,
1.3 libassuan-0.6.7.tar.gz.sig, 1.1, NONE
Message-ID: <200502011930.j11JUMMR015362@cvs.fedora.redhat.com>
Author: mschwendt
Update of /cvs/extras/rpms/libassuan/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv15349/devel
Modified Files:
.cvsignore libassuan.spec sources
Added Files:
libassuan-0.6.9.tar.gz.sig
Removed Files:
libassuan-0.6.7.tar.gz.sig
Log Message:
auto-import libassuan-0.6.9-1 on branch devel from libassuan-0.6.9-1.src.rpm
--- NEW FILE libassuan-0.6.9.tar.gz.sig ---
??
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Dec 2004 16:45:02 -0000 1.2
+++ .cvsignore 1 Feb 2005 19:30:20 -0000 1.3
@@ -1 +1 @@
-libassuan-0.6.7.tar.gz
+libassuan-0.6.9.tar.gz
Index: libassuan.spec
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/libassuan.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libassuan.spec 10 Dec 2004 22:03:04 -0000 1.2
+++ libassuan.spec 1 Feb 2005 19:30:20 -0000 1.3
@@ -1,10 +1,10 @@
Summary: GnuPG IPC library
Name: libassuan
-Version: 0.6.7
-Release: 3%{?dist_tag}
-Source0: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.7.tar.gz
-Source1: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.7.tar.gz.sig
+Version: 0.6.9
+Release: 1%{?dist_tag}
+Source0: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz
+Source1: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz.sig
URL: http://www.gnupg.org/
License: GPL
Group: System Environment/Libraries
@@ -79,6 +79,9 @@
%changelog
+* Thu Jan 06 2005 Rex Dieter - 0.6.9-1
+- 0.6.9
+
* Sat Oct 23 2004 Rex Dieter - 0.6.7-0.fdr.3
- *really* fix description this time.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Dec 2004 16:45:02 -0000 1.2
+++ sources 1 Feb 2005 19:30:20 -0000 1.3
@@ -1 +1 @@
-db4e6939fafbaae80cab11a67f28771d libassuan-0.6.7.tar.gz
+7f8aff75d034159b84faf2358263f444 libassuan-0.6.9.tar.gz
--- libassuan-0.6.7.tar.gz.sig DELETED ---
From fedora-extras-commits at redhat.com Tue Feb 1 19:32:53 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 1 Feb 2005 14:32:53 -0500
Subject: rpms/libksba import.log,1.5,1.6
Message-ID: <200502011932.j11JWrgV015487@cvs.fedora.redhat.com>
Author: mschwendt
Update of /cvs/extras/rpms/libksba
In directory cvs.fedora.redhat.com:/tmp/cvs-serv15477
Modified Files:
import.log
Log Message:
auto-import libksba-0.9.9-1 on branch devel from libksba-0.9.9-1.src.rpm
Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libksba/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log 8 Nov 2004 04:45:10 -0000 1.5
+++ import.log 1 Feb 2005 19:32:51 -0000 1.6
@@ -2,3 +2,4 @@
libksba-0_4_7-0_fdr_1_rh90:HEAD:libksba-0.4.7-0.fdr.1.rh90.src.rpm:1099889098
libksba-0_4_7-0_fdr_1_1:HEAD:libksba-0.4.7-0.fdr.1.1.src.rpm:1099889104
libksba-0_4_7-0_fdr_1_2:HEAD:libksba-0.4.7-0.fdr.1.2.src.rpm:1099889110
+libksba-0_9_9-1:HEAD:libksba-0.9.9-1.src.rpm:1107286375
From fedora-extras-commits at redhat.com Tue Feb 1 19:32:53 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 1 Feb 2005 14:32:53 -0500
Subject: rpms/libksba/devel libksba-0.9.9-underquoted.patch, NONE,
1.1 libksba-0.9.9.tar.gz.sig, NONE, 1.1 .cvsignore, 1.2,
1.3 libksba.spec, 1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200502011932.j11JWrmd015493@cvs.fedora.redhat.com>
Author: mschwendt
Update of /cvs/extras/rpms/libksba/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv15477/devel
Modified Files:
.cvsignore libksba.spec sources
Added Files:
libksba-0.9.9-underquoted.patch libksba-0.9.9.tar.gz.sig
Log Message:
auto-import libksba-0.9.9-1 on branch devel from libksba-0.9.9-1.src.rpm
libksba-0.9.9-underquoted.patch:
--- NEW FILE libksba-0.9.9-underquoted.patch ---
diff -Nur libksba-0.9.9-orig/src/ksba.m4 libksba-0.9.9/src/ksba.m4
--- libksba-0.9.9-orig/src/ksba.m4 2002-08-23 20:53:24.000000000 +0200
+++ libksba-0.9.9/src/ksba.m4 2005-02-01 20:15:20.041030328 +0100
@@ -14,7 +14,7 @@
dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
dnl Test for libksba and define KSBA_CFLAGS and KSBA_LIBS
dnl
-AC_DEFUN(AM_PATH_KSBA,
+AC_DEFUN([AM_PATH_KSBA],
[ AC_ARG_WITH(ksba-prefix,
AC_HELP_STRING([--with-ksba-prefix=PFX],
[prefix where KSBA is installed (optional)]),
--- NEW FILE libksba-0.9.9.tar.gz.sig ---
??
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libksba/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 04:44:52 -0000 1.2
+++ .cvsignore 1 Feb 2005 19:32:51 -0000 1.3
@@ -1 +1 @@
-libksba-0.4.7.tar.gz
+libksba-0.9.9.tar.gz
Index: libksba.spec
===================================================================
RCS file: /cvs/extras/rpms/libksba/devel/libksba.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libksba.spec 10 Dec 2004 22:03:05 -0000 1.5
+++ libksba.spec 1 Feb 2005 19:32:51 -0000 1.6
@@ -1,40 +1,53 @@
-Summary: X.509 library
-Name: libksba
-Version: 0.4.7
-Release: 1
-License: GPL
-Group: System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-URL: http://www.gnupg.org/
-Source0: http://ftp.gnupg.org/gcrypt/alpha/aegypten/libksba-0.4.7.tar.gz
-Epoch: 0
+
+Summary: X.509 library
+Name: libksba
+Epoch: 0
+Version: 0.9.9
+Release: 1%{?dist_tag}
+License: GPL
+Group: System Environment/Libraries
+URL: http://www.gnupg.org/
+Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libksba/libksba-0.9.9.tar.gz
+Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libksba/libksba-0.9.9.tar.gz.sig
+Patch0: libksba-0.9.9-underquoted.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: libgpg-error >= 0:0.7
+BuildRequires: libgcrypt-devel >= 0:1.2.0
%description
KSBA is a library designed to build software based on the X.509 and
CMS protocols.
%package devel
-Summary: Development headers and libraries for %{name}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
+Summary: Development headers and libraries for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
%description devel
Development headers and libraries for %{name}.
%prep
%setup -q
+%patch -p1 -b .underquoted
%build
%configure
-make %{?_smp_mflags}
+
+# not smp safe
+make
+
make check
%install
rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
+
rm -f $RPM_BUILD_ROOT{%{_infodir}/dir,%{_libdir}/*.la}
@@ -43,15 +56,14 @@
%post -p /sbin/ldconfig
-
%postun -p /sbin/ldconfig
%post devel
-install-info %{_infodir}/ksba.info.gz %{_infodir}/dir
+install-info %{_infodir}/ksba.info.gz %{_infodir}/dir ||:
%postun devel
-if [ "$1" = "0" ]; then
- install-info --delete %{_infodir}/ksba.info.gz %{_infodir}/dir
+if [ $1 -eq 0 ]; then
+ install-info --delete %{_infodir}/ksba.info.gz %{_infodir}/dir ||:
fi
@@ -71,6 +83,12 @@
%changelog
+* Tue Feb 1 2005 Michael Schwendt - 0:0.9.9-1
+- Minus BR libtool, add epoch to -devel req, fix underquoted ksba.m4.
+
+* Tue Oct 19 2004 Rex Dieter 0:0.9.9-0.fdr.1
+- 0.9.9
+
* Thu Mar 20 2003 Ville Skytt? - 0.4.7-0.fdr.1
- Update to 0.4.7, and to current Fedora guidelines.
- Exclude %%{_libdir}/*.la.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libksba/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 04:44:52 -0000 1.2
+++ sources 1 Feb 2005 19:32:51 -0000 1.3
@@ -1 +1 @@
-65ab8dad1f7fb379f72e1d096657a3d7 libksba-0.4.7.tar.gz
+49085f4435e7506c790ae23342b01b37 libksba-0.9.9.tar.gz
From fedora-extras-commits at redhat.com Tue Feb 1 19:47:30 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 1 Feb 2005 14:47:30 -0500
Subject: rpms/gpgme import.log,1.3,1.4
Message-ID: <200502011947.j11JlUqg015624@cvs.fedora.redhat.com>
Author: mschwendt
Update of /cvs/extras/rpms/gpgme
In directory cvs.fedora.redhat.com:/tmp/cvs-serv15615
Modified Files:
import.log
Log Message:
auto-import gpgme-1.0.2-1 on branch devel from gpgme-1.0.2-1.src.rpm
Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gpgme/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log 8 Nov 2004 04:29:16 -0000 1.3
+++ import.log 1 Feb 2005 19:47:28 -0000 1.4
@@ -1,2 +1,3 @@
gpgme-0_4_3-0_fdr_3_1:HEAD:gpgme-0.4.3-0.fdr.3.1.src.rpm:1099888150
gpgme-0_4_3-0_fdr_3_2:HEAD:gpgme-0.4.3-0.fdr.3.2.src.rpm:1099888156
+gpgme-1_0_2-1:HEAD:gpgme-1.0.2-1.src.rpm:1107287252
From fedora-extras-commits at redhat.com Tue Feb 1 19:47:30 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 1 Feb 2005 14:47:30 -0500
Subject: rpms/gpgme/devel gpgme-1.0.2.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.2,
1.3 gpgme.spec, 1.4, 1.5 sources, 1.2,
1.3 gpgme-0.4.3-select.patch, 1.1, NONE
Message-ID: <200502011947.j11JlUrL015628@cvs.fedora.redhat.com>
Author: mschwendt
Update of /cvs/extras/rpms/gpgme/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv15615/devel
Modified Files:
.cvsignore gpgme.spec sources
Added Files:
gpgme-1.0.2.tar.bz2.sig
Removed Files:
gpgme-0.4.3-select.patch
Log Message:
auto-import gpgme-1.0.2-1 on branch devel from gpgme-1.0.2-1.src.rpm
--- NEW FILE gpgme-1.0.2.tar.bz2.sig ---
??
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpgme/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 04:29:10 -0000 1.2
+++ .cvsignore 1 Feb 2005 19:47:28 -0000 1.3
@@ -1 +1 @@
-gpgme-0.4.3.tar.gz
+gpgme-1.0.2.tar.bz2
Index: gpgme.spec
===================================================================
RCS file: /cvs/extras/rpms/gpgme/devel/gpgme.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gpgme.spec 14 Dec 2004 00:46:51 -0000 1.4
+++ gpgme.spec 1 Feb 2005 19:47:28 -0000 1.5
@@ -1,19 +1,23 @@
-Name: gpgme
-Version: 0.4.3
-Release: 4
-Epoch: 0
-Summary: GnuPG Made Easy
-
-License: GPL
-Group: Applications/System
-URL: http://www.gnupg.org/related_software/gpgme/
-Source: ftp://ftp.gnupg.org/gcrypt/alpha/gpgme/gpgme-0.4.3.tar.gz
-Patch: gpgme-0.4.3-select.patch
+
+Name: gpgme
+Epoch: 0
+Version: 1.0.2
+Release: 1%{?dist_tag}
+Summary: GnuPG Made Easy - high level crypto API
+License: LGPL
+Group: Applications/System
+URL: http://www.gnupg.org/related_software/gpgme/
+Source0: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.0.2.tar.bz2
+Source1: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.0.2.tar.bz2.sig
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gnupg >= 0:1.2.2, %{_bindir}/gpgsm, pth-devel
-BuildRequires: libgpg-error-devel >= 0:0.5
-Requires: gnupg >= 0:1.2.2, %{_bindir}/gpgsm
+BuildRequires: gnupg >= 0:1.2.2
+BuildRequires: gnupg2 >= 0:1.9.6
+BuildRequires: pth-devel
+BuildRequires: libgpg-error-devel >= 0:0.5
+
+Requires: gnupg >= 0:1.2.2
+Requires: gnupg2 >= 0:1.9.6
%description
GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG
@@ -21,35 +25,38 @@
encryption, decryption, signing, signature verification and key
management.
-%package devel
-Summary: Static libraries and header files from GPGME, GnuPG Made Easy
-Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}, libgpg-error-devel
+%package devel
+Summary: Static libraries and header files from GPGME, GnuPG Made Easy
+Group: Development/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: libgpg-error-devel
Requires(post): /sbin/install-info
Requires(postun): /sbin/install-info
-
%description devel
Static libraries and header files from GPGME, GnuPG Made Easy.
%prep
%setup -q
-%patch -p1 -b .select
%build
-%configure --enable-static
+%configure \
+ --program-prefix="%{?_program_prefix}" \
+ --enable-static
+
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
+
rm -f $RPM_BUILD_ROOT{%{_infodir}/dir,%{_libdir}/*.la}
%check || :
-make check
+make check
%clean
@@ -59,19 +66,19 @@
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
+
%post devel
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
%postun devel
if [ $1 -eq 0 ] ; then
- /sbin/install-info --delete %{_infodir}/%{name}.info \
- %{_infodir}/dir 2>/dev/null || :
+ /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
fi
%files
%defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README* THANKS TODO VERSION
+%doc AUTHORS COPYING* ChangeLog NEWS README* THANKS TODO VERSION
%{_libdir}/libgpgme*.so.*
%files devel
@@ -85,8 +92,19 @@
%changelog
-* Tue Dec 14 2004 Michael Schwendt - 0:0.4.3-4
-- Add similar fd select race/lockup fix as for GPGME 0.3.16.
+* Tue Feb 1 2005 Michael Schwendt - 0:1.0.2-1
+- LGPL used here, and made summary more explicit.
+- Remove dirmngr dependency (gpgsm interfaces with it).
+
+* Thu Jan 06 2005 Rex Dieter 0:1.0.2-0.fdr.1
+- 1.0.2
+
+* Thu Oct 21 2004 Rex Dieter 0:1.0.0-0.fdr.1
+- 1.0.0
+- Requires: dirmngr
+
+* Tue Oct 19 2004 Rex Dieter 0:0.4.7-0.fdr.1
+- 0.4.7
* Sun May 2 2004 Ville Skytt?? - 0:0.4.3-0.fdr.3
- Require %%{_bindir}/gpgsm instead of newpg.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpgme/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 04:29:10 -0000 1.2
+++ sources 1 Feb 2005 19:47:28 -0000 1.3
@@ -1 +1 @@
-a4cb2a2ba1689f0376bc1affc987f183 gpgme-0.4.3.tar.gz
+25513fd35593bad08c1e486878296b40 gpgme-1.0.2.tar.bz2
--- gpgme-0.4.3-select.patch DELETED ---
From fedora-extras-commits at redhat.com Tue Feb 1 19:52:12 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 1 Feb 2005 14:52:12 -0500
Subject: rpms/gpgme/devel gpgme.spec,1.5,1.6
Message-ID: <200502011952.j11JqCxb015709@cvs.fedora.redhat.com>
Author: mschwendt
Update of /cvs/extras/rpms/gpgme/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv15703
Modified Files:
gpgme.spec
Log Message:
Forgot the obsoletes line.
Index: gpgme.spec
===================================================================
RCS file: /cvs/extras/rpms/gpgme/devel/gpgme.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gpgme.spec 1 Feb 2005 19:47:28 -0000 1.5
+++ gpgme.spec 1 Feb 2005 19:52:10 -0000 1.6
@@ -19,6 +19,8 @@
Requires: gnupg >= 0:1.2.2
Requires: gnupg2 >= 0:1.9.6
+Obsoletes: cryptplug <= 0:0.3.16-2
+
%description
GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG
easier for applications. It provides a high-level crypto API for
@@ -95,6 +97,7 @@
* Tue Feb 1 2005 Michael Schwendt - 0:1.0.2-1
- LGPL used here, and made summary more explicit.
- Remove dirmngr dependency (gpgsm interfaces with it).
+- Obsolete cryptplug as gpgme >= 0.4.5 provides what we used cryptplug for.
* Thu Jan 06 2005 Rex Dieter 0:1.0.2-0.fdr.1
- 1.0.2
From fedora-extras-commits at redhat.com Tue Feb 1 21:23:07 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 1 Feb 2005 16:23:07 -0500
Subject: rpms/openct - New directory
Message-ID: <200502012123.j11LN7CL017379@cvs.fedora.redhat.com>
Author: scop
Update of /cvs/extras/rpms/openct
In directory cvs.fedora.redhat.com:/tmp/cvs-serv17372/openct
Log Message:
Directory /cvs/extras/rpms/openct added to the repository
From fedora-extras-commits at redhat.com Tue Feb 1 21:23:07 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 1 Feb 2005 16:23:07 -0500
Subject: rpms/openct/devel - New directory
Message-ID: <200502012123.j11LN7MH017382@cvs.fedora.redhat.com>
Author: scop
Update of /cvs/extras/rpms/openct/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv17372/openct/devel
Log Message:
Directory /cvs/extras/rpms/openct/devel added to the repository
From fedora-extras-commits at redhat.com Tue Feb 1 21:23:26 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 1 Feb 2005 16:23:26 -0500
Subject: rpms/openct Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200502012123.j11LNQUM017443@cvs.fedora.redhat.com>
Author: scop
Update of /cvs/extras/rpms/openct
In directory cvs.fedora.redhat.com:/tmp/cvs-serv17432
Added Files:
Makefile import.log
Log Message:
Setup of module openct
--- NEW FILE Makefile ---
# Top level Makefile for module openct
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like 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 Feb 1 21:23:26 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 1 Feb 2005 16:23:26 -0500
Subject: rpms/openct/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
NONE, 1.1
Message-ID: <200502012123.j11LNQDS017446@cvs.fedora.redhat.com>
Author: scop
Update of /cvs/extras/rpms/openct/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv17432/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module openct
--- NEW FILE .cvsignore ---
***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'
--- NEW FILE sources ---
From fedora-extras-commits at redhat.com Tue Feb 1 21:24:44 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 1 Feb 2005 16:24:44 -0500
Subject: rpms/openct import.log,1.1,1.2
Message-ID: <200502012124.j11LOiBb017576@cvs.fedora.redhat.com>
Author: scop
Update of /cvs/extras/rpms/openct
In directory cvs.fedora.redhat.com:/tmp/cvs-serv17566
Modified Files:
import.log
Log Message:
auto-import openct-0.6.2-1 on branch devel from openct-0.6.2-1.src.rpm
Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/openct/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log 1 Feb 2005 21:23:24 -0000 1.1
+++ import.log 1 Feb 2005 21:24:42 -0000 1.2
@@ -0,0 +1 @@
+openct-0_6_2-1:HEAD:openct-0.6.2-1.src.rpm:1107293074
From fedora-extras-commits at redhat.com Tue Feb 1 21:24:44 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 1 Feb 2005 16:24:44 -0500
Subject: rpms/openct/devel openct-bundle-sofilename.patch, NONE,
1.1 openct-disable-cardman.patch, NONE, 1.1 openct-reader.conf,
NONE, 1.1 openct.init, NONE, 1.1 openct.spec, NONE,
1.1 openct.sysconfig, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
1.1, 1.2
Message-ID: <200502012124.j11LOil9017579@cvs.fedora.redhat.com>
Author: scop
Update of /cvs/extras/rpms/openct/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv17566/devel
Modified Files:
.cvsignore sources
Added Files:
openct-bundle-sofilename.patch openct-disable-cardman.patch
openct-reader.conf openct.init openct.spec openct.sysconfig
Log Message:
auto-import openct-0.6.2-1 on branch devel from openct-0.6.2-1.src.rpm
openct-bundle-sofilename.patch:
--- NEW FILE openct-bundle-sofilename.patch ---
Index: macos/libtool-bundle
===================================================================
RCS file: /pub/cvsroot/openct/macos/libtool-bundle,v
retrieving revision 1.2
diff -a -u -u -r1.2 libtool-bundle
--- macos/libtool-bundle 16 Oct 2003 20:40:36 -0000 1.2
+++ macos/libtool-bundle 17 Aug 2004 19:28:57 -0000
@@ -68,7 +68,7 @@
[ -d "$root" ] && rm -rf "$root"
mkdir -p "$root"/Contents/$arch
-cp "$sofile" "$root"/Contents/$arch/"$name"
+cp "$sofile" "$root"/Contents/$arch/
echo "$type$creator" > "$root"/Contents/PkgInfo
create_info_plist ()
@@ -80,7 +80,7 @@
echo " CFBundleDevelopmentRegion"
echo " English"
echo " CFBundleExecutable"
- echo " $name"
+ echo " `basename \"$sofile\"`"
echo " CFBundleInfoDictionaryVersion"
echo " 6.0"
echo " CFBundleName"
openct-disable-cardman.patch:
--- NEW FILE openct-disable-cardman.patch ---
diff -Naru openct-0.6.2.orig/etc/Info.plist openct-0.6.2/etc/Info.plist
--- openct-0.6.2.orig/etc/Info.plist 2004-08-31 23:44:12.000000000 +0300
+++ openct-0.6.2/etc/Info.plist 2005-02-01 22:21:41.645358832 +0200
@@ -12,18 +12,18 @@
ifdVendorID
- 0x076B
+
0x0529
ifdProductID
- 0x0596
+
0x050C
ifdFriendlyName
- OMNIKEY CardMan 2020
+
Aladdin eToken PRO
diff -Naru openct-0.6.2.orig/etc/openct.conf.in openct-0.6.2/etc/openct.conf.in
--- openct-0.6.2.orig/etc/openct.conf.in 2004-06-29 01:44:10.000000000 +0300
+++ openct-0.6.2/etc/openct.conf.in 2005-02-01 22:39:25.218859061 +0200
@@ -54,9 +54,9 @@
};
driver cardman {
ids = {
- usb:076b/0596, # OMNIKEY CardMan 2020
- usb:076b/1784, # OMNIKEY CardMan 6020
- usb:08d4/0009, # Fujitsu Siemens SCR USB SmartCard Reader
+# usb:076b/0596, # OMNIKEY CardMan 2020
+# usb:076b/1784, # OMNIKEY CardMan 6020
+# usb:08d4/0009, # Fujitsu Siemens SCR USB SmartCard Reader
};
};
driver ccid {
diff -Naru openct-0.6.2.orig/etc/openct.usermap openct-0.6.2/etc/openct.usermap
--- openct-0.6.2.orig/etc/openct.usermap 2004-07-10 00:12:16.000000000 +0300
+++ openct-0.6.2/etc/openct.usermap 2005-02-01 22:18:13.399631957 +0200
@@ -12,8 +12,8 @@
# ikey3k
openct 0x0003 0x04b9 0x1300 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
# cardman
-openct 0x0003 0x076b 0x0596 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
-openct 0x0003 0x076b 0x1784 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
-openct 0x0003 0x08d4 0x0009 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+#openct 0x0003 0x076b 0x0596 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+#openct 0x0003 0x076b 0x1784 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+#openct 0x0003 0x08d4 0x0009 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
# ccid
openct 0x0380 0x0000 0x0000 0x0000 0x0000 0x00 0x00 0x00 0x0b 0x00 0x00 0x00000000
--- NEW FILE openct-reader.conf ---
# OpenCT readers that are not activated by hotplug
# FRIENDLYNAME "OpenCT reader"
# DEVICENAME /dev/null
# LIBPATH __LIBDIR__/openct-ifd.so
# CHANNELID 1
--- NEW FILE openct.init ---
#!/bin/sh
#
# openct This shell script takes care of starting and stopping OpenCT.
#
# chkconfig: 2345 24 89
# description: OpenCT is a middleware framework for smart card terminals.
#
# processname: ifdhandler
# config: /etc/openct.conf
. /etc/rc.d/init.d/functions
exec="/usr/sbin/openct-control"
prog=openct
proc=ifdhandler
OPENCT_OPTIONS=
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
lockfile=/var/lock/subsys/$prog
start() {
retval=0
if ! status $proc >/dev/null 2>&1 ; then
action $"Initializing OpenCT smart card terminals: " \
$exec $OPENCT_OPTIONS init
retval=$?
[ $retval -eq 0 ] && touch $lockfile
fi
return $retval
}
stop() {
action $"Stopping OpenCT smart card terminals: " \
$exec $OPENCT_OPTIONS shutdown
retval=$?
[ $retval -eq 0 ] && rm -f $lockfile
return $retval
}
restart() {
stop
start
}
case "$1" in
start|stop|restart)
$1
;;
reload|force-reload)
restart
;;
status)
$exec $OPENCT_OPTIONS status
status $proc
;;
try-restart|condrestart)
[ ! -f $lockfile ] || restart
;;
*)
echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
exit 2
esac
--- NEW FILE openct.spec ---
Name: openct
Version: 0.6.2
Release: 1
Epoch: 0
Summary: Middleware framework for smart card terminals
Group: System Environment/Libraries
License: BSD
URL: http://www.opensc.org/
Source0: http://www.opensc.org/files/openct-0.6.2.tar.gz
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}-reader.conf
Patch0: %{name}-bundle-sofilename.patch
Patch1: %{name}-disable-cardman.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pcsc-lite-devel libusb-devel sed
Requires: hotplug
Requires(post): /sbin/chkconfig /sbin/ldconfig
Requires(preun): /sbin/chkconfig
Requires(postun): /sbin/ldconfig
%description
OpenCT is a middleware framework for smart card terminals. It
provides a library with rich set of functions for driver writers,
protocol drivers for T=0 and T=1, serial and USB functionality,
including USB hotplugging. See openct.html in the included
documentation for configuration notes.
%package devel
Summary: OpenCT development files
Group: Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}, pkgconfig
%description devel
%{summary}.
%package -n pcsc-lite-%{name}
Summary: OpenCT PC/SC Lite driver
Group: System Environment/Daemons
Requires: pcsc-lite >= 0:1.2.0
Provides: pcsc-ifd-handler
Provides: %{name}-pcsc-lite = %{epoch}:%{version}-%{release}
%description -n pcsc-lite-%{name}
The OpenCT PC/SC Lite driver makes smart card readers supported by
OpenCT available for PC/SC Lite.
%prep
%setup -q
%patch0 -p0
%patch1 -p1
sed 's|__LIBDIR__|%{_libdir}|' < %{SOURCE3} > %{name}-reader.conf
%build
%configure \
--disable-dependency-tracking \
--with-bundle-dir=%{_libdir}/pcsc/drivers
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb
make install DESTDIR=$RPM_BUILD_ROOT
ln -sf %{_libdir}/openct-ifd.so \
$RPM_BUILD_ROOT%{_libdir}/pcsc/drivers/openct-ifd.bundle/Contents/*/
install -pm 644 etc/openct.conf $RPM_BUILD_ROOT%{_sysconfdir}/openct.conf
install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/openct
install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/openct
install -Dpm 644 %{name}-reader.conf \
$RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/%{name}.conf
install -dm 755 $RPM_BUILD_ROOT%{_localstatedir}/run/openct
touch $RPM_BUILD_ROOT%{_localstatedir}/run/openct/status
chmod 644 $RPM_BUILD_ROOT%{_localstatedir}/run/openct/status
%clean
rm -rf $RPM_BUILD_ROOT
%post
/sbin/ldconfig
/sbin/chkconfig --add openct
%preun
if [ $1 -eq 0 ] ; then
%{_initrddir}/openct stop >/dev/null 2>&1 || :
/sbin/chkconfig --del openct
fi
%postun
/sbin/ldconfig
if [ $1 -gt 0 ] ; then
%{_initrddir}/openct try-restart >/dev/null || :
fi
%post -n pcsc-lite-%{name}
if [ $1 -eq 1 ] ; then
%{_initrddir}/pcscd try-restart >/dev/null 2>&1 || :
fi
%postun -n pcsc-lite-%{name}
%{_initrddir}/pcscd try-restart >/dev/null 2>&1 || :
%files
%defattr(-,root,root,-)
%doc ANNOUNCE AUTHORS ChangeLog LICENSE NEWS TODO
%doc doc/openct.html doc/openct.css
%config(noreplace) %{_sysconfdir}/openct.conf
%config(noreplace) %{_sysconfdir}/sysconfig/openct
%config %{_sysconfdir}/hotplug/usb/openct*
%config %{_initrddir}/openct
%{_bindir}/openct-tool
%{_sbindir}/ifdhandler
%{_sbindir}/ifdproxy
%{_sbindir}/openct-control
%{_libdir}/libopenct.so.*
%{_libdir}/libifd.so.*
%{_libdir}/libopenctapi.so
%dir %{_localstatedir}/run/openct
%ghost %{_localstatedir}/run/openct/status
%files devel
%defattr(-,root,root,-)
%{_includedir}/openct
%{_libdir}/pkgconfig/libopenct.pc
%{_libdir}/libopenct.a
%{_libdir}/libopenct.so
%{_libdir}/libifd.a
%{_libdir}/libifd.so
%exclude %{_libdir}/libopenctapi.a
%exclude %{_libdir}/lib*.la
%files -n pcsc-lite-%{name}
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/reader.conf.d/%{name}.conf
%{_libdir}/openct-ifd.so
%{_libdir}/pcsc/drivers/openct-ifd.bundle/
%exclude %{_libdir}/openct-ifd.a
%exclude %{_libdir}/openct-ifd.la
%changelog
* Tue Feb 1 2005 Ville Skytt?? - 0:0.6.2-1
- Disable CardMan driver in default configs, too unreliable at the moment.
* Wed Nov 3 2004 Ville Skytt?? - 0:0.6.2-0.fdr.1
- Update to 0.6.2, eToken bundle patch applied upstream.
- Make scriptlet dependencies more granular.
* Tue Aug 17 2004 Ville Skytt?? - 0:0.6.1-0.fdr.2
- Split PC/SC Lite stuff into the pcsc-lite-openct subpackage, use symlinks
to avoid packaging the same .so many times.
- Install reader.conf snippet for pcsc-lite.
- Patch to make eToken PRO hotplug work with PC/SC Lite.
- Exclude more unneeded files from docs and -devel.
- Disable dependency tracking to speed up the build.
* Thu Jul 22 2004 Ville Skytt?? - 0:0.6.1-0.fdr.1
- Update to 0.6.1 (preview).
* Thu Jul 1 2004 Ville Skytt?? - 0:0.6.0-0.fdr.0.1.alpha
- Update to 0.6.0-alpha.
* Fri Apr 16 2004 Ville Skytt?? - 0:0.5.0-0.fdr.6
- Init script improvements.
* Wed Feb 4 2004 Ville Skytt?? - 0:0.5.0-0.fdr.5
- Autostart service in runlevels 2-5.
* Thu Jan 29 2004 Ville Skytt?? - 0:0.5.0-0.fdr.4
- More init script fine tuning.
* Mon Jan 12 2004 Ville Skytt?? - 0:0.5.0-0.fdr.3
- Init script improvements.
* Mon Dec 29 2003 Ville Skytt?? - 0:0.5.0-0.fdr.2
- Include init script and a sysconfig file.
- Improve summary and description.
* Mon Nov 24 2003 Ville Skytt?? - 0:0.5.0-0.fdr.1
- Update to 0.5.0.
* Fri Nov 14 2003 Ville Skytt?? - 0:0.1.0-0.fdr.2
- Create /var/run/openct/status to avoid OpenSC errors.
* Tue Aug 19 2003 Ville Skytt?? - 0:0.1.0-0.fdr.1
- First build.
--- NEW FILE openct.sysconfig ---
# -*- sh -*-
# Extra options to pass to openct-control.
# Consult "/usr/sbin/openct-control -h" for available options.
#
OPENCT_OPTIONS=""
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Feb 2005 21:23:24 -0000 1.1
+++ .cvsignore 1 Feb 2005 21:24:42 -0000 1.2
@@ -0,0 +1 @@
+openct-0.6.2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Feb 2005 21:23:24 -0000 1.1
+++ sources 1 Feb 2005 21:24:42 -0000 1.2
@@ -0,0 +1 @@
+18d8bca0372515842fec9f366ca461d1 openct-0.6.2.tar.gz
From fedora-extras-commits at redhat.com Tue Feb 1 22:36:17 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 1 Feb 2005 17:36:17 -0500
Subject: rpms/gnupg2 - New directory
Message-ID: <200502012236.j11MaHma018551@cvs.fedora.redhat.com>
Author: mschwendt
Update of /cvs/extras/rpms/gnupg2
In directory cvs.fedora.redhat.com:/tmp/cvs-serv18544/gnupg2
Log Message:
Directory /cvs/extras/rpms/gnupg2 added to the repository
From fedora-extras-commits at redhat.com Tue Feb 1 22:36:17 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 1 Feb 2005 17:36:17 -0500
Subject: rpms/gnupg2/devel - New directory
Message-ID: <200502012236.j11MaHE4018554@cvs.fedora.redhat.com>
Author: mschwendt
Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv18544/gnupg2/devel
Log Message:
Directory /cvs/extras/rpms/gnupg2/devel added to the repository
From fedora-extras-commits at redhat.com Tue Feb 1 22:36:39 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 1 Feb 2005 17:36:39 -0500
Subject: rpms/gnupg2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
NONE, 1.1
Message-ID: <200502012236.j11MadOT018618@cvs.fedora.redhat.com>
Author: mschwendt
Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv18606/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module gnupg2
--- NEW FILE .cvsignore ---
***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'
--- NEW FILE sources ---
From fedora-extras-commits at redhat.com Tue Feb 1 22:36:39 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 1 Feb 2005 17:36:39 -0500
Subject: rpms/gnupg2 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200502012236.j11Madja018615@cvs.fedora.redhat.com>
Author: mschwendt
Update of /cvs/extras/rpms/gnupg2
In directory cvs.fedora.redhat.com:/tmp/cvs-serv18606
Added Files:
Makefile import.log
Log Message:
Setup of module gnupg2
--- NEW FILE Makefile ---
# Top level Makefile for module gnupg2
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like 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 Feb 1 22:40:37 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 1 Feb 2005 17:40:37 -0500
Subject: rpms/gnupg2 import.log,1.1,1.2
Message-ID: <200502012240.j11MebgV018745@cvs.fedora.redhat.com>
Author: mschwendt
Update of /cvs/extras/rpms/gnupg2
In directory cvs.fedora.redhat.com:/tmp/cvs-serv18736
Modified Files:
import.log
Log Message:
auto-import gnupg2-1.9.14-1 on branch devel from gnupg2-1.9.14-1.src.rpm
Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log 1 Feb 2005 22:36:37 -0000 1.1
+++ import.log 1 Feb 2005 22:40:35 -0000 1.2
@@ -0,0 +1 @@
+gnupg2-1_9_14-1:HEAD:gnupg2-1.9.14-1.src.rpm:1107297624
From fedora-extras-commits at redhat.com Tue Feb 1 22:40:37 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 1 Feb 2005 17:40:37 -0500
Subject: rpms/gnupg2/devel gnupg-1.9.14.tar.bz2.sig, NONE,
1.1 gnupg-1.9.4-gpg-error.patch, NONE, 1.1 gnupg2.spec, NONE,
1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200502012240.j11Mebiq018749@cvs.fedora.redhat.com>
Author: mschwendt
Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv18736/devel
Modified Files:
.cvsignore sources
Added Files:
gnupg-1.9.14.tar.bz2.sig gnupg-1.9.4-gpg-error.patch
gnupg2.spec
Log Message:
auto-import gnupg2-1.9.14-1 on branch devel from gnupg2-1.9.14-1.src.rpm
--- NEW FILE gnupg-1.9.14.tar.bz2.sig ---
??
???E
gnupg-1.9.4-gpg-error.patch:
--- NEW FILE gnupg-1.9.4-gpg-error.patch ---
--- gnupg-1.9.14/agent/preset-passphrase.c.gpg-err 2004-12-21 12:56:09.000000000 -0600
+++ gnupg-1.9.14/agent/preset-passphrase.c 2005-01-06 14:27:28.000000000 -0600
@@ -137,7 +137,7 @@
case SPWQ_IO_ERROR:
return gpg_error_from_errno (EIO);
case SPWQ_PROTOCOL_ERROR:
- return gpg_error (GPG_ERR_PROTOCOL_VIOLATION);
+ return gpg_error (GPG_ERR_UNSUPPORTED_PROTOCOL);
case SPWQ_ERR_RESPONSE:
return gpg_error (GPG_ERR_INV_RESPONSE);
case SPWQ_NO_AGENT:
--- NEW FILE gnupg2.spec ---
# $Id: gnupg.spec,v 1.7 2003/12/11 14:17:11 rexdieter Exp $
Summary: GNU utility for secure communication and data storage
Name: gnupg2
Epoch: 0
Version: 1.9.14
Release: 1%{?dist_tag}
License: GPL
Group: Applications/System
Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-1.9.14.tar.bz2
Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-1.9.14.tar.bz2.sig
URL: http://www.gnupg.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Patch1: gnupg-1.9.4-gpg-error.patch
Obsoletes: newpg < 0:0.9.5
Requires(post): /sbin/install-info
Requires(postun): /sbin/install-info
## gcc version in use?
BuildRequires: gcc
%define gcc_ver %(rpm -q --qf '%%{version}' gcc )
%if "%{gcc_ver}" >= "3.2.3"
%define pie 1
%endif
BuildRequires: openldap-devel, zlib-devel, gettext
BuildRequires: libgcrypt-devel => 0:1.2.0
BuildRequires: libgpg-error-devel => 0:0.7
BuildRequires: libassuan-devel >= 0.6.9
BuildRequires: libksba-devel >= 0:0.9.7
# to build without opensc support: --without opensc
%{!?_without_opensc:BuildRequires: opensc-devel >= 0.9}
%{?_without_opensc:BuildConflicts: opensc-devel }
BuildRequires: libusb-devel
BuildRequires: pth-devel
BuildRequires: zlib-devel, bzip2-devel
Buildrequires: libusb-devel
BuildRequires: docbook-utils
Requires: pinentry >= 0:0.7.1
# Should these be versioned? -- Rex
Provides: gpg
Provides: openpgp
%description
GnuPG 1.9 is the future version of GnuPG; it is based on the gnupg-1.3
code and the previous newpg package. It will eventually lead to a
GnuPG 2.0 release. Note that GnuPG 1.3 and 1.9 are not always in sync
and thus features and bug fixes done in 1.3 are not necessary
available in 1.9.
You should use this GnuPG version if you want to use the gpg-agent or
gpgsm (the S/MIME variant of gpg). Note that the gpg-agent is also
helpful when using the standard gpg versions (1.2.x or 1.3.x).
%prep
%setup -q -n gnupg-%{version}
%patch1 -p1 -b .gpg-error
%build
%{?pie:CFLAGS="$RPM_OPT_FLAGS -fPIE" ; export CFLAGS}
%{?pie:LDFLAGS="$RPM_OPT_FLAGS -pie" ; export LDFLAG}
%configure \
--program-prefix="%{?_program_prefix}" \
--disable-rpath
make %{?_smp_mflags}
make check
%clean
rm -rf $RPM_BUILD_ROOT
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
%post
/sbin/install-info %{_infodir}/gnupg.info.gz %{_infodir}/dir 2>/dev/null ||:
%preun
if [ $1 -eq 0 ]; then
/sbin/install-info --delete %{_infodir}/gnupg.info.gz %{_infodir}/dir \
2>/dev/null ||:
fi
%files -f %{name}.lang
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
#attr(4755,root,root) %{_bindir}/gpg2
%{_bindir}/gpg2
%{_bindir}/gpg-agent
%{_bindir}/gpgconf
%{_bindir}/gpgsm*
%{_bindir}/gpgv2
%{_bindir}/kbxutil
%{_bindir}/sc-copykeys
%{_bindir}/scdaemon
%{_bindir}/watchgnupg
%{_sbindir}/*
%{_datadir}/gnupg
%{_libdir}/gnupg
%{_libexecdir}/*
%{_infodir}/*
%changelog
* Tue Feb 1 2005 Michael Schwendt - 0:1.9.14-1
- Make install-info in scriptlets less noisy.
* Thu Jan 06 2005 Rex Dieter 1.9.14-0.fdr.1
- 1.9.14
- enable opensc support
- BR: libassuan-devel >= 0.6.9
* Thu Oct 21 2004 Rex Dieter 1.9.11-0.fdr.4
- remove suid.
* Thu Oct 21 2004 Rex Dieter 1.9.11-0.fdr.3
- remove Provides: newpg
* Wed Oct 20 2004 Rex Dieter 1.9.11-0.fdr.2
- Requires: pinentry
- gpg2 suid
- update description
* Tue Oct 19 2004 Rex Dieter 1.9.11-0.fdr.1
- first try
- leave out opensc support (for now), enable --with-opensc
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Feb 2005 22:36:37 -0000 1.1
+++ .cvsignore 1 Feb 2005 22:40:35 -0000 1.2
@@ -0,0 +1 @@
+gnupg-1.9.14.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Feb 2005 22:36:37 -0000 1.1
+++ sources 1 Feb 2005 22:40:35 -0000 1.2
@@ -0,0 +1 @@
+fd121b7d368cf27928bfa4ef4e4cc982 gnupg-1.9.14.tar.bz2
From fedora-extras-commits at redhat.com Tue Feb 1 22:41:16 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 1 Feb 2005 17:41:16 -0500
Subject: rpms/gnofract4d import.log,1.3,1.4
Message-ID: <200502012241.j11MfG82018840@cvs.fedora.redhat.com>
Author: mschwendt
Update of /cvs/extras/rpms/gnofract4d
In directory cvs.fedora.redhat.com:/tmp/cvs-serv18828
Modified Files:
import.log
Log Message:
auto-import gnofract4d-2.6-1 on branch devel from gnofract4d-2.6-1.src.rpm
Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnofract4d/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log 8 Nov 2004 04:27:22 -0000 1.3
+++ import.log 1 Feb 2005 22:41:14 -0000 1.4
@@ -1,2 +1,3 @@
gnofract4d-2_0-0_fdr_1_1:HEAD:gnofract4d-2.0-0.fdr.1.1.src.rpm:1099887984
gnofract4d-2_0-0_fdr_1_2:HEAD:gnofract4d-2.0-0.fdr.1.2.src.rpm:1099888042
+gnofract4d-2_6-1:HEAD:gnofract4d-2.6-1.src.rpm:1107297679
From fedora-extras-commits at redhat.com Tue Feb 1 22:41:16 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 1 Feb 2005 17:41:16 -0500
Subject: rpms/gnofract4d/devel .cvsignore, 1.2, 1.3 gnofract4d.spec, 1.2,
1.3 sources, 1.2, 1.3
Message-ID: <200502012241.j11MfGGu018843@cvs.fedora.redhat.com>
Author: mschwendt
Update of /cvs/extras/rpms/gnofract4d/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv18828/devel
Modified Files:
.cvsignore gnofract4d.spec sources
Log Message:
auto-import gnofract4d-2.6-1 on branch devel from gnofract4d-2.6-1.src.rpm
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnofract4d/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 04:26:24 -0000 1.2
+++ .cvsignore 1 Feb 2005 22:41:14 -0000 1.3
@@ -1 +1 @@
-gnofract4d-2.0.tar.gz
+gnofract4d-2.6.tar.gz
Index: gnofract4d.spec
===================================================================
RCS file: /cvs/extras/rpms/gnofract4d/devel/gnofract4d.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnofract4d.spec 8 Nov 2004 04:27:22 -0000 1.2
+++ gnofract4d.spec 1 Feb 2005 22:41:14 -0000 1.3
@@ -1,13 +1,12 @@
Name: gnofract4d
-Version: 2.0
-Release: 0.fdr.1.2
-Epoch: 0
+Version: 2.6
+Release: 1
Summary: Gnofract 4D is a Gnome-based program to draw fractals.
Group: Amusements/Graphics
License: GPL
URL: http://gnofract4d.sourceforge.net/
-Source0: http://dl.sf.net/gnofract4d/gnofract4d-2.0.tar.gz
+Source0: http//dl.sf.net/gnofract4d/gnofract4d-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): scrollkeeper
Requires(postun): scrollkeeper
@@ -31,7 +30,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-sed -i "s/Terminal=0/Terminal=false/" %{name}.desktop
+#sed -i "s/Terminal=0/Terminal=false/" %{name}.desktop
python setup.py install -O1 --root=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
@@ -53,9 +52,11 @@
%post
/usr/bin/scrollkeeper-update 2> /dev/null
+/usr/bin/update-desktop-database %{_datadir}/applications
%postun
/usr/bin/scrollkeeper-update 2> /dev/null
+/usr/bin/update-desktop-database %{_datadir}/applications
%files
%defattr(-,root,root,-)
@@ -69,6 +70,14 @@
%{_datadir}/applications/*
%changelog
+* Tue Feb 01 2005 Panu Matilainen 0:2.6-1
+- update to 2.6
+- drop epoch 0 and fedora.us release tag
+- run update-desktop-database on post+postun
+
+* Sun Oct 03 2004 Panu Matilainen 0:2.1-0.fdr.1
+- update to 2.1
+
* Tue Jul 06 2004 Panu Matilainen 0:2.0-0.fdr.1
- update to 2.0
- quite a few dependency changes because of switch to python etc
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnofract4d/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 04:26:24 -0000 1.2
+++ sources 1 Feb 2005 22:41:14 -0000 1.3
@@ -1 +1 @@
-b8f84e9ef3d4dd831fc5791e3981c3e8 gnofract4d-2.0.tar.gz
+4fb185f967003ecd6c752cbd2b89961f gnofract4d-2.6.tar.gz
From fedora-extras-commits at redhat.com Tue Feb 1 23:37:14 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 1 Feb 2005 18:37:14 -0500
Subject: rpms/lua/devel sources,1.2,1.3
Message-ID: <200502012337.j11NbETI019733@cvs.fedora.redhat.com>
Author: mschwendt
Update of /cvs/extras/rpms/lua/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv19727
Modified Files:
sources
Log Message:
uploaded missing tarball
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lua/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 04:49:49 -0000 1.2
+++ sources 1 Feb 2005 23:37:12 -0000 1.3
@@ -1 +1 @@
-6f14803fad389fb1cb15d17edfeddd91 lua-5.0.tar.gz
+dea74646b7e5c621fef7174df83c34b1 lua-5.0.2.tar.gz
From fedora-extras-commits at redhat.com Wed Feb 2 13:15:08 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 2 Feb 2005 08:15:08 -0500
Subject: rpms/starfighter/devel starfighter.spec,1.3,1.4
Message-ID: <200502021315.j12DF8hg032323@cvs.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/starfighter/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv32315
Modified Files:
starfighter.spec
Log Message:
Remove non useful lines.
Index: starfighter.spec
===================================================================
RCS file: /cvs/extras/rpms/starfighter/devel/starfighter.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- starfighter.spec 5 Jan 2005 18:56:25 -0000 1.3
+++ starfighter.spec 2 Feb 2005 13:15:06 -0000 1.4
@@ -1,6 +1,3 @@
-# $Id$
-# Authority: matthias
-
%{?dist: %{expand: %%define %dist 1}}
%{?el2:%define _without_freedesktop 1}
From fedora-extras-commits at redhat.com Wed Feb 2 13:59:18 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 2 Feb 2005 08:59:18 -0500
Subject: rpms/gnome-themes-extras/devel gnome-themes-extras.spec,1.4,1.5
Message-ID: <200502021359.j12DxIKI032422@cvs.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/gnome-themes-extras/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv32410
Modified Files:
gnome-themes-extras.spec
Log Message:
Fix release tag and drop epochs.
Index: gnome-themes-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/devel/gnome-themes-extras.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-themes-extras.spec 10 Dec 2004 21:53:51 -0000 1.4
+++ gnome-themes-extras.spec 2 Feb 2005 13:59:16 -0000 1.5
@@ -1,7 +1,6 @@
Name: gnome-themes-extras
Version: 0.8.0
-Release: 0.fdr.1
-Epoch: 0
+Release: 1
Summary: Collection of metathemes for the GNOME desktop environment
Group: User Interface/Desktops
@@ -10,8 +9,8 @@
Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-themes-extras/0.8/gnome-themes-extras-0.8.0.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: librsvg2-devel >= 0:2.1.3
-BuildRequires: gtk2-devel >= 0:2.4.0
+BuildRequires: librsvg2-devel >= 2.1.3
+BuildRequires: gtk2-devel >= 2.4.0
BuildRequires: gettext
Requires: gnome-icon-theme
Requires: gnome-themes
From fedora-extras-commits at redhat.com Wed Feb 2 14:03:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 2 Feb 2005 09:03:01 -0500
Subject: rpms/libsafe/devel libsafe-2.0-16.spec,1.3,1.4
Message-ID: <200502021403.j12E31jG000640@cvs.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/libsafe/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv634
Modified Files:
libsafe-2.0-16.spec
Log Message:
Drop epoch before rebuild.
Index: libsafe-2.0-16.spec
===================================================================
RCS file: /cvs/extras/rpms/libsafe/devel/libsafe-2.0-16.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libsafe-2.0-16.spec 29 Jan 2005 21:07:16 -0000 1.3
+++ libsafe-2.0-16.spec 2 Feb 2005 14:02:59 -0000 1.4
@@ -2,7 +2,6 @@
Name: libsafe
Version: 2.0
Release: 16c
-Epoch: 0
License: LGPL
Group: System Environment/Libraries
Source: http://www.research.avayalabs.com/project/libsafe/libsafe-2.0-16.tgz
From fedora-extras-commits at redhat.com Wed Feb 2 14:05:47 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 2 Feb 2005 09:05:47 -0500
Subject: rpms/uqm-content/devel uqm-content.spec,1.1,1.2
Message-ID: <200502021405.j12E5lIw000678@cvs.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/uqm-content/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv672
Modified Files:
uqm-content.spec
Log Message:
Fix release, drop epoch.
Index: uqm-content.spec
===================================================================
RCS file: /cvs/extras/rpms/uqm-content/devel/uqm-content.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- uqm-content.spec 8 Nov 2004 05:31:00 -0000 1.1
+++ uqm-content.spec 2 Feb 2005 14:05:45 -0000 1.2
@@ -2,8 +2,7 @@
Name: uqm-content
Version: 0.3
-Release: 0.fdr.1.1
-Epoch: 0
+Release: 1
Summary: Base content files for The Ur-Quan Masters
Group: Amusements/Games
@@ -15,14 +14,14 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-Requires: uqm >= 0:0.3
+Requires: uqm >= 0.3
%description
%{summary}.
%package voice
Summary: Optional speech package for The Ur-Quan Masters
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Group: %{group}
%description voice
@@ -30,7 +29,7 @@
%package 3domusic
Summary: Optional 3DO music package for The Ur-Quan Masters
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Group: %{group}
%description 3domusic
From fedora-extras-commits at redhat.com Wed Feb 2 14:07:48 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 2 Feb 2005 09:07:48 -0500
Subject: rpms/opencdk/devel opencdk.spec,1.2,1.3
Message-ID: <200502021407.j12E7mq3000711@cvs.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/opencdk/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv705
Modified Files:
opencdk.spec
Log Message:
Fix release, drop epoch and separators that can be nasty sometimes.
Index: opencdk.spec
===================================================================
RCS file: /cvs/extras/rpms/opencdk/devel/opencdk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- opencdk.spec 8 Nov 2004 04:55:55 -0000 1.2
+++ opencdk.spec 2 Feb 2005 14:07:46 -0000 1.3
@@ -1,8 +1,7 @@
Summary: Provides basic parts of the OpenPGP message format
Name: opencdk
Version: 0.4.5
-Release: 0.fdr.1.1
-Epoch: 0
+Release: 1
License: GPL
Group: System Environment/Libraries
URL: http://www.gnu.org/software/gnutls/download.html
@@ -13,7 +12,7 @@
%package devel
Summary: Files which are needed to develop applications using opencdk
Group: Development/Libraries
-Requires: %{name} = 0:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Requires: libgcrypt-devel zlib-devel
@@ -38,12 +37,10 @@
This package contains headerfiles and libraries which are needed to
develop applications based on opencdk.
-#----------------------------------------
%prep
%setup -q
-#----------------------------------------
%build
%configure
@@ -52,12 +49,10 @@
perl -pi -e 's!^(\S.*[\s"])-L/usr/lib([\s"])!\1\2!g;
s!^(\S.*[\s"])-I/usr/include([\s"])!\1\2!g' src/opencdk-config
-#----------------------------------------
%check
%{__make} check
-#----------------------------------------
%install
rm -rf "$RPM_BUILD_ROOT"
@@ -65,12 +60,10 @@
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-#----------------------------------------
%clean
rm -rf "$RPM_BUILD_ROOT"
-#----------------------------------------
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
From fedora-extras-commits at redhat.com Wed Feb 2 14:10:21 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 2 Feb 2005 09:10:21 -0500
Subject: rpms/pam_mount/devel pam_mount.spec,1.1,1.2
Message-ID: <200502021410.j12EALfJ000742@cvs.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/pam_mount/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv736
Modified Files:
pam_mount.spec
Log Message:
Fix release and some very minor cleanups.
Index: pam_mount.spec
===================================================================
RCS file: /cvs/extras/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pam_mount.spec 8 Nov 2004 04:56:53 -0000 1.1
+++ pam_mount.spec 2 Feb 2005 14:10:19 -0000 1.2
@@ -1,12 +1,10 @@
-%define rel 0.fdr.1
-
Summary: A PAM module that can mount volumes for a user session
Name: pam_mount
Version: 0.9.16
-Release: %rel.1
+Release: 1
License: LGPL
Group: System Environment/Base
-Source: http://www.flyn.org/projects/%name/%name-%{PACKAGE_VERSION}.tar.gz
+Source: http://www.flyn.org/projects/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://www.flyn.org
Requires: pam
@@ -49,8 +47,6 @@
%prep
-
-
%setup
@@ -58,6 +54,7 @@
%configure
make %{?_smp_mflags}
+
%install
rm -rf $RPM_BUILD_ROOT
%makeinstall
@@ -120,6 +117,3 @@
* Fri Jan 23 2004 W. Michael Petullo - 0.9.12-0.fdr.1
- Updated to pam_mount 0.9.12.
-
-
-
From fedora-extras-commits at redhat.com Wed Feb 2 14:11:53 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 2 Feb 2005 09:11:53 -0500
Subject: rpms/wxPython/devel wxPython.spec,1.2,1.3
Message-ID: <200502021411.j12EBrgT000775@cvs.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/wxPython/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv769
Modified Files:
wxPython.spec
Log Message:
Fix release.
Index: wxPython.spec
===================================================================
RCS file: /cvs/extras/rpms/wxPython/devel/wxPython.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wxPython.spec 8 Nov 2004 05:33:06 -0000 1.2
+++ wxPython.spec 2 Feb 2005 14:11:51 -0000 1.3
@@ -4,8 +4,7 @@
Name: wxPython
Version: 2.4.2.4
-Release: 0.fdr.2.1
-Epoch: 0
+Release: 1
Summary: wxPython is a GUI toolkit for the Python programming language.
Group: Development/Languages
@@ -15,8 +14,8 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: wxGTK2-devel >= 0:2.4.2, pkgconfig
-BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
-BuildRequires: python-devel, wxGTK2-gl
+BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
+BuildRequires: python-devel, wxGTK2-gl
Requires: %{_libdir}/python%{pyver}
%description
From fedora-extras-commits at redhat.com Wed Feb 2 14:16:51 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 2 Feb 2005 09:16:51 -0500
Subject: rpms/openal/devel openal.spec,1.5,1.6
Message-ID: <200502021416.j12EGpkW000849@cvs.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/openal/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv835
Modified Files:
openal.spec
Log Message:
Picky, picky : Fix tab vs. space mixing.
Index: openal.spec
===================================================================
RCS file: /cvs/extras/rpms/openal/devel/openal.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openal.spec 19 Dec 2004 13:21:47 -0000 1.5
+++ openal.spec 2 Feb 2005 14:16:49 -0000 1.6
@@ -71,13 +71,13 @@
%build
cd linux
sh ./autogen.sh
-%configure --enable-arts \
+%configure --enable-arts \
--enable-alsa \
- --enable-esd \
+ --enable-esd \
--enable-vorbis \
--enable-sdl \
--disable-smpeg \
- --enable-capture
+ --enable-capture
make %{?_smp_mflags}
make -C doc
@@ -87,8 +87,8 @@
%install
rm -rf ${RPM_BUILD_ROOT}
make -C linux DESTDIR=${RPM_BUILD_ROOT}%{_prefix}/ \
- DESTLIB=${RPM_BUILD_ROOT}%{_libdir} \
- install
+ DESTLIB=${RPM_BUILD_ROOT}%{_libdir} \
+ install
#
# tests
install -m0755 -d ${RPM_BUILD_ROOT}%{_libdir}/openal
From thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net Wed Feb 2 15:17:23 2005
From: thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net (Matthias Saou)
Date: Wed, 2 Feb 2005 16:17:23 +0100
Subject: rpms/opencdk/devel opencdk.spec,1.2,1.3
In-Reply-To: <20050202161007.5ed90b2b.fedora@wir-sind-cool.org>
References: <200502021407.j12E7mq3000711@cvs.fedora.redhat.com>
<20050202161007.5ed90b2b.fedora@wir-sind-cool.org>
Message-ID: <20050202161723.23245781@python2>
Michael Schwendt wrote :
> On Wed, 2 Feb 2005 09:07:48 -0500, Matthias Saou (thias) wrote:
>
> > Author: thias
> >
> > Update of /cvs/extras/rpms/opencdk/devel
> > In directory cvs.fedora.redhat.com:/tmp/cvs-serv705
> >
> > Modified Files:
> > opencdk.spec
> > Log Message:
> > Fix release, drop epoch and separators that can be nasty sometimes.
>
> Hmm, all of these still have 0.fdr prefix on purpose, because they were
> failed rebuilds for FC2/FC3 and not updated since then. See
>
> http://fedoraproject.org/wiki/Extras/FC3Status
>
> Except uqm-content which is a very large data package and would be
> an unnecessary upgrade for users. It can be shared between FC3 and
> older.
Errr... then I'm sorry, but also very confused : I changed those release
tags because all of these packages are already built in FC3 pre-Extras. :-/
http://fedoraproject.org/pre-extras/3/
Cheers,
Matthias
--
Clean custom Red Hat Linux rpm packages : http://freshrpms.net/
Fedora Core release 3 (Heidelberg) - Linux kernel 2.6.10-1.753_FC3
Load : 0.19 0.34 0.39
From fedora at wir-sind-cool.org Wed Feb 2 15:35:24 2005
From: fedora at wir-sind-cool.org (Michael Schwendt)
Date: Wed, 2 Feb 2005 16:35:24 +0100
Subject: rpms/opencdk/devel opencdk.spec,1.2,1.3
In-Reply-To: <20050202161723.23245781@python2>
References: <200502021407.j12E7mq3000711@cvs.fedora.redhat.com>
<20050202161007.5ed90b2b.fedora@wir-sind-cool.org>
<20050202161723.23245781@python2>
Message-ID: <20050202163524.13808d5a.fedora@wir-sind-cool.org>
On Wed, 2 Feb 2005 16:17:23 +0100, Matthias Saou wrote:
> > > Modified Files:
> > > opencdk.spec
> > > Log Message:
> > > Fix release, drop epoch and separators that can be nasty sometimes.
> >
> > Hmm, all of these still have 0.fdr prefix on purpose, because they were
> > failed rebuilds for FC2/FC3 and not updated since then. See
> >
> > http://fedoraproject.org/wiki/Extras/FC3Status
> >
> > Except uqm-content which is a very large data package and would be
> > an unnecessary upgrade for users. It can be shared between FC3 and
> > older.
>
> Errr... then I'm sorry, but also very confused : I changed those release
> tags because all of these packages are already built in FC3 pre-Extras. :-/
>
> http://fedoraproject.org/pre-extras/3/
Remember that the sudden first mass-rebuild of everything in CVS happened
while cleanup of the imported packages was not complete. Many old packages
had a "devel" branch, but had not been rebuilt or updated since FC1 or
older. With these exceptions:
'uqm-content'
(release not touched, so common package is shared for all dists)
'gnome-themes-extras'
(0.fdr.1 was imported after mass release-bump, good to bump it now)
The other packages with 0.fdr.1.1 (or so) were last built for FC1 and need
investigation and are tracked since FC2Status page, when they failed to
build for FC2. The FC3Status page contains a copy of the old FC2Status
page.
From thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net Wed Feb 2 16:02:58 2005
From: thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net (Matthias Saou)
Date: Wed, 2 Feb 2005 17:02:58 +0100
Subject: rpms/opencdk/devel opencdk.spec,1.2,1.3
In-Reply-To: <20050202163524.13808d5a.fedora@wir-sind-cool.org>
References: <200502021407.j12E7mq3000711@cvs.fedora.redhat.com>
<20050202161007.5ed90b2b.fedora@wir-sind-cool.org>
<20050202161723.23245781@python2>
<20050202163524.13808d5a.fedora@wir-sind-cool.org>
Message-ID: <20050202170258.7d626f76@python2>
Michael Schwendt wrote :
> Remember that the sudden first mass-rebuild of everything in CVS happened
> while cleanup of the imported packages was not complete. Many old
packages
> had a "devel" branch, but had not been rebuilt or updated since FC1 or
> older. With these exceptions:
>
> 'uqm-content'
> (release not touched, so common package is shared for all dists)
Hmmm, for me, this one should not escape the renaming just for that reason,
especially since there have been no FC3 packages from fedora.us, Fedora
Extras should IMHO introduce only new clean packages (not to mention that
two different released builds should never share the same N-E-V-R since
there are no guarantees that they will be identical, especially when coming
from two different build systems), and eventually keep it as-is from there
on for future Core releases as you want to do now.
> 'gnome-themes-extras'
> (0.fdr.1 was imported after mass release-bump, good to bump it now)
OK.
> The other packages with 0.fdr.1.1 (or so) were last built for FC1 and
need
> investigation and are tracked since FC2Status page, when they failed to
> build for FC2. The FC3Status page contains a copy of the old FC2Status
> page.
So the proper fix would be to remove them from the built pre-Extras, then?
And either remove their devel branch or "blacklist" them so that they don't
get rebuilt until someone actually decides to fix them up...
Matthias
--
Clean custom Red Hat Linux rpm packages : http://freshrpms.net/
Fedora Core release 3 (Heidelberg) - Linux kernel 2.6.10-1.753_FC3
Load : 0.21 0.29 0.28
From fedora at wir-sind-cool.org Wed Feb 2 15:10:07 2005
From: fedora at wir-sind-cool.org (Michael Schwendt)
Date: Wed, 2 Feb 2005 16:10:07 +0100
Subject: rpms/opencdk/devel opencdk.spec,1.2,1.3
In-Reply-To: <200502021407.j12E7mq3000711@cvs.fedora.redhat.com>
References: <200502021407.j12E7mq3000711@cvs.fedora.redhat.com>
Message-ID: <20050202161007.5ed90b2b.fedora@wir-sind-cool.org>
On Wed, 2 Feb 2005 09:07:48 -0500, Matthias Saou (thias) wrote:
> Author: thias
>
> Update of /cvs/extras/rpms/opencdk/devel
> In directory cvs.fedora.redhat.com:/tmp/cvs-serv705
>
> Modified Files:
> opencdk.spec
> Log Message:
> Fix release, drop epoch and separators that can be nasty sometimes.
Hmm, all of these still have 0.fdr prefix on purpose, because they were
failed rebuilds for FC2/FC3 and not updated since then. See
http://fedoraproject.org/wiki/Extras/FC3Status
Except uqm-content which is a very large data package and would be
an unnecessary upgrade for users. It can be shared between FC3 and
older.
From fedora at wir-sind-cool.org Wed Feb 2 16:27:29 2005
From: fedora at wir-sind-cool.org (Michael Schwendt)
Date: Wed, 2 Feb 2005 17:27:29 +0100
Subject: rpms/opencdk/devel opencdk.spec,1.2,1.3
In-Reply-To: <20050202170258.7d626f76@python2>
References: <200502021407.j12E7mq3000711@cvs.fedora.redhat.com>
<20050202161007.5ed90b2b.fedora@wir-sind-cool.org>
<20050202161723.23245781@python2>
<20050202163524.13808d5a.fedora@wir-sind-cool.org>
<20050202170258.7d626f76@python2>
Message-ID: <20050202172729.172cf6e4.fedora@wir-sind-cool.org>
On Wed, 2 Feb 2005 17:02:58 +0100, Matthias Saou wrote:
> > 'uqm-content'
> > (release not touched, so common package is shared for all dists)
>
> Hmmm, for me, this one should not escape the renaming just for that reason,
> especially since there have been no FC3 packages from fedora.us, Fedora
> Extras should IMHO introduce only new clean packages (not to mention that
> two different released builds should never share the same N-E-V-R since
> there are no guarantees that they will be identical, especially when coming
> from two different build systems), and eventually keep it as-is from there
> on for future Core releases as you want to do now.
Raw data packages (e.g. containing 100 MiB of .ogg music files) will be
identical, provided that there are no important changes in RPM. Whether
and when to bump the release was also a decision as when Ville would
update uqm anyway.
> > The other packages with 0.fdr.1.1 (or so) were last built for FC1 and
> need
> > investigation and are tracked since FC2Status page, when they failed to
> > build for FC2. The FC3Status page contains a copy of the old FC2Status
> > page.
>
> So the proper fix would be to remove them from the built pre-Extras, then?
> And either remove their devel branch or "blacklist" them so that they don't
> get rebuilt until someone actually decides to fix them up...
Disabling build in %prep (e.g. as done in openbox) would work.
From ville.skytta at iki.fi Wed Feb 2 16:39:08 2005
From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=)
Date: Wed, 02 Feb 2005 18:39:08 +0200
Subject: uqm-content (was: Re: rpms/opencdk/devel opencdk.spec,1.2,1.3)
In-Reply-To: <20050202170258.7d626f76@python2>
References: <200502021407.j12E7mq3000711@cvs.fedora.redhat.com>
<20050202161007.5ed90b2b.fedora@wir-sind-cool.org>
<20050202161723.23245781@python2>
<20050202163524.13808d5a.fedora@wir-sind-cool.org>
<20050202170258.7d626f76@python2>
Message-ID: <1107362349.21089.27.camel@bobcat.mine.nu>
On Wed, 2005-02-02 at 17:02 +0100, Matthias Saou wrote:
> Michael Schwendt wrote :
>
> > 'uqm-content'
> > (release not touched, so common package is shared for all dists)
>
> Hmmm, for me, this one should not escape the renaming just for that reason,
> especially since there have been no FC3 packages from fedora.us, Fedora
> Extras should IMHO introduce only new clean packages (not to mention that
> two different released builds should never share the same N-E-V-R since
> there are no guarantees that they will be identical, especially when coming
> from two different build systems), and eventually keep it as-is from there
> on for future Core releases as you want to do now.
I tend to agree in general, but it's not entrely black and white, this
is a special case. If you look into the specfile, it is nothing more
than copying 3 big zipfiles into place. That cannot cause much
differences in the results no matter where it's built. One could also
argue that this package should not exist in the first place... (but IIRC
in the first release, it was a bit more than just copying the zips, and
things may change again in the future).
But it's not that big a deal. We still have the option not to build a
new one from CVS for Real-Extras (or drop the package) if that's what's
considered best. I don't have strong opinions here; perhaps leaning
slightly towards what you suggest above though. And if there will be a
new build just for the no-op fdr+0epoch changes, I'll gladly reassign
all possibly forthcoming, related bug reports to you because my opinion
is not strong enough here so I'd committed this change myself ;)
From ville.skytta at iki.fi Wed Feb 2 16:47:36 2005
From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=)
Date: Wed, 02 Feb 2005 18:47:36 +0200
Subject: rpms/opencdk/devel opencdk.spec,1.2,1.3
In-Reply-To: <20050202172729.172cf6e4.fedora@wir-sind-cool.org>
References: <200502021407.j12E7mq3000711@cvs.fedora.redhat.com>
<20050202161007.5ed90b2b.fedora@wir-sind-cool.org>
<20050202161723.23245781@python2>
<20050202163524.13808d5a.fedora@wir-sind-cool.org>
<20050202170258.7d626f76@python2>
<20050202172729.172cf6e4.fedora@wir-sind-cool.org>
Message-ID: <1107362856.21089.36.camel@bobcat.mine.nu>
On Wed, 2005-02-02 at 17:27 +0100, Michael Schwendt wrote:
> Disabling build in %prep (e.g. as done in openbox) would work.
Or "ExclusiveArch: NONE" to save a few buildsys CPU cycles if someone
cares. I'm sure people will find many funny replacements for NONE that
aren't valid archs...
From fedora-extras-commits at redhat.com Wed Feb 2 17:18:28 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Feb 2005 12:18:28 -0500
Subject: rpms/newpg/devel newpg.spec, 1.5, NONE sources, 1.2, NONE Makefile,
1.2, NONE
Message-ID: <200502021718.j12HISwT003360@cvs.fedora.redhat.com>
Author: mschwendt
Update of /cvs/extras/rpms/newpg/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv3354
Removed Files:
newpg.spec sources Makefile
Log Message:
Obsolete with gnupg2.
--- newpg.spec DELETED ---
--- sources DELETED ---
--- Makefile DELETED ---
From fedora-extras-commits at redhat.com Wed Feb 2 17:20:22 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Feb 2005 12:20:22 -0500
Subject: rpms/gnupg2/devel gnupg-1.9.15.tar.bz2.sig, NONE, 1.1 gnupg2.spec,
1.1, 1.2 sources, 1.2, 1.3 gnupg-1.9.14.tar.bz2.sig, 1.1,
NONE gnupg-1.9.4-gpg-error.patch, 1.1, NONE
Message-ID: <200502021720.j12HKMaW003406@cvs.fedora.redhat.com>
Author: mschwendt
Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv3400
Modified Files:
gnupg2.spec sources
Added Files:
gnupg-1.9.15.tar.bz2.sig
Removed Files:
gnupg-1.9.14.tar.bz2.sig gnupg-1.9.4-gpg-error.patch
Log Message:
Merge post-1.9.14-0.fdr.1 changes from Rex.
--- NEW FILE gnupg-1.9.15.tar.bz2.sig ---
??
Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnupg2.spec 1 Feb 2005 22:40:35 -0000 1.1
+++ gnupg2.spec 2 Feb 2005 17:20:20 -0000 1.2
@@ -3,17 +3,15 @@
Summary: GNU utility for secure communication and data storage
Name: gnupg2
Epoch: 0
-Version: 1.9.14
+Version: 1.9.15
Release: 1%{?dist_tag}
License: GPL
Group: Applications/System
-Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-1.9.14.tar.bz2
-Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-1.9.14.tar.bz2.sig
+Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2
+Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2.sig
URL: http://www.gnupg.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Patch1: gnupg-1.9.4-gpg-error.patch
-
Obsoletes: newpg < 0:0.9.5
Requires(post): /sbin/install-info
@@ -26,18 +24,22 @@
%define pie 1
%endif
-BuildRequires: openldap-devel, zlib-devel, gettext
BuildRequires: libgcrypt-devel => 0:1.2.0
-BuildRequires: libgpg-error-devel => 0:0.7
+BuildRequires: libgpg-error-devel => 1.0
+Requires: libgpg-error >= 1.0
BuildRequires: libassuan-devel >= 0.6.9
BuildRequires: libksba-devel >= 0:0.9.7
# to build without opensc support: --without opensc
%{!?_without_opensc:BuildRequires: opensc-devel >= 0.9}
+%{!?_without_opensc:BuildRequires: pcsc-lite-devel }
%{?_without_opensc:BuildConflicts: opensc-devel }
+BuildRequires: gettext
+BuildRequires: openldap-devel
BuildRequires: libusb-devel
BuildRequires: pth-devel
-BuildRequires: zlib-devel, bzip2-devel
+BuildRequires: zlib-devel
+BuildRequires: bzip2-devel
Buildrequires: libusb-devel
BuildRequires: docbook-utils
@@ -62,8 +64,6 @@
%prep
%setup -q -n gnupg-%{version}
-%patch1 -p1 -b .gpg-error
-
%build
@@ -75,6 +75,7 @@
--disable-rpath
make %{?_smp_mflags}
+
make check
@@ -123,9 +124,15 @@
%changelog
-* Tue Feb 1 2005 Michael Schwendt - 0:1.9.14-1
+* Tue Feb 1 2005 Michael Schwendt - 0:1.9.15-1
- Make install-info in scriptlets less noisy.
+* Tue Jan 18 2005 Rex Dieter 1.9.15-0.fdr.1
+- 1.9.15
+
+* Fri Jan 07 2005 Rex Dieter 1.9.14-0.fdr.2
+- note patch/hack to build against older ( <1.0) libgpg-error-devel
+
* Thu Jan 06 2005 Rex Dieter 1.9.14-0.fdr.1
- 1.9.14
- enable opensc support
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 1 Feb 2005 22:40:35 -0000 1.2
+++ sources 2 Feb 2005 17:20:20 -0000 1.3
@@ -1 +1 @@
-fd121b7d368cf27928bfa4ef4e4cc982 gnupg-1.9.14.tar.bz2
+7b1d0562b66b1853b77d511feb786629 gnupg-1.9.15.tar.bz2
--- gnupg-1.9.14.tar.bz2.sig DELETED ---
--- gnupg-1.9.4-gpg-error.patch DELETED ---
From fedora-extras-commits at redhat.com Wed Feb 2 20:51:25 2005
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Wed, 2 Feb 2005 15:51:25 -0500
Subject: devel/prozilla .cvsignore, 1.2, 1.3 prozilla.spec, 1.5, 1.6 sources,
1.2, 1.3
Message-ID: <200502022051.j12KpPqU006070@cvs.fedora.redhat.com>
Author: anvil
Update of /cvs/extras/devel/prozilla
In directory cvs.fedora.redhat.com:/tmp/cvs-serv6064
Modified Files:
.cvsignore prozilla.spec sources
Log Message:
prozilla: updated to version 1.3.7.3 version - security issue
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/prozilla/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 05:13:08 -0000 1.2
+++ .cvsignore 2 Feb 2005 20:51:23 -0000 1.3
@@ -1 +1,2 @@
prozilla-1.3.6.tar.gz
+prozilla-1.3.7.3.tar.gz
Index: prozilla.spec
===================================================================
RCS file: /cvs/extras/devel/prozilla/prozilla.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- prozilla.spec 10 Dec 2004 22:03:09 -0000 1.5
+++ prozilla.spec 2 Feb 2005 20:51:23 -0000 1.6
@@ -1,50 +1,45 @@
Summary: An advanced Linux download manager
Name: prozilla
-Version: 1.3.6
+Version: 1.3.7.3
Release: 1
Epoch: 0
-Copyright: GNU/GPL
+Copyright: GPL
Group: Applications/Internet
Source0: http://prozilla.genesys.ro/downloads/prozilla/tarballs/%{name}-%{version}.tar.gz
-URL: http://www.lintux.cx/~kalum/prozilla.html
+URL: http://prozilla.genesys.ro/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: gcc ncurses-devel
+BuildRequires: ncurses-devel
+
-#---------------------------------------------------------------------
%description
-ProZilla is a download accellerator program written for
-Linux to speed up the normal file download process. It often
-gives speed increases of around 200% to 300%. It supports
-both FTP and HTTP protocols, and the theory behind it is
-very simple. The program opens multiple connections to a
-server, and each of the connections downloads a part of the
-file, thus defeating existing internet congestion prevention
-methods which slow down a single connection based download.
+ProZilla is a download accellerator program written for Linux to speed
+up the normal file download process. It often gives speed increases of
+around 200% to 300%. It supports both FTP and HTTP protocols, and the
+theory behind it is very simple.
+
+The program opens multiple connections to a server, and each of the
+connections downloads a part of the file, thus defeating existing
+internet congestion prevention methods which slow down a single
+connection based download.
-ProZilla also supports file download resuming, and ftpsearch
-for fastest ping times.
+ProZilla also supports file download resuming, and ftpsearch for
+fastest ping times.
-#---------------------------------------------------------------------
%prep
-rm -rf %{buildroot}
-%setup -n %{name}-%{version}
+%setup -q
%configure
-#---------------------------------------------------------------------
%build
make %{?_smp_mflags}
-mkdir %{buildroot}
-mkdir %{buildroot}/etc
-#---------------------------------------------------------------------
%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
%makeinstall
-#---------------------------------------------------------------------
%clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
-#---------------------------------------------------------------------
%files
%defattr(-,root,root,-)
%doc ANNOUNCE AUTHORS ChangeLog COPYING CREDITS FAQ INSTALL NEWS README TODO
@@ -53,8 +48,11 @@
%{_prefix}/bin/proz
%{_mandir}/man1/proz*
-#---------------------------------------------------------------------
%changelog
+* Wed Feb 2 2005 Dams - 0:1.3.7.3-1
+- Updated to 1.3.7.3
+- Misc cleanups
+
* Tue Apr 1 2003 Dams 0:1.3.6-0.fdr.1
- Modified Spec according to fedora template/guidelines.
- Added BuildRequires tag.
Index: sources
===================================================================
RCS file: /cvs/extras/devel/prozilla/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 05:13:08 -0000 1.2
+++ sources 2 Feb 2005 20:51:23 -0000 1.3
@@ -1 +1 @@
-65864dfe72f5cb7d7e595ca6f34fc7d7 prozilla-1.3.6.tar.gz
+88f0d9d88aa7628239dae08804dcd550 prozilla-1.3.7.3.tar.gz
From fedora-extras-commits at redhat.com Wed Feb 2 21:37:58 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 2 Feb 2005 16:37:58 -0500
Subject: rpms/dhcp-forwarder/devel sources, 1.2, 1.3 dhcp-forwarder.spec, 1.4,
1.5
Message-ID: <200502022137.j12LbwA3007213@cvs.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/rpms/dhcp-forwarder/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv7207/devel
Modified Files:
sources dhcp-forwarder.spec
Log Message:
* Thu Nov 11 2004 Enrico Scholz - 0:0.7-0.fdr.1
- fedora'ized it
* Thu Aug 19 2004 Enrico Scholz - 0:0.6.1-0
- added support for 'fedora-usermgmt' (enabled with '--with fedora' switch)
* Thu Jun 17 2004 Enrico Scholz - 0:0.6.1-0
- conditionalized build of -minit subpackage
* Thu Aug 7 2003 Enrico Scholz 0:0.5.1-0
- added minit support
- removed superfluous %%doc attribute of %%_mandir entries
- removed superfluous curlies
- use 'install-contrib' and cleaned up %%install section
- moved /etc/sysconfig/* file into -sysv subpackage; it is not used by
-minit anymore
- minor cleanups
* Wed Jul 30 2003 Enrico Scholz 0:0.5-0.fdr.1
- updated to version 0.5
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dhcp-forwarder/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 04:13:44 -0000 1.2
+++ sources 2 Feb 2005 21:37:56 -0000 1.3
@@ -1 +1,2 @@
-bd8a9f616f9dad444c7449eda6b23baa dhcp-forwarder-0.4.tar.bz2
+e7f876e615ebc3f96418f6477b4451e2 dhcp-forwarder-0.7.tar.bz2
+590a4d8b227aaf125bba8258ca915677 dhcp-forwarder-0.7.tar.bz2.asc
Index: dhcp-forwarder.spec
===================================================================
RCS file: /cvs/extras/rpms/dhcp-forwarder/devel/dhcp-forwarder.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dhcp-forwarder.spec 8 Nov 2004 04:15:20 -0000 1.4
+++ dhcp-forwarder.spec 2 Feb 2005 21:37:56 -0000 1.5
@@ -1,25 +1,70 @@
## $Id$ --*- rpm-spec -*--
+## This package understands the following switches:
+## --without dietlibc ... disable usage of dietlibc
+## --without minit ... disable creation of 'minit' subpackage
+## --with fedora ... enable fedora.us specific parts
+
+%define _with_fedora 1
+%define _without_minit 1
+
+
+%define uid 11
+%define useradd /usr/sbin/%{?_with_fedora:fedora-}useradd %{?_with_fedora:%uid}
+%define groupadd /usr/sbin/%{?_with_fedora:fedora-}groupadd %{?_with_fedora:%uid}
+%define userdel /usr/sbin/%{?_with_fedora:fedora-}userdel
+%define groupdel /usr/sbin/%{?_with_fedora:fedora-}groupdel
+
+
%define username dhcp-fwd
-%define homedir %{_var}/lib/%{username}
+%define homedir %_var/lib/%username
+%define minitdir %_sysconfdir/minit
+%define minitsvcdir %minitdir/services/dhcp-fwd
+%define service dhcp-fwd
+
+%{!?release_func:%define release_func() %1}
Summary: A DHCP relay agent
Name: dhcp-forwarder
-Version: 0.4
-Release: 0.fdr.2.2
+Version: 0.7
+Release: %release_func 1
Epoch: 0
License: GPL
Group: System Environment/Daemons
URL: http://www.tu-chemnitz.de/~ensc/dhcp-fwd
-Source0: http://www.tu-chemnitz.de/~ensc/dhcp-fwd/files/%{name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires(pre): /usr/sbin/useradd /usr/sbin/groupadd
-Requires(postun): /usr/sbin/userdel /usr/sbin/groupdel
-Requires(post,preun): /sbin/chkconfig
+Source0: http://www.tu-chemnitz.de/~ensc/dhcp-fwd/files/%name-%version.tar.bz2
+Source1: http://www.tu-chemnitz.de/~ensc/dhcp-fwd/files/%name-%version.tar.bz2.asc
+BuildRoot: %_tmppath/%name-%version-%release-root
+Requires: init(dhcp-forwarder)
+
+%{!?_without_dietlibc:BuildRequires: dietlibc}
+
+## The Requires(...) which depend on the '--with fedora' switch
+%{!?_with_fedora:Requires(pre): /usr/sbin/useradd /usr/sbin/groupadd}
+%{!?_with_fedora:Requires(postun): /usr/sbin/userdel /usr/sbin/groupdel}
+%{?_with_fedora:Requires(pre): fedora-usermgmt}
+%{?_with_fedora:Requires(postun): fedora-usermgmt}
+
+
+%package sysv
+Summary: SysV initscripts for dhcp-forwarder
+Group: System Environment/Base
+Provides: init(dhcp-forwarder) = sysv
+Requires: %name = %epoch:%version-%release
+Requires(preun): %name initscripts
+Requires(postun): %name initscripts
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+
+
+%package minit
+Summary: minit initscripts for dhcp-forwarder
+Group: System Environment/Base
+Provides: init(dhcp-forwarder) = minit
+Requires: %name = %epoch:%version-%release
+Requires(pre): minit-setup
+Requires(postun): minit-setup
-%if %{?_without_dietlibc:0}%{!?_without_dietlibc:1}
-BuildRequires: dietlibc
-%endif
%description
@@ -34,26 +79,60 @@
* Has a small memory footprint when using dietlibc
+%description sysv
+dhcp-fwd forwards DHCP messages between subnets with different sublayer
+broadcast domains.
+
+This package provides the scripts which can be used to start dhcp-forwarder
+with the SysV initconcept.
+
+
+%description minit
+dhcp-fwd forwards DHCP messages between subnets with different sublayer
+broadcast domains.
+
+This package provides the scripts which can be used to start dhcp-forwarder
+with the minit initconcept.
+
+
+##---------------------------------------------
+
+
%prep
%setup -q
+##---------------------------------------------
+
+
%build
-%configure --enable-release %{?_without_dietlibc:--disable-dietlibc}
-%{__make} %{?_smp_mflags}
-%{__make} check
+%configure \
+ --enable-release \
+ --with-initrddir=%_initrddir \
+ %{?_without_dietlibc:--disable-dietlibc}
+%__make %{?_smp_mflags}
+
+
+##---------------------------------------------
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} DESTDIR=${RPM_BUILD_ROOT} install
+%__make DESTDIR=$RPM_BUILD_ROOT install install-contrib
+%__install -d -m700 $RPM_BUILD_ROOT%homedir
+
+%{?_without_minit:rm -rf $RPM_BUILD_ROOT%minitsvcdir}
+
+
+##---------------------------------------------
-%{__install} -d ${RPM_BUILD_ROOT}{%{_sysconfdir}/sysconfig,%{_initrddir}}
-%{__install} -p -m755 contrib/dhcp-fwd.init ${RPM_BUILD_ROOT}%{_initrddir}/dhcp-fwd
-%{__install} -p -m644 contrib/dhcp-fwd.sysconfig ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/dhcp-fwd
-%{__install} -p -m644 contrib/dhcp-fwd.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/
-%{__install} -d -m700 ${RPM_BUILD_ROOT}%{homedir}
+
+%check
+%__make check
+
+
+##---------------------------------------------
%clean
@@ -61,44 +140,84 @@
%pre
-/usr/sbin/groupadd -r %{username} &>/dev/null || :
-/usr/sbin/useradd -r -s /sbin/nologin -M -c 'DHCP Forwarder user' \
- -d %{homedir} -g %{username} %{username} &>/dev/null || :
+%groupadd -r %username &>/dev/null || :
+%useradd -r -s /sbin/nologin -M -c 'DHCP Forwarder user' \
+ -d %homedir -g %username %username &>/dev/null || :
-%post
-/sbin/chkconfig --add dhcp-fwd
-%preun
+%postun
if test "$1" = "0"; then
- %{_initrddir}/dhcp-fwd stop >/dev/null
- /sbin/chkconfig --del dhcp-fwd
+ %userdel %username &>/dev/null || :
+ %groupdel %username &>/dev/null || :
fi
-%postun
+
+%post sysv
+/sbin/chkconfig --add %service
+
+%preun sysv
if test "$1" = "0"; then
- /usr/sbin/userdel %{username} &>/dev/null || :
- /usr/sbin/groupdel %{username} &>/dev/null || :
-elif test "$1" -ge 1; then
- %{_initrddir}/dhcp-fwd condrestart >/dev/null
+ %_initrddir/%service stop >/dev/null
+ /sbin/chkconfig --del %service
fi
+%postun sysv
+test "$1" = 0 || %_initrddir/%service condrestart &>/dev/null
+
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README THANKS
-%doc %{_mandir}/*/*
-%config %{_initrddir}/*
-%config(noreplace) %{_sysconfdir}/sysconfig/*
-%config(noreplace) %{_sysconfdir}/dhcp-fwd.conf
-%{_sbindir}/*
+%_mandir/*/*
+%config(noreplace) %_sysconfdir/dhcp-fwd.conf
+%_sbindir/*
## *DO NOT* add %defattr(-,dhcp-fwd,dhcp-fwd); the homedir is used for
## the chroot() only and there is no reason why the setuid()'ed daemon
## needs any kind of access there
-%{homedir}
+%homedir
+
+
+%files sysv
+%defattr(-,root,root,-)
+%config %_initrddir/*
+%config(noreplace) %_sysconfdir/sysconfig/*
+
+
+%if 0%{!?_without_minit:1}
+
+%files minit
+%defattr(-,root,root,-)
+%dir %minitsvcdir
+%minitsvcdir/run
+%minitsvcdir/respawn
+%config(noreplace) %minitsvcdir/params
+
+%endif
%changelog
+* Thu Nov 11 2004 Enrico Scholz - 0:0.7-0.fdr.1
+- fedora'ized it
+
+* Thu Aug 19 2004 Enrico Scholz - 0:0.6.1-0
+- added support for 'fedora-usermgmt' (enabled with '--with fedora' switch)
+
+* Thu Jun 17 2004 Enrico Scholz - 0:0.6.1-0
+- conditionalized build of -minit subpackage
+
+* Thu Aug 7 2003 Enrico Scholz 0:0.5.1-0
+- added minit support
+- removed superfluous %%doc attribute of %%_mandir entries
+- removed superfluous curlies
+- use 'install-contrib' and cleaned up %%install section
+- moved /etc/sysconfig/* file into -sysv subpackage; it is not used by
+ -minit anymore
+- minor cleanups
+
+* Wed Jul 30 2003 Enrico Scholz 0:0.5-0.fdr.1
+- updated to version 0.5
+
* Tue May 27 2003 Enrico Scholz 0:0.4-0.fdr.2
- create and remove group explicitely
- s/adduser/useradd/
@@ -106,7 +225,7 @@
the %%post/%%preun scriptlets directly
- do not call '--install-contrib' anymore; it creates too much
clutter to make sure that the initscripts will be installed into
- %%{_initrddir} but not in /etc/init.d. Instead of, install the
+ %%_initrddir but not in /etc/init.d. Instead of, install the
scripts manually.
* Fri May 2 2003 Enrico Scholz 0:0.4-0.fdr.1
@@ -127,7 +246,7 @@
- Enhanced %postun script
* Mon Jun 17 2002 Enrico Scholz 0.2-2
-- Described purpose of the %%{homedir} and its handling
+- Described purpose of the %%homedir and its handling
* Fri Jun 14 2002 Enrico Scholz 0.2-1
- Added manpage
From fedora-extras-commits at redhat.com Wed Feb 2 21:58:44 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 2 Feb 2005 16:58:44 -0500
Subject: rpms/dhcp-forwarder/devel .cvsignore,1.2,1.3
Message-ID: <200502022158.j12LwiVw007328@cvs.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/rpms/dhcp-forwarder/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv7321
Modified Files:
.cvsignore
Log Message:
generalized tarball specification
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dhcp-forwarder/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 04:13:44 -0000 1.2
+++ .cvsignore 2 Feb 2005 21:58:42 -0000 1.3
@@ -1 +1 @@
-dhcp-forwarder-0.4.tar.bz2
+dhcp-forwarder-*.tar.bz2*
From fedora-extras-commits at redhat.com Wed Feb 2 22:29:29 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 2 Feb 2005 17:29:29 -0500
Subject: rpms/ip-sentinel - New directory
Message-ID: <200502022229.j12MTTTU008451@cvs.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/rpms/ip-sentinel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv8444/ip-sentinel
Log Message:
Directory /cvs/extras/rpms/ip-sentinel added to the repository
From fedora-extras-commits at redhat.com Wed Feb 2 22:29:29 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 2 Feb 2005 17:29:29 -0500
Subject: rpms/ip-sentinel/devel - New directory
Message-ID: <200502022229.j12MTTLT008454@cvs.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/rpms/ip-sentinel/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv8444/ip-sentinel/devel
Log Message:
Directory /cvs/extras/rpms/ip-sentinel/devel added to the repository
From fedora-extras-commits at redhat.com Wed Feb 2 22:29:45 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 2 Feb 2005 17:29:45 -0500
Subject: rpms/ip-sentinel Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200502022229.j12MTj9O008522@cvs.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/rpms/ip-sentinel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv8513
Added Files:
Makefile import.log
Log Message:
Setup of module ip-sentinel
--- NEW FILE Makefile ---
# Top level Makefile for module ip-sentinel
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like 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 Feb 2 22:29:45 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 2 Feb 2005 17:29:45 -0500
Subject: rpms/ip-sentinel/devel .cvsignore, NONE, 1.1 Makefile, NONE,
1.1 sources, NONE, 1.1
Message-ID: <200502022229.j12MTjv5008525@cvs.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/rpms/ip-sentinel/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv8513/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module ip-sentinel
--- NEW FILE .cvsignore ---
***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'
--- NEW FILE sources ---
From fedora-extras-commits at redhat.com Wed Feb 2 22:42:42 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 2 Feb 2005 17:42:42 -0500
Subject: rpms/ip-sentinel/devel ip-sentinel.spec,NONE,1.1
Message-ID: <200502022242.j12Mgg30008663@cvs.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/rpms/ip-sentinel/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv8657
Added Files:
ip-sentinel.spec
Log Message:
initial checkin
--- NEW FILE ip-sentinel.spec ---
## $id: ip-sentinel.spec.in,v 1.3 2003/05/26 21:53:02 ensc Exp $ --*- rpm-spec -*--
# Copyright (C) 2004 Enrico Scholz
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
## This package understands the following switches:
## --without dietlibc ... disable usage of dietlibc
## --without minit ... disable creation of 'minit' subpackage
## --with fedora ... enable fedora.us specific parts
## --define username\ name ... set the name of the user running the daemon
%{!?_with_minit:%define _without_minit --without minit}
%define uid 1
%define useradd /usr/sbin/%{?_with_fedora:fedora-}useradd %{?_with_fedora:%uid }
%define groupadd /usr/sbin/%{?_with_fedora:fedora-}groupadd %{?_with_fedora:%uid}
%define userdel /usr/sbin/%{?_with_fedora:fedora-}userdel
%define groupdel /usr/sbin/%{?_with_fedora:fedora-}groupdel
%{!?username:%define username ip-sentinel}
%define service ip-sentinel
%define homedir %_var/lib/ip-sentinel
%define minitdir %_sysconfdir/minit
%define minitsvcdir %minitdir/services/%name
%{!?release_func:%define release_func() %1}
Summary: A tool to prevent unauthorized usage of IPs
Name: ip-sentinel
Version: 0.11
Release: %release_func 1
Epoch: 0
License: GPL
Group: System Environment/Daemons
URL: http://www.tu-chemnitz.de/~ensc/ip-sentinel
Source0: http://www.tu-chemnitz.de/~ensc/ip-sentinel/files/%name-%version.tar.bz2
Source1: http://www.tu-chemnitz.de/~ensc/ip-sentinel/files/%name-%version.tar.bz2.asc
BuildRoot: %_tmppath/%name-%version-%release-buildroot
Requires: init(ip-sentinel)
%{!?_without_dietlibc:BuildRequires: dietlibc}
## The Requires(...) which depend on the '--with fedora' switch
%{!?_with_fedora:Requires(pre): /usr/sbin/useradd /usr/sbin/groupadd}
%{!?_with_fedora:Requires(postun): /usr/sbin/userdel /usr/sbin/groupdel}
%{?_with_fedora:Requires(pre): fedora-usermgmt}
%{?_with_fedora:Requires(postun): fedora-usermgmt}
%package sysv
Summary: SysV initscripts for ip-sentinel
Group: System Environment/Base
Provides: init(ip-sentinel)
Requires(preun): %name = %epoch:%version-%release
Requires(postun): %name = %epoch:%version-%release
Requires(preun): initscripts
Requires(postun): initscripts
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
%package minit
Summary: minit initscripts for ip-sentinel
Group: System Environment/Base
Provides: init(ip-sentinel)
Requires: %name = %epoch:%version-%release
Requires(pre): minit-setup
Requires(postun): minit-setup
%description
IP Sentinel is a tool that tries to prevent unauthorized usage of
IP addresses within an ethernet broadcast domain by answering ARP
requests. After receiving faked replies, requesting parties store
the MAC in their ARP tables and will send future packets to this
invalid MAC, rendering the IP unreachable.
%description sysv
IP Sentinel is a tool that tries to prevent unauthorized usage of IP
addresses.
This package provides the scripts which can be used to start ip-sentinel
with a SysV initconcept.
%description minit
IP Sentinel is a tool that tries to prevent unauthorized usage of IP
addresses.
This package provides the scripts which can be used to start ip-sentinel
with the minit initconcept.
##---------------------------------------------
%prep
%setup -q
##---------------------------------------------
%build
%configure --enable-release \
--with-initrddir=%{_initrddir} \
--with-username=%username %{?_without_dietlibc:--disable-dietlibc}
%__make %{?_smp_mflags} all
##---------------------------------------------
%install
rm -rf $RPM_BUILD_ROOT
%__make DESTDIR=$RPM_BUILD_ROOT install install-contrib
%__install -m750 -d $RPM_BUILD_ROOT%homedir
%{?_without_minit:rm -rf $RPM_BUILD_ROOT%minitsvcdir}
##---------------------------------------------
%check
%__make check
##---------------------------------------------
%clean
rm -rf $RPM_BUILD_ROOT
##---------------------------------------------
%pre
%groupadd -r %username &>/dev/null || :
%useradd -r -s /sbin/nologin -M -d %homedir \
-c 'IP sentinel user' -g %username %username &>/dev/null || :
%postun
if test "$1" = "0"; then
%userdel %username &>/dev/null || :
%groupdel %username &>/dev/null || :
fi
%post sysv
/sbin/chkconfig --add %service
%preun sysv
if test "$1" = "0"; then
%_initrddir/%service stop >/dev/null
/sbin/chkconfig --del %service
fi
%postun sysv
test "$1" = 0 || %_initrddir/%service condrestart &>/dev/null
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README THANKS
%_mandir/*/*
%_sbindir/*
%attr(-,root,%username) %homedir
%files sysv
%defattr(-,root,root,-)
%config %_initrddir/*
%config(noreplace) %_sysconfdir/sysconfig/*
%if 0%{!?_without_minit:1}
%files minit
%defattr(-,root,root,-)
%dir %minitsvcdir
%minitsvcdir/run
%minitsvcdir/respawn
%config(noreplace) %minitsvcdir/params
%endif
%changelog
* Thu Aug 19 2004 Enrico Scholz - 0:0.10.2-0
- added support for 'fedora-usermgmt' (enabled with '--with fedora' switch)
* Thu Jun 17 2004 Enrico Scholz - 0:0.10.1-0
- conditionalized building of -minit subpackage
* Wed Jun 16 2004 Enrico Scholz - 0:0.9.2-0
- updated minit filelist
- moved /etc/sysconfig/* files into -sysv subpackage; they are not
used for 'minit' anymore
* Sat Mar 20 2004 Enrico Scholz - 0:0.9-0
- workaround https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=118773
* Thu Dec 4 2003 Enrico Scholz - 0:0.8-0
- use 'install-contrib'
* Tue Sep 9 2003 Enrico Scholz 0:0.7-1
- removed more unneeded curlies
* Tue Aug 5 2003 Enrico Scholz 0:0.6-1
- version 0.6
- added minit support
- removed unneeded curlies
* Thu Jul 17 2003 Enrico Scholz 0:0.5-2
- removed %%doc attribute from %%mandir-entries
* Thu Jul 10 2003 Enrico Scholz 0:0.5-1
- moved 'make check' into the %%check section
* Sat May 24 2003 Enrico Scholz 0:0.4-1
- removed dependencies on /sbin/service
- removed packager tag
- create and remove group explicitely
* Wed May 21 2003 Enrico Scholz 0:0.3-1
- applied fedora.us naming scheme
- cleanups
* Fri Nov 15 2002 Enrico Scholz 0.1-1
- initial build
From fedora-extras-commits at redhat.com Wed Feb 2 23:11:07 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 2 Feb 2005 18:11:07 -0500
Subject: devel/util-vserver - New directory
Message-ID: <200502022311.j12NB7hI009561@cvs.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/devel/util-vserver
In directory cvs.fedora.redhat.com:/tmp/cvs-serv9556/util-vserver
Log Message:
Directory /cvs/extras/devel/util-vserver added to the repository
From fedora-extras-commits at redhat.com Wed Feb 2 23:17:06 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 2 Feb 2005 18:17:06 -0500
Subject: devel/util-vserver/devel - New directory
Message-ID: <200502022317.j12NH68o009620@cvs.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/devel/util-vserver/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv9615/devel
Log Message:
Directory /cvs/extras/devel/util-vserver/devel added to the repository
From fedora-extras-commits at redhat.com Wed Feb 2 23:19:12 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 2 Feb 2005 18:19:12 -0500
Subject: devel/util-vserver/devel util-vserver.spec, NONE, 1.1 Makefile, NONE,
1.1 .cvsignore, NONE, 1.1
Message-ID: <200502022319.j12NJC4G009705@cvs.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/devel/util-vserver/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv9694/util-vserver/devel
Added Files:
util-vserver.spec Makefile .cvsignore
Log Message:
initial checkin
***** Error reading new file: [Errno 2] No such file or directory: 'util-vserver.spec'
***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'
--- NEW FILE .cvsignore ---
util-vserver*.tar.bz2*
From fedora-extras-commits at redhat.com Wed Feb 2 23:19:12 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 2 Feb 2005 18:19:12 -0500
Subject: devel/util-vserver Makefile,NONE,1.1
Message-ID: <200502022319.j12NJCXn009708@cvs.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/devel/util-vserver
In directory cvs.fedora.redhat.com:/tmp/cvs-serv9694/util-vserver
Added Files:
Makefile
Log Message:
initial checkin
--- NEW FILE Makefile ---
# Top level Makefile for module util-vserver
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like a CVS checkout" && exit 1
clean :
@find . -type f -name *~ -exec rm -fv {} \;
From fedora-extras-commits at redhat.com Wed Feb 2 23:21:18 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 2 Feb 2005 18:21:18 -0500
Subject: rpms/ip-sentinel/devel sources,1.1,1.2 .cvsignore,1.1,1.2
Message-ID: <200502022321.j12NLIZP009801@cvs.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/rpms/ip-sentinel/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv9795/ip-sentinel/devel
Modified Files:
sources .cvsignore
Log Message:
updated for version 0.11
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ip-sentinel/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 2 Feb 2005 22:29:43 -0000 1.1
+++ sources 2 Feb 2005 23:21:16 -0000 1.2
@@ -0,0 +1,2 @@
+4cf7988f8e7eff68c535dec50ba79ba3 ip-sentinel-0.11.tar.bz2
+f8e4e911ec72bc28ba3c09bd39456b39 ip-sentinel-0.11.tar.bz2.asc
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ip-sentinel/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 2 Feb 2005 22:29:43 -0000 1.1
+++ .cvsignore 2 Feb 2005 23:21:16 -0000 1.2
@@ -0,0 +1 @@
+ip-sentinel*.tar.bz2*
From fedora-extras-commits at redhat.com Wed Feb 2 23:23:10 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Feb 2005 18:23:10 -0500
Subject: rpms/opensc - New directory
Message-ID: <200502022323.j12NNAn8009948@cvs.fedora.redhat.com>
Author: scop
Update of /cvs/extras/rpms/opensc
In directory cvs.fedora.redhat.com:/tmp/cvs-serv9941/opensc
Log Message:
Directory /cvs/extras/rpms/opensc added to the repository
From fedora-extras-commits at redhat.com Wed Feb 2 23:23:10 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Feb 2005 18:23:10 -0500
Subject: rpms/opensc/devel - New directory
Message-ID: <200502022323.j12NNAVL009951@cvs.fedora.redhat.com>
Author: scop
Update of /cvs/extras/rpms/opensc/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv9941/opensc/devel
Log Message:
Directory /cvs/extras/rpms/opensc/devel added to the repository
From fedora-extras-commits at redhat.com Wed Feb 2 23:23:29 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Feb 2005 18:23:29 -0500
Subject: rpms/opensc Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200502022323.j12NNTR8010012@cvs.fedora.redhat.com>
Author: scop
Update of /cvs/extras/rpms/opensc
In directory cvs.fedora.redhat.com:/tmp/cvs-serv10003
Added Files:
Makefile import.log
Log Message:
Setup of module opensc
--- NEW FILE Makefile ---
# Top level Makefile for module opensc
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like 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 Feb 2 23:23:29 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Feb 2005 18:23:29 -0500
Subject: rpms/opensc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
NONE, 1.1
Message-ID: <200502022323.j12NNTT3010015@cvs.fedora.redhat.com>
Author: scop
Update of /cvs/extras/rpms/opensc/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv10003/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module opensc
--- NEW FILE .cvsignore ---
***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'
--- NEW FILE sources ---
From fedora-extras-commits at redhat.com Wed Feb 2 23:25:16 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Feb 2005 18:25:16 -0500
Subject: rpms/opensc import.log,1.1,1.2
Message-ID: <200502022325.j12NPGni010132@cvs.fedora.redhat.com>
Author: scop
Update of /cvs/extras/rpms/opensc
In directory cvs.fedora.redhat.com:/tmp/cvs-serv10123
Modified Files:
import.log
Log Message:
auto-import opensc-0.9.4-1 on branch devel from opensc-0.9.4-1.src.rpm
Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/opensc/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log 2 Feb 2005 23:23:27 -0000 1.1
+++ import.log 2 Feb 2005 23:25:14 -0000 1.2
@@ -0,0 +1 @@
+opensc-0_9_4-1:HEAD:opensc-0.9.4-1.src.rpm:1107386707
From fedora-extras-commits at redhat.com Wed Feb 2 23:25:16 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Feb 2005 18:25:16 -0500
Subject: rpms/opensc/devel opensc-build.patch, NONE, 1.1 opensc.spec, NONE,
1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200502022325.j12NPGkl010136@cvs.fedora.redhat.com>
Author: scop
Update of /cvs/extras/rpms/opensc/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv10123/devel
Modified Files:
.cvsignore sources
Added Files:
opensc-build.patch opensc.spec
Log Message:
auto-import opensc-0.9.4-1 on branch devel from opensc-0.9.4-1.src.rpm
opensc-build.patch:
--- NEW FILE opensc-build.patch ---
Index: configure.in
===================================================================
RCS file: /pub/cvsroot/opensc/configure.in,v
retrieving revision 1.133
diff -a -u -r1.133 configure.in
--- configure.in 5 Aug 2004 22:27:11 -0000 1.133
+++ configure.in 3 Nov 2004 17:04:38 -0000
@@ -241,7 +241,7 @@
AC_SUBST(ENGINE_LINK)
AC_CACHE_CHECK([for OpenSSL directory], ac_cv_openssldir, [
if test "x$tryssldir" = "x" ; then
- tryssldir="$trycommandir /usr/ /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl"
+ tryssldir="$trycommondir /usr /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl"
fi
for ssldir in $tryssldir ; do
@@ -316,11 +316,11 @@
}
],
[
- AC_MSG_RESULT("good, 0.9.7d or later")
+ AC_MSG_RESULT([good, 0.9.7d or later])
GOOD_OPENSSL=yes
],
[
- AC_MSG_RESULT("not so good, 0.9.7d or later woudl be better")
+ AC_MSG_RESULT([not so good, 0.9.7d or later would be better])
GOOD_OPENSSL=no
]
)
@@ -406,11 +406,13 @@
if test "x$SSL_MSG" = "xyes" ; then
AC_DEFINE(HAVE_OPENSSL, 1, [Have OpenSSL libraries])
- LDFLAGS="-L$ac_cv_openssldir/lib $LDFLAGS"
- if test ! -z "$need_dash_r" ; then
+ if test "x$ac_cv_openssldir" != "x/usr"; then
+ LDFLAGS="-L$ac_cv_openssldir/lib $LDFLAGS"
+ if test ! -z "$need_dash_r" ; then
LDFLAGS="-R$ac_cv_openssldir/lib $LDFLAGS"
+ fi
+ CPPFLAGS="-I$ac_cv_openssldir/include $saved_CPPFLAGS"
fi
- CPPFLAGS="-I$ac_cv_openssldir/include $saved_CPPFLAGS"
else
LIBCRYPTO=""
LIBCRYPTOA=""
Index: src/libopensc/Makefile.am
===================================================================
RCS file: /pub/cvsroot/opensc/src/libopensc/Makefile.am,v
retrieving revision 1.79
diff -a -u -r1.79 Makefile.am
--- src/libopensc/Makefile.am 27 Oct 2004 06:41:27 -0000 1.79
+++ src/libopensc/Makefile.am 3 Nov 2004 17:04:39 -0000
@@ -7,7 +7,7 @@
EXTRA_DIST = Makefile.mak libopensc.pc.in
INCLUDES = @CPPFLAGS@ @OPENCT_CFLAGS@ @PCSC_CFLAGS@
-LDFLAGS = @LDFLAGS@ @OPENCT_LDFLAGS@
+AM_LDFLAGS = @OPENCT_LDFLAGS@
bin_SCRIPTS = opensc-config
Index: src/openscd/Makefile.am
===================================================================
RCS file: /pub/cvsroot/opensc/src/openscd/Makefile.am,v
retrieving revision 1.9
diff -a -u -r1.9 Makefile.am
--- src/openscd/Makefile.am 30 Jul 2003 09:50:17 -0000 1.9
+++ src/openscd/Makefile.am 3 Nov 2004 17:04:39 -0000
@@ -5,7 +5,7 @@
EXTRA_DIST = test.c
INCLUDES = @CPPFLAGS@ @CFLAGS_ASSUAN@
-LDFLAGS = @LDFLAGS@ @LIBOPENSC@
+AM_LDFLAGS = @LIBOPENSC@
if HAVE_ASSUAN
noinst_PROGRAMS = openscd
Index: src/pam/Makefile.am
===================================================================
RCS file: /pub/cvsroot/opensc/src/pam/Makefile.am,v
retrieving revision 1.31
diff -a -u -r1.31 Makefile.am
--- src/pam/Makefile.am 22 Dec 2003 22:07:02 -0000 1.31
+++ src/pam/Makefile.am 3 Nov 2004 17:04:39 -0000
@@ -6,7 +6,7 @@
INCLUDES = @CPPFLAGS@ -I${top_srcdir}/src/scam
-LDFLAGS = @LDFLAGS@ ${top_builddir}/src/scam/libscam.la
+AM_LDFLAGS = ${top_builddir}/src/scam/libscam.la
if HAVE_PAM
lib_LTLIBRARIES = pam_opensc.la
Index: src/pkcs15init/Makefile.am
===================================================================
RCS file: /pub/cvsroot/opensc/src/pkcs15init/Makefile.am,v
retrieving revision 1.29
diff -a -u -r1.29 Makefile.am
--- src/pkcs15init/Makefile.am 16 Jun 2004 20:59:59 -0000 1.29
+++ src/pkcs15init/Makefile.am 3 Nov 2004 17:04:40 -0000
@@ -4,8 +4,8 @@
MAINTAINERCLEANFILES = Makefile.in
-CFLAGS = @CFLAGS@ -DSC_PKCS15_PROFILE_DIRECTORY=\"$(pkgdatadir)\"
-LDFLAGS = @LDFLAGS@ @LIBOPENSC@
+AM_CFLAGS = -DSC_PKCS15_PROFILE_DIRECTORY=\"$(pkgdatadir)\"
+AM_LDFLAGS = @LIBOPENSC@
PROFILES = \
cyberflex.profile \
Index: src/sia/Makefile.am
===================================================================
RCS file: /pub/cvsroot/opensc/src/sia/Makefile.am,v
retrieving revision 1.13
diff -a -u -r1.13 Makefile.am
--- src/sia/Makefile.am 30 Jul 2003 09:50:17 -0000 1.13
+++ src/sia/Makefile.am 3 Nov 2004 17:04:40 -0000
@@ -6,7 +6,7 @@
INCLUDES = @CPPFLAGS@ -I${top_srcdir}/src/scam
-LDFLAGS = @LDFLAGS@ @LIBDL@ ${top_builddir}/src/scam/libscam.la
+AM_LDFLAGS = @LIBDL@ ${top_builddir}/src/scam/libscam.la
SRC = sia_opensc.c sia_support.c sia_support.h
Index: src/tests/Makefile.am
===================================================================
RCS file: /pub/cvsroot/opensc/src/tests/Makefile.am,v
retrieving revision 1.19
diff -a -u -r1.19 Makefile.am
--- src/tests/Makefile.am 30 Jul 2003 09:50:18 -0000 1.19
+++ src/tests/Makefile.am 3 Nov 2004 17:04:40 -0000
@@ -6,7 +6,7 @@
EXTRA_DIST = Makefile.mak
-LDFLAGS = @LDFLAGS@ @LIBOPENSC@
+AM_LDFLAGS = @LIBOPENSC@
noinst_PROGRAMS = base64 lottery p15dump pintest prngtest
Index: src/tools/Makefile.am
===================================================================
RCS file: /pub/cvsroot/opensc/src/tools/Makefile.am,v
retrieving revision 1.35
diff -a -u -r1.35 Makefile.am
--- src/tools/Makefile.am 21 Jul 2004 22:02:37 -0000 1.35
+++ src/tools/Makefile.am 3 Nov 2004 17:04:41 -0000
@@ -4,7 +4,7 @@
EXTRA_DIST = Makefile.mak
-LDFLAGS = @LDFLAGS@ @LIBOPENSC@
+AM_LDFLAGS = @LIBOPENSC@
if HAVE_SSL
PROGRAMS_SSL = cryptoflex-tool pkcs15-init
--- NEW FILE opensc.spec ---
# There's something in the opensc static libs that strip(1) invoked in the
# end of %%install doesn't grok. Hence, disabled for now.
%define disable_static 1
%define plugindir %{_libdir}/mozilla/plugins
Name: opensc
Version: 0.9.4
Release: 1
Summary: OpenSC SmartCard library and applications
Group: System Environment/Libraries
License: LGPL
URL: http://www.opensc.org/
Source0: http://www.opensc.org/files/opensc-0.9.4.tar.gz
Patch0: %{name}-build.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pcsc-lite-devel >= 1.1.1 flex pam-devel openldap-devel
BuildRequires: readline-devel libtermcap-devel openct-devel
BuildRequires: openssl-devel >= 0.9.7a libassuan-devel XFree86-devel
# libtool (+ pulled in automake and autoconf) for patch0
BuildRequires: libtool
Requires: openct
%description
OpenSC is a package for for accessing SmartCard devices. Basic
functionality (e.g. SELECT FILE, READ BINARY) should work on any ISO
7816-4 compatible SmartCard. Encryption and decryption using private
keys on the SmartCard is possible with PKCS #15 compatible cards, such
as the FINEID (Finnish Electronic IDentity) card. Swedish Posten eID
cards have also been confirmed to work.
%package -n mozilla-opensc-signer
Summary: Digital signature plugin for web browsers
Group: Applications/Internet
Requires: %{plugindir} pinentry
%description -n mozilla-opensc-signer
OpenSC Signer is a plugin for web browsers compatible with Mozilla
plugins that will generate digital signatures using facilities on
PKI-capable smartcards.
%package pam
Summary: OpenSC pluggable authentication module
Group: System Environment/Base
Provides: pam_opensc = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description pam
OpenSC pluggable authentication module implementing smart card support.
%package devel
Summary: OpenSC development files
Group: Development/Libraries
Requires: %{name} = %{version}-%{release} pkgconfig
Requires: %{name}-pam = %{version}-%{release}
%description devel
OpenSC development files.
%prep
%setup -q
%patch0 -p0
cp -p src/pkcs15init/README ./README.pkcs15init
cp -p src/scconf/README.scconf .
for file in docs/*.1 ; do
iconv -f iso-8859-1 -t utf-8 $file > $file.utf-8 ; mv $file.utf-8 $file
done
sh ./bootstrap # for patch0
%build
%configure --disable-dependency-tracking \
%if %{disable_static}
--disable-static \
%endif
--with-plugin-path=%{plugindir} \
--with-pin-entry=%{_bindir}/pinentry
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT _docs
make install DESTDIR=$RPM_BUILD_ROOT
# Fixup pam module location.
install -dm 755 $RPM_BUILD_ROOT/%{_lib}/security
mv $RPM_BUILD_ROOT%{_libdir}/security/pam_opensc.so \
$RPM_BUILD_ROOT/%{_lib}/security/pam_opensc.so
rm -rf $RPM_BUILD_ROOT%{_libdir}/security
# Installing config examples as doc later.
install -dm 755 _docs/openssh
mv $RPM_BUILD_ROOT%{_datadir}/opensc/*.conf.example _docs
install -pm 644 src/openssh/README src/openssh/ask-for-pin.diff _docs/openssh
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%post pam -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%postun pam -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc ANNOUNCE AUTHORS ChangeLog COPYING NEWS QUICKSTART README.*
%doc docs/*.html docs/*.css _docs/*.conf.example
%{_bindir}/cardos-info
%{_bindir}/cryptoflex-tool
%{_bindir}/opensc-explorer
%{_bindir}/opensc-tool
%{_bindir}/pkcs11-tool
%{_bindir}/pkcs15-crypt
%{_bindir}/pkcs15-init
%{_bindir}/pkcs15-tool
%{_libdir}/libopensc.so.*
%{_libdir}/libpkcs15init.so.*
%{_libdir}/libscconf.so.*
%{_libdir}/libscldap.so.*
%dir %{_libdir}/opensc
%{!?_with_oldssl:%{_libdir}/opensc/engine_*.so}
%dir %{_libdir}/pkcs11
%{_libdir}/pkcs11/opensc-pkcs11.so
%{_libdir}/pkcs11/lib*.so.*
%{_datadir}/opensc
%{_mandir}/man1/cardos-info.*
%{_mandir}/man1/cryptoflex-tool.*
%{_mandir}/man1/opensc-explorer.*
%{_mandir}/man1/opensc-tool.*
%{_mandir}/man1/pkcs11-tool.*
%{_mandir}/man1/pkcs15-crypt.*
%{_mandir}/man1/pkcs15-init.*
%{_mandir}/man1/pkcs15-tool.*
%{_mandir}/man[57]/*.[57]*
%files -n mozilla-opensc-signer
%defattr(0755,root,root,0755)
%{plugindir}/opensc-signer.so
%{_libdir}/opensc/opensc-signer.so
%files pam
%defattr(-,root,root,-)
%doc PAM_README
/%{_lib}/security/pam_opensc.so
%{_libdir}/libscam.so.*
%files devel
%defattr(-,root,root,-)
%doc CodingStyle _docs/openssh
%{_bindir}/opensc-config
%{_includedir}/opensc
%exclude %{_libdir}/*.la
%{_libdir}/libopensc.so
%{_libdir}/libpkcs15init.so
%{_libdir}/libscam.so
%{_libdir}/libscconf.so
%{_libdir}/libscldap.so
%exclude %{_libdir}/opensc/*.la
%{_libdir}/pkcs11/pkcs11-spy.so
%{_libdir}/pkcs11/lib*.so
%exclude %{_libdir}/pkcs11/*.la
%{_libdir}/pkgconfig/libopensc.pc
%{_mandir}/man1/opensc-config.1*
%{_mandir}/man3/*.3*
%if !%{disable_static}
%{_libdir}/*.a
%{_libdir}/opensc/*.a
%{_libdir}/pkcs11/lib*.a
%endif
%changelog
* Thu Feb 3 2005 Ville Skytt?? - 0.9.4-1
- Drop unnecessary Epochs, pre-FC1 compat cruft, and no longer relevant
--with(out) rpmbuild options.
- Exclude *.la.
* Wed Nov 3 2004 Ville Skytt?? - 0:0.9.4-0.fdr.1
- Update to 0.9.4, parallel build patch applied upstream.
- Patch to fix library paths and LDFLAGS.
- Don't require mozilla, but the plugin dir in signer.
- Build with dependency tracking disabled.
* Tue Jul 27 2004 Ville Skytt?? - 0:0.9.2-0.fdr.2
- Building the signer plugin can be disabled with "--without signer".
Thanks to Fritz Elfert for the idea.
- Update description.
* Sun Jul 25 2004 Ville Skytt?? - 0:0.9.2-0.fdr.1
- Update to 0.9.2, old patches applied upstream.
- Add patch to fix parallel builds.
- Convert man pages to UTF-8.
* Thu Jul 22 2004 Ville Skytt?? - 0:0.9.1-0.fdr.1
- Update to 0.9.1 (preview).
* Thu Jul 1 2004 Ville Skytt?? - 0:0.9.0-0.fdr.0.1.alpha
- Update to 0.9.0-alpha.
* Sat May 1 2004 Ville Skytt?? - 0:0.8.1-0.fdr.8
- Rebuild with libassuan 0.6.5.
* Sat Jan 31 2004 Ville Skytt?? - 0:0.8.1-0.fdr.7
- Rebuild with libassuan 0.6.3.
- Add gdm example to PAM quickstart.
* Mon Jan 19 2004 Ville Skytt?? - 0:0.8.1-0.fdr.6
- Use /%%{_lib} instead of hardcoding /lib.
* Sat Dec 20 2003 Ville Skytt?? - 0:0.8.1-0.fdr.5
- Split PAM support into a subpackage.
- Rebuild with libassuan 0.6.2.
* Sun Nov 23 2003 Ville Skytt?? - 0:0.8.1-0.fdr.4
- Rebuild with libassuan 0.6.1.
- Include PAM quickstart doc snippet.
* Fri Nov 14 2003 Ville Skytt?? - 0:0.8.1-0.fdr.3
- Require OpenCT.
* Fri Oct 17 2003 Ville Skytt?? - 0:0.8.1-0.fdr.2
- Install example config files as documentation.
* Tue Oct 14 2003 Ville Skytt?? - 0:0.8.1-0.fdr.1
- Update to 0.8.1.
* Wed Aug 27 2003 Ville Skytt?? - 0:0.8.0-0.fdr.2
- Signer can be built with oldssl too.
* Wed Aug 27 2003 Ville Skytt?? - 0:0.8.0-0.fdr.1
- Update to 0.8.0.
* Wed Jul 30 2003 Ville Skytt?? - 0:0.8.0-0.fdr.0.2.cvs20030730
- Update to 20030730.
- Clean up %%docs.
- Include *.la (uses ltdl).
- Own the %%{_libdir}/pkcs11 directory.
- Disable signer; assuan has disappeared from the tarball :(
* Fri May 23 2003 Ville Skytt?? - 0:0.8.0-0.fdr.0.1.rc1
- First build.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 2 Feb 2005 23:23:27 -0000 1.1
+++ .cvsignore 2 Feb 2005 23:25:14 -0000 1.2
@@ -0,0 +1 @@
+opensc-0.9.4.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 2 Feb 2005 23:23:27 -0000 1.1
+++ sources 2 Feb 2005 23:25:14 -0000 1.2
@@ -0,0 +1 @@
+76c18fc9bd9fad9c45396ea81f317551 opensc-0.9.4.tar.gz
From fedora-extras-commits at redhat.com Thu Feb 3 00:30:35 2005
From: fedora-extras-commits at redhat.com (cristian gafton testing (gctest))
Date: Wed, 2 Feb 2005 19:30:35 -0500
Subject: common cvs-import.sh,1.4,1.5
Message-ID: <200502030030.j130UZjE011745@cvs.fedora.redhat.com>
Author: gctest
Update of /cvs/extras/common
In directory cvs.fedora.redhat.com:/tmp/cvs-serv11739
Modified Files:
cvs-import.sh
Log Message:
test commit
Index: cvs-import.sh
===================================================================
RCS file: /cvs/extras/common/cvs-import.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cvs-import.sh 18 Jan 2005 19:30:05 -0000 1.4
+++ cvs-import.sh 3 Feb 2005 00:30:33 -0000 1.5
@@ -1,6 +1,7 @@
#!/bin/bash
#
# Import a given src.rpm on a given branch
+#
# $Id$
# Initial setup
From fedora-extras-commits at redhat.com Thu Feb 3 00:39:35 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 2 Feb 2005 19:39:35 -0500
Subject: rpms/util-vserver - New directory
Message-ID: <200502030039.j130dZ29012053@cvs.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/rpms/util-vserver
In directory cvs.fedora.redhat.com:/tmp/cvs-serv12046/util-vserver
Log Message:
Directory /cvs/extras/rpms/util-vserver added to the repository
From fedora-extras-commits at redhat.com Thu Feb 3 00:39:35 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 2 Feb 2005 19:39:35 -0500
Subject: rpms/util-vserver/devel - New directory
Message-ID: <200502030039.j130dZN7012056@cvs.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/rpms/util-vserver/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv12046/util-vserver/devel
Log Message:
Directory /cvs/extras/rpms/util-vserver/devel added to the repository
From fedora-extras-commits at redhat.com Thu Feb 3 00:39:51 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 2 Feb 2005 19:39:51 -0500
Subject: rpms/util-vserver/devel .cvsignore, NONE, 1.1 Makefile, NONE,
1.1 sources, NONE, 1.1
Message-ID: <200502030039.j130dpDU012118@cvs.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/rpms/util-vserver/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv12106/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module util-vserver
--- NEW FILE .cvsignore ---
***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'
--- NEW FILE sources ---
From fedora-extras-commits at redhat.com Thu Feb 3 00:39:51 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 2 Feb 2005 19:39:51 -0500
Subject: rpms/util-vserver Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200502030039.j130dprr012115@cvs.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/rpms/util-vserver
In directory cvs.fedora.redhat.com:/tmp/cvs-serv12106
Added Files:
Makefile import.log
Log Message:
Setup of module util-vserver
--- NEW FILE Makefile ---
# Top level Makefile for module util-vserver
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like a CVS checkout" && exit 1
clean :
@find . -type f -name *~ -exec rm -fv {} \;
--- NEW FILE import.log ---
From fedora-extras-commits at redhat.com Thu Feb 3 00:40:21 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 2 Feb 2005 19:40:21 -0500
Subject: rpms/util-vserver import.log,1.1,1.2
Message-ID: <200502030040.j130eLgG012211@cvs.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/rpms/util-vserver
In directory cvs.fedora.redhat.com:/tmp/cvs-serv12202
Modified Files:
import.log
Log Message:
auto-import util-vserver-0.30.203-0 on branch devel from util-vserver-0.30.203-0.src.rpm
Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log 3 Feb 2005 00:39:49 -0000 1.1
+++ import.log 3 Feb 2005 00:40:19 -0000 1.2
@@ -0,0 +1 @@
+util-vserver-0_30_203-0:HEAD:util-vserver-0.30.203-0.src.rpm:1107391214
From fedora-extras-commits at redhat.com Thu Feb 3 00:40:21 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 2 Feb 2005 19:40:21 -0500
Subject: rpms/util-vserver/devel util-vserver.spec, NONE, 1.1 .cvsignore, 1.1,
1.2 sources, 1.1, 1.2
Message-ID: <200502030040.j130eL9N012215@cvs.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/rpms/util-vserver/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv12202/devel
Modified Files:
.cvsignore sources
Added Files:
util-vserver.spec
Log Message:
auto-import util-vserver-0.30.203-0 on branch devel from util-vserver-0.30.203-0.src.rpm
--- NEW FILE util-vserver.spec ---
# $Id: util-vserver.spec.in,v 1.39 2005/01/31 17:43:31 ensc Exp $
## This package understands the following switches:
## --without dietlibc ... disable usage of dietlibc
## --without xalan ... do not require/use the xalan xslt processor
%define confdir %_sysconfdir/vservers
%define confdefaultdir %confdir/.defaults
%define pkglibdir %_libdir/%name
%define __chattr /usr/bin/chattr
%define chkconfig /sbin/chkconfig
%define _localstatedir %_var
Summary: Linux virtual server utilities
Name: util-vserver
Version: 0.30.203
Release: 0
Epoch: 0
License: GPL
Group: System Environment/Base
URL: http://savannah.nongnu.org/projects/util-vserver/
Source0: http://savannah.nongnu.org/download/util-vserver/stable.pkg/%version/%name-%version.tar.bz2
BuildRoot: %_tmppath/%name-%version-%release-root
Requires: init(%name)
Requires: %name-core = %epoch:%version-%release
Requires: %name-lib = %epoch:%version-%release
Requires: diffutils mktemp sed
Provides: vserver = %epoch:%version-%release
Obsoletes: vserver < %epoch:%version
BuildRequires: mount vconfig gawk iproute iptables
BuildRequires: gcc-c++ wget
BuildRequires: e2fsprogs-devel
BuildRequires: doxygen tetex-latex
Requires(post): %__chattr
Requires(pre): %pkglibdir
Requires(postun): %pkglibdir
%{!?_without_dietlibc:BuildRequires: dietlibc >= 0:0.24}
%{!?_without_xalan:BuildRequires: xalan-j}
%package lib
Summary: Dynamic libraries for util-vserver
Group: System Environment/Libraries
%package core
Summary: The core-utilities for util-vserver
Group: Applications/System
Requires: util-linux
%package build
Summary: Tools which can be used to build vservers
Group: Applications/System
Requires: rpm apt wget binutils tar e2fsprogs
Requires: %name = %epoch:%version-%release
Requires(pre): %confdir
Requires(postun): %confdir
%package sysv
Summary: SysV-initscripts for vserver
Group: System Environment/Base
Provides: init(%name) = sysv
Requires: make diffutils
Requires: initscripts
Requires: %name = %epoch:%version-%release
Requires(post): %chkconfig
Requires(preun): %chkconfig
Requires(pre): %_initrddir %pkglibdir
requires(postun): %_initrddir %pkglibdir
%package legacy
Summary: Legacy utilities for util-vserver
Group: Applications/System
Requires: %name = %epoch:%version-%release
Requires(post): %chkconfig
Requires(preun): %chkconfig
Requires(pre): %_initrddir %pkglibdir
requires(postun): %_initrddir %pkglibdir
%package devel
Summary: Header-files and libraries which are needed to develop vserver based applications
Group: Development/Libraries
Requires: pkgconfig
%description
This package provides the components and a framework to setup virtual
servers. A virtual server runs inside a linux server. It is nevertheless
highly independent. As such, you can run various services with normal
configuration. The various vservers can't interact with each other and
can't interact with services in the main server.
This requires a special kernel supporting the new new_s_context and
set_ipv4root system call.
%description lib
%description core
%description build
%description sysv
%description legacy
%description devel
%prep
%setup -q
%build
%configure --with-initrddir=%_initrddir --enable-release \
%{?_without_dietlibc:--disable-dietlibc}
%__make %{?_smp_mflags} all
%__make %{?_smp_mflags} doc
%install
rm -rf $RPM_BUILD_ROOT
%__make DESTDIR="$RPM_BUILD_ROOT" install install-distribution
rm -f $RPM_BUILD_ROOT/%_libdir/*.la
MANIFEST_CONFIG='%config' \
MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \
contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat
%check || :
%__make check
%clean
rm -rf $RPM_BUILD_ROOT
%post
test -d /vservers || mkdir -m0000 /vservers
test -d /vservers/.pkg || mkdir -m0755 /vservers/.pkg
f="%confdefaultdir/vdirbase"; test -L "$f" -o -e "$f" || ln -s /vservers "$f"
f="%confdefaultdir/run.rev"; test -L "$f" -o -e "$f" || ln -s %_localstatedir/run/vservers.rev "$f"
%_sbindir/setattr --barrier /vservers || :
%post lib -p /sbin/ldconfig
%postun lib -p /sbin/ldconfig
%post sysv
%chkconfig --add vservers-default
%chkconfig --add vprocunhide
%preun sysv
test "$1" != 0 || %_initrddir/vprocunhide stop &>/dev/null || :
test "$1" != 0 || %chkconfig --del vprocunhide
test "$1" != 0 || %chkconfig --del vservers-default
%postun sysv
test "$1" = 0 || %_initrddir/vprocunhide condrestart >/dev/null || :
## Temporary workaround to remove old v_* files; it will conflict
## somehow with the -legacy package but can be fixed by reinstalling
## this package.
## TODO: remove me in the final .spec file
%define v_services httpd named portmap sendmail smb sshd xinetd gated
%triggerun sysv -- util-vserver-sysv < 0.30.198
for i in %v_services; do
%chkconfig --del v_$i || :
done
%post legacy
%chkconfig --add rebootmgr
%chkconfig --add vservers-legacy
for i in %v_services; do
%chkconfig --add v_$i
done
%preun legacy
test "$1" != 0 || %_initrddir/rebootmgr stop &>/dev/null || :
test "$1" != 0 || for i in %v_services; do
%chkconfig --del v_$i
done
test "$1" != 0 || %chkconfig --del rebootmgr
test "$1" != 0 || %chkconfig --del vservers-legacy
%postun legacy
test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || :
%files -f %name-base.list
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README THANKS
%doc doc/*.html doc/*.css
/sbin/vshelper
%dir %confdir
%dir %confdefaultdir
%dir %confdefaultdir/apps
%dir %confdefaultdir/files
%dir %pkglibdir/defaults
%ghost %confdefaultdir/vdirbase
%ghost %confdefaultdir/run.rev
%dir %_localstatedir/run/vservers
%dir %_localstatedir/run/vservers.rev
%dir %_localstatedir/run/vshelper
%files lib -f %name-lib.list
%files sysv -f %name-sysv.list
%files core -f %name-core.list
%defattr(-,root,root,-)
%dir %pkglibdir
%files build -f %name-build.list
%defattr(-,root,root,-)
%dir %confdir/.distributions
%dir %confdir/.distributions/*
%dir %confdir/.distributions/*/apt
%files legacy -f %name-legacy.list
%defattr(-,root,root,-)
%dir %pkglibdir/legacy
%files devel -f %name-devel.list
%defattr(-,root,root,-)
%doc lib/apidoc/latex/refman.pdf
%doc lib/apidoc/html
%changelog
* Wed Jan 26 2005 Enrico Scholz - 0:0.30.198-0.3
- updated BuildRequires:
- use 'setattr --barrier' instead of 'chattr +t' in the %post scriptlet
- moved the v_* initscripts to legacy
- do not ship the /vservers directory itself; as it is immutable, the
extraction will fail else
* Thu Sep 9 2004 Enrico Scholz - 0:0.30.194-0
- documented switches for 'rpmbuild'
* Wed May 26 2004 Enrico Scholz - 0:0.29.215-0
- (re)added the MANIFEST_* variables which were lost some time ago;
this will preserve %%config files...
* Mon Mar 15 2004 Enrico Scholz - 0:0.29.202-0
- use file-list for sysv scripts also
* Sat Mar 6 2004 Enrico Scholz - 0:0.29.198-0
- added vprocunhide-service support
- added doxygen support
- updated Requires:
* Wed Oct 1 2003 Enrico Scholz - 0:0.23.5-0
- Initial build.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 3 Feb 2005 00:39:49 -0000 1.1
+++ .cvsignore 3 Feb 2005 00:40:19 -0000 1.2
@@ -0,0 +1 @@
+util-vserver-0.30.203.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 3 Feb 2005 00:39:49 -0000 1.1
+++ sources 3 Feb 2005 00:40:19 -0000 1.2
@@ -0,0 +1 @@
+205bed0babe0f64ce9073c5c15a3b8bb util-vserver-0.30.203.tar.bz2
From fedora-extras-commits at redhat.com Thu Feb 3 00:53:07 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 2 Feb 2005 19:53:07 -0500
Subject: rpms/util-vserver/devel .cvsignore,1.2,1.3
Message-ID: <200502030053.j130r7KQ012336@cvs.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/rpms/util-vserver/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv12330/devel
Modified Files:
.cvsignore
Log Message:
updated
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 3 Feb 2005 00:40:19 -0000 1.2
+++ .cvsignore 3 Feb 2005 00:53:05 -0000 1.3
@@ -1 +1 @@
-util-vserver-0.30.203.tar.bz2
+util-vserver*.tar.bz2*
From fedora-extras-commits at redhat.com Thu Feb 3 00:53:35 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 2 Feb 2005 19:53:35 -0500
Subject: rpms/util-vserver/devel util-vserver.spec,1.1,1.2
Message-ID: <200502030053.j130rZ9u012365@cvs.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/rpms/util-vserver/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv12359/devel
Modified Files:
util-vserver.spec
Log Message:
added the *.asc signature
use %release_func
Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/util-vserver.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- util-vserver.spec 3 Feb 2005 00:40:19 -0000 1.1
+++ util-vserver.spec 3 Feb 2005 00:53:33 -0000 1.2
@@ -4,6 +4,11 @@
## --without dietlibc ... disable usage of dietlibc
## --without xalan ... do not require/use the xalan xslt processor
+## Fedora Extras specific customization below...
+%{!?release_func:%define release_func() %1}
+##
+
+
%define confdir %_sysconfdir/vservers
%define confdefaultdir %confdir/.defaults
%define pkglibdir %_libdir/%name
@@ -15,12 +20,13 @@
Summary: Linux virtual server utilities
Name: util-vserver
Version: 0.30.203
-Release: 0
+Release: %release_func 1
Epoch: 0
License: GPL
Group: System Environment/Base
URL: http://savannah.nongnu.org/projects/util-vserver/
Source0: http://savannah.nongnu.org/download/util-vserver/stable.pkg/%version/%name-%version.tar.bz2
+Source1: http://savannah.nongnu.org/download/util-vserver/stable.pkg/%version/%name-%version.tar.bz2.asc
BuildRoot: %_tmppath/%name-%version-%release-root
Requires: init(%name)
Requires: %name-core = %epoch:%version-%release
From fedora-extras-commits at redhat.com Thu Feb 3 00:54:39 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 2 Feb 2005 19:54:39 -0500
Subject: rpms/util-vserver/devel sources,1.2,1.3
Message-ID: <200502030054.j130sd78012412@cvs.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/rpms/util-vserver/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv12406
Modified Files:
sources
Log Message:
added the *.asc signature
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 3 Feb 2005 00:40:19 -0000 1.2
+++ sources 3 Feb 2005 00:54:37 -0000 1.3
@@ -1 +1,2 @@
205bed0babe0f64ce9073c5c15a3b8bb util-vserver-0.30.203.tar.bz2
+1d8e15b81d7cc3d845851ce53c4ff433 util-vserver-0.30.203.tar.bz2.asc
From fedora-extras-commits at redhat.com Thu Feb 3 08:40:46 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Thu, 3 Feb 2005 03:40:46 -0500
Subject: rpms/clamav/devel clamd-gen, NONE, 1.1 clamav-0.80-initoff.patch,
NONE, 1.1 sources, 1.2, 1.3 clamd.SERVICE.init, 1.1,
1.2 clamd-README, 1.1, 1.2 clamav.spec, 1.5, 1.6 .cvsignore,
1.2, 1.3 clamav-0.71.tar.gz.sig, 1.1,
NONE clamav-0.70-initoff.patch, 1.1, NONE
Message-ID: <200502030840.j138ekrV025351@cvs.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/rpms/clamav/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv25345
Modified Files:
sources clamd.SERVICE.init clamd-README clamav.spec .cvsignore
Added Files:
clamd-gen clamav-0.80-initoff.patch
Removed Files:
clamav-0.71.tar.gz.sig clamav-0.70-initoff.patch
Log Message:
* Fri Jan 28 2005 Enrico Scholz - 0:0.81-0.fdr.2
- build the package with '--disable-zlib-vcheck' because RH is unable to
apply a fix for a 5 month old and solved security issue. Please fill
your comments at https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385
- added 'BuildRequires: bc' (should work without also, but ./configure
gives out ugly warnings else)
* Fri Jan 28 2005 Enrico Scholz - 0:0.81-0.fdr.1
- updated to 0.81
- do not ship the 'clamd.milter' daemon anymore; clamav-milter supports
an internal mode now which is enabled by default
- updated -milter %%description
* Thu Jan 20 2005 Enrico Scholz - 0:0.80-0.fdr.2
- s!cron.d/clamav!cron.d/clamav-update! in the %%description of the -update
subpackage (https://bugzilla.fedora.us/show_bug.cgi?id=1715#c39)
* Wed Nov 3 2004 Enrico Scholz - 0:0.80-0.fdr.1
- updated to 0.80
- removed DMS, FreeBSD-HOWTO and localized docs as it is not shipped anymore
- buildrequire 'curl-devel'
- renamed clamav.conf to clamd.conf (upstream change)
- updated -initoff patch
* Tue Sep 14 2004 Enrico Scholz - 0:0.75.1-0.fdr.1
- updated to 0.75.1
- use %%configure, the problems with the architecture specification
seem to have passed (probably because of an autoconf update)
- set mode 0600 for the cron-script (required by vixie-cron)
- made the cronjob a spambot and send mail about deactivated freshclam
service to nearly everybody... (root, postmaster, webmaster)
- other fixes in the notification cronjob
* Fri Jul 23 2004 Enrico Scholz - 0:0.75-0.fdr.1
- updated to 0.75
* Thu Jul 15 2004 Enrico Scholz - 0:0.74-0.fdr.2
- moved /usr/bin/clamav-config from main into -devel
* Wed Jun 30 2004 Enrico Scholz - 0:0.74-0.fdr.1
- updated to 0.74
* Mon Jun 14 2004 Enrico Scholz - 0:0.73-0.fdr.1
- updated to 0.73
- added pkgconfig file
* Fri Jun 11 2004 Enrico Scholz - 0:0.72-0.fdr.3
- notify the user about a deactivated clamav-update service
- added clamd-gen script which generates template spec-files for
services using clamd
- copied template configuration files to %pkgdatadir/template (needed
for clamd-gen)
- moved the clamd-wrapper from %_initrddir to %{pkgdatadir}; a symlink
will be provided for compatibility reasons
- conditionalized building of the -milter subpackage ('--without
milter' switch) to enable builds on RH73 (bug #1715, comment #5/#7)
* Fri Jun 4 2004 Enrico Scholz - 0:0.72-0.fdr.2
- removed 'BuildRequires: dietlibc'; it was a leftover from the
pre-use-signal era (before 0.70) (bug #1716)
* Thu Jun 3 2004 Enrico Scholz - 0:0.72-0.fdr.1
- updated to 0.72
--- NEW FILE clamd-gen ---
#! /bin/bash
# Copyright (C) 2004 Enrico Scholz
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
function showHelp()
{
echo \
$"Usage: clamd-gen --service= --version= --release=
--license= --username=>USERNAME>
"
exit 0
}
function rpm.generatePreamble()
{
cat < sysv
Requires(post): %name = %epoch:%version-%release
Requires(post): diffutils mktemp %__chkconfig
Requires(preun): %__chkconfig
Requires(pre): %_initrddir
Requires(postun): %_initrddir
%package minit
Summary: minit initscripts for a %service clamav-server
Group: System Environment/Daemons
Provides: init(%name) = minit
Conflicts: init(%name) < minit
Conflicts: init(%name) > minit
Requires(post): %name = %epoch:%version-%release
Requires(post): diffutils mktemp
Requires(pre): minit-setup
Requires(postun): minit-setup
Requires(triggers): minit-tools
%description
Basic setup for a clamav server for '%service'.
%description sysv
Basic setup for a clamav server for '%service'.
This package contains initscripts for SysV based systems.
%description minit
Basic setup for a clamav server for '%service'.
This package contains initscripts for minit based systems.
EOF
}
function rpm.genBody()
{
cat <<"XEOFX"
%prep
%build
%install
rm -rf $RPM_BUILD_ROOT
%__install -d -m755 $RPM_BUILD_ROOT{%minitsvcdir,%_sbindir,%rundir,/var/log}
d=/usr/share/clamav/template
function subst
{
src=$d/$1
dst=$RPM_BUILD_ROOT$2
%__install -d -m755 $(dirname "$dst")
sed -e 's!^\(#?LogFile \).*!\1%logfile!g;
s!^#?\(LocalSocket \).*!\1%rundir/clamd.sock!g;
s!^#?\(PidFile \).*!\1%rundir/clamd.pid!g;
s!!%service!g;
s!!%username!g;' "$src" >"$dst"
chmod --reference "$src" "$dst"
}
subst clamd.conf %conffile
subst clamd.logrotate %_sysconfdir/logrotate.d/clamd.%service
%if 0%{!?_without_sysv:1}
subst clamd.sysconfig %_sysconfdir/sysconfig/clamd.%service
subst clamd.init %_initrddir/clamd.%service
%endif
ln -s clamd $RPM_BUILD_ROOT%_sbindir/clamd.%service
touch $RPM_BUILD_ROOT%logfile
touch $RPM_BUILD_ROOT%rundir/clamd.sock
%if 0%{!?_without_minit:1}
ln -s %_sbindir/clamd.%service $RPM_BUILD_ROOT%minitsvcdir/run
touch $RPM_BUILD_ROOT%minitsvcdir/respawn
cat <$RPM_BUILD_ROOT%minitsvcdir/params
-c
%conffile
EOF
%endif
%clean
rm -rf $RPM_BUILD_ROOT
%triggerin minit -- %baseservice
minit-svc add services/clamd.%service services/%baseservice/
%triggerun minit -- %baseservice
test "$1" != 0 -a "$2" != 0 || \
minit-svc del services/clamd.%service services/%baseservice/
%post minit
d=$(mktemp /tmp/clamd.%service.XXXXXX)
sed -e 's!^#Foreground!Foreground!' "%conffile" >"$d"
grep -q '^Foreground' $d || echo 'Foreground' >>$d
cmp -s "$d" %conffile || cat "$d" >"%conffile"
rm -f "$d"
%post sysv
d=$(mktemp /tmp/clamd.%service.XXXXXX)
sed -e 's!^Foreground!#Foreground!' "%conffile" >"$d"
cmp -s "$d" %conffile || cat "$d" >"%conffile"
rm -f "$d"
%__chkconfig --add %name
%preun sysv
test "$1" != 0 || %__chkconfig --del %name
XEOFX
}
function rpm.genFiles
{
cat <<"EOF"
%files
%defattr(-,root,root,-)
%doc
%config(noreplace) %verify(not size md5 mtime) %attr(0620,root,%username) %logfile
%config(noreplace) %verify(not mtime) %conffile
%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/clamd.%service
%_sbindir/clamd.%service
%dir %attr(0700,%username,root) %rundir
%ghost %rundir/clamd.sock
%if 0%{!?_without_sysv:1}
%files sysv
%defattr(-,root,root,-)
%config %verify(not mtime) %_initrddir/clamd.%service
%config(noreplace) %verify(not mtime) %_sysconfdir/sysconfig/clamd.%service
%endif
%if 0%{!?_without_minit:1}
%files minit
%defattr(-,root,root,-)
%dir %minitsvcdir
%config(noreplace) %verify(not mtime) %minitsvcdir/params
%config %minitsvcdir/run
%minitsvcdir/respawn
%endif
EOF
}
SERVICE=
VERSION=
RELEASE=
LICENSE=
USERNAME=
tmp=$(getopt -o '' --long service:,version:,release:,license:,username:,help -n "$0" -- "$@") || exit 1
eval set -- "$tmp"
while true; do
case "$1" in
(--help) showHelp $0;;
(--service) SERVICE=$2; shift;;
(--version) VERSION=$2; shift;;
(--release) RELEASE=$2; shift;;
(--license) LICENSE=$2; shift;;
(--username) USERNAME=$2; shift;;
(--) shift; break;;
esac
shift
done
for i in SERVICE VERSION RELEASE LICENSE USERNAME; do
eval tmp=\$${i}
test "$tmp" || {
echo $"No value for $i specified; assuming @${i}@" >&2;
eval $i=@${i}@;
}
done
rpm.generatePreamble
rpm.generateHeader
rpm.genBody
rpm.genFiles
clamav-0.80-initoff.patch:
--- NEW FILE clamav-0.80-initoff.patch ---
--- clamav-0.70-rc/contrib/init/RedHat/clamav-milter.initoff 2004-02-10 23:44:49.000000000 +0100
+++ clamav-0.70-rc/contrib/init/RedHat/clamav-milter 2004-02-10 23:45:28.000000000 +0100
@@ -2,7 +2,7 @@
#
# clamav-milter This script starts and stops the clamav-milter daemon
#
-# chkconfig: 2345 71 40
+# chkconfig: - 71 40
#
# description: clamav-milter is a daemon which hooks into sendmail and routes
# email messages to clamav
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 04:10:52 -0000 1.2
+++ sources 3 Feb 2005 08:40:44 -0000 1.3
@@ -1 +1,2 @@
-096cffd2633cbac5a14b7080b6f67a67 clamav-0.71.tar.gz
+60081ddd9f29cbb8f0a2fe575e5a8afa clamav-0.81.tar.gz
+b3c33479713c18794dfe83aa7397c604 clamav-0.81.tar.gz.sig
Index: clamd.SERVICE.init
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamd.SERVICE.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- clamd.SERVICE.init 8 Nov 2004 04:10:52 -0000 1.1
+++ clamd.SERVICE.init 3 Feb 2005 08:40:44 -0000 1.2
@@ -4,4 +4,4 @@
# description: The clamd server running for
CLAMD_SERVICE=
-. /etc/init.d/clamd-wrapper
+. /usr/share/clamav/clamd-wrapper
Index: clamd-README
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamd-README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- clamd-README 8 Nov 2004 04:10:52 -0000 1.1
+++ clamd-README 3 Feb 2005 08:40:44 -0000 1.2
@@ -1,7 +1,7 @@
To create individual clamd-instance take the following files and
modify/copy them in the suggested way:
-clamav.conf:
+clamd.conf:
* set LogFile, PidFile, LocalSocket and User to suitable values
* place this file into /etc/clamd.d with a unique service-name;
e.g. as /etc/clamd.d/.conf
@@ -42,7 +42,7 @@
Additionally, a symlink must be set to clamd in a way like
| # ln -s clamd /usr/sbin/clamd.
and the directory for the socket file must be created (see 'LocalSocket'
-in clamav.conf)
+in clamd.conf)
| # mkdir -p /var/run/clamd.
Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- clamav.spec 10 Dec 2004 22:03:01 -0000 1.5
+++ clamav.spec 3 Feb 2005 08:40:44 -0000 1.6
@@ -1,15 +1,24 @@
+## This package understands the following switches:
+## --without milter ... deactivate the -milter subpackage
+
+
+## Fedora Extras specific customization below...
+%{!?release_func:%define release_func() %1}
+##
+
+
%define username clamav
%define homedir %_var/lib/clamav
%define freshclamlog %_var/log/freshclam.log
%define milterlog %_var/log/clamd.milter
%define milteruser clamilt
%define milterstatedir %_var/run/clamav-milter
-%define milterclamddir %_var/run/clamd.milter
+%define pkgdatadir %_datadir/%name
Summary: End-user tools for the Clam Antivirus scanner
Name: clamav
-Version: 0.71
-Release: 2
+Version: 0.81
+Release: %release_func 2
Epoch: 0
License: GPL
Group: Applications/File
@@ -25,11 +34,12 @@
Source8: clamav-notify-servers
Patch20: clamav-0.70-user.patch
Patch21: clamav-0.70-path.patch
-Patch22: clamav-0.70-initoff.patch
+Patch22: clamav-0.80-initoff.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: clamav-lib = %{epoch}:%{version}-%{release}
Requires: data(clamav)
-BuildRequires: zlib-devel bzip2-devel gmp-devel tcp_wrappers
+BuildRequires: zlib-devel bzip2-devel gmp-devel tcp_wrappers curl-devel
+BuildRequires: bc
%package lib
Summary: Dynamic libraries for the Clam Antivirus scanner
@@ -39,7 +49,9 @@
%package devel
Summary: Headerfiles and libraries for the Clam Antivirus scanner
Group: Development/Libraries
+Source100: clamd-gen
Requires: clamav-lib = %{epoch}:%{version}-%{release}
+Requires(pre): %_libdir/pkgconfig
%package data
Summary: The virus-signatures for clamav
@@ -68,7 +80,6 @@
Provides: init(clamav-server)
Requires: data(clamav)
Requires: clamav-lib = %{epoch}:%{version}-%{release}
-BuildRequires: dietlibc
Requires(pre): %_initrddir
Requires(postun): %_initrddir
@@ -79,9 +90,7 @@
## and -minit subpackages
Requires: init(clamav-milter)
Provides: init(clamav-milter)
-BuildRequires: sendmail-devel
-Requires(preun): clamav-server = %{epoch}:%{version}-%{release}
-Requires(postun): clamav-server = %{epoch}:%{version}-%{release}
+%{!?_without_milter:BuildRequires: sendmail-devel}
Requires: sendmail
Requires(pre): %_initrddir
Requires(postun): %_initrddir
@@ -104,6 +113,16 @@
(including signatures for popular polymorphic viruses, too) and is KEPT UP
TO DATE.
+WARNING: this package was built with '--disable-zlib-vcheck' because Red Hat
+ is unable to apply a simple security fix within 5 months. On
+ failures or successful DOS attacks on your mailserver, please
+ blame RH but not fedora.us.
+
+ See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 and
+ http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797
+ for references
+
+
%description lib
This package contains dynamic libraries shared between applications
using the Clam Antivirus scanner.
@@ -120,7 +139,7 @@
%description update
This package contains programs which can be used to update the clamav
anti-virus database automatically. It uses the freshclam(1) utility for
-this task. To activate it, uncomment the entry in /etc/cron.d/clamav.
+this task. To activate it, uncomment the entry in /etc/cron.d/clamav-update.
%description server
ATTENTION: most users do not need this package; the main package has
@@ -138,7 +157,6 @@
can be activated by adding
| INPUT_MAIL_FILTER(`clamav', `S=local:%milterstatedir/clamav.sock, F=, T=S:4m;R:4m')dnl
-| define(`confINPUT_MAIL_FILTERS', `clamav')dnl
to your sendmail.mc.
@@ -157,23 +175,35 @@
s!^#?(PidFile ).*!\1/var/run/clamd./clamd.pid!g;
s!^#?(User ).*!\1!g;
s! /usr/local/share/clamav,! %homedir,!g;
- ' etc/clamav.conf
+ ' etc/clamd.conf
perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf
## ------------------------------------------------------------
%build
-#%%configure --disable-clamav --with-dbdir=/var/lib/clamav
-## The %%configure macro can not be used since the script breaks on
-## the old architecture specification
-
-CFLAGS=$RPM_OPT_FLAGS; export CFLAGS
-./configure --prefix=%{_prefix} --mandir=%{_mandir} --sysconfdir=%{_sysconfdir} \
- --disable-clamav --with-dbdir=%{homedir} \
- --enable-milter
+cat <"$f".tmp
+cmp -s "$f" "$f".tmp || cat "$f".tmp >"$f"
+rm -f "$f".tmp
+
## prepare the update-files
%{__install} -m644 -p %{SOURCE6} ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/clamav-update
@@ -213,26 +257,28 @@
touch ${RPM_BUILD_ROOT}%{freshclamlog}
cat >${RPM_BUILD_ROOT}%{_sysconfdir}/cron.d/clamav-update <<"EOF"
+## Adjust this line...
+MAILTO=root,postmaster,webmaster,%username
+
## It is ok to execute it as root; freshclam drops privileges and becomes
## user 'clamav' as soon as possible
## Note: replace 'MIN' and 'HOUR' with random values
# MIN HOUR/3 * * * root %{_bindir}/freshclam --quiet && { test -x %{_sbindir}/clamav-notify-servers && exec %{_sbindir}/clamav-notify-servers || :; }
-EOF
+## Comment out or remove this line...
+1 8 * * * %username /bin/sh -c 'echo "Please activate the clamav update in %_sysconfdir/cron.d/clamav-update" >&2'
+EOF
+%if 0%{!?_without_milter:1}
#### The milter stuff
function subst() {
sed -e 's!!milter!g;s!!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2"
}
-subst %SOURCE3 /etc/logrotate.d/clamd.milter
-subst %SOURCE7 %_initrddir/clamd.milter
-subst etc/clamav.conf /etc/clamd.d/milter.conf \
+subst etc/clamd.conf /etc/clamd.d/milter.conf \
's!^##*\(\(LogFile\|LocalSocket\|PidFile\|User\)\s\|\(StreamSaveToDisk\|ScanMail\)$\)!\1!;'
-chmod 0755 $RPM_BUILD_ROOT%_initrddir/clamd.milter
-ln -s ./clamd $RPM_BUILD_ROOT%_sbindir/clamd.milter
cat <$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamav-milter
## The '-blo' options might be usefully here -- especially for testing; see
@@ -242,8 +288,9 @@
EOF
%__install -p -m755 contrib/init/RedHat/clamav-milter $RPM_BUILD_ROOT%_initrddir/clamav-milter
-touch $RPM_BUILD_ROOT%milterclamddir/{clamd.sock,clamd.pid,milter.sock}
touch $RPM_BUILD_ROOT%milterstatedir/clamav.sock $RPM_BUILD_ROOT%milterlog
+%endif # _without_milter
+
## ------------------------------------------------------------
@@ -275,18 +322,14 @@
%post milter
/sbin/chkconfig --add clamav-milter
-/sbin/chkconfig --add clamd.milter
%preun milter
test "$1" != 0 || %{_initrddir}/clamav-milter stop &>/dev/null || :
-test "$1" != 0 || %{_initrddir}/clamd.milter stop &>/dev/null || :
test "$1" != 0 || /sbin/chkconfig --del clamav-milter
-test "$1" != 0 || /sbin/chkconfig --del clamd.milter
%postun milter
test "$1" != 0 || /usr/sbin/fedora-userdel %{milteruser} &>/dev/null || :
test "$1" != 0 || /usr/sbin/fedora-groupdel %{milteruser} &>/dev/null || :
-test "$1" = 0 || %{_initrddir}/clamd.milter condrestart >/dev/null || :
test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || :
@@ -298,15 +341,9 @@
%defattr(-,root,root,-)
%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS TODO
%doc docs/*.pdf
-%doc docs/html docs/DMS docs/FreeBSD-HowTo
-%lang(fr) %doc docs/French
-%lang(ja) %doc docs/Japanese
-%lang(pl) %doc docs/Polish
-%lang(pt) %doc docs/Portugese
-%lang(es) %doc docs/Spanish
-%lang(tr) %doc docs/Turkish
%doc %{_mandir}/man[15]/*
%{_bindir}/*
+%exclude %_bindir/clamav-config
%exclude %_bindir/freshclam
%exclude %_mandir/man1/freshclam*
@@ -323,12 +360,20 @@
%{_includedir}/*
%{_libdir}/*.*a
%{_libdir}/*.so
+%dir %pkgdatadir
+%pkgdatadir/template
+%pkgdatadir/clamd-gen
+%_libdir/pkgconfig/*
+%_bindir/clamav-config
## -----------------------
%files data
%defattr(-,%{username},%{username},-)
%dir %{homedir}
+# use %%config to keep files which were updated by 'freshclam'
+# already. Without this tag, they would be overridden with older
+# versions whenever a new -data package is installed.
%config %verify(not size md5 mtime) %{homedir}/*.cvd
## -----------------------
@@ -338,7 +383,7 @@
%_bindir/freshclam
%_mandir/man1/freshclam*
%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf
-%config(noreplace) %verify(not mtime) %_sysconfdir/cron.d/*
+%config(noreplace) %verify(not mtime) %attr(0600,root,root) %_sysconfdir/cron.d/*
%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/*
%ghost %attr(0664,root,%{username}) %verify(not size md5 mtime) %{freshclamlog}
@@ -348,12 +393,15 @@
%files server
%defattr(-,root,root,-)
%doc _doc_server/*
-%doc etc/clamav.conf
%doc %{_mandir}/man8/*
%{_sbindir}/*
-%config %{_initrddir}/clamd-wrapper
+%_initrddir/clamd-wrapper
+%dir %pkgdatadir
%dir %{_sysconfdir}/clamd.d
+%pkgdatadir/clamd-wrapper
+
+%if 0%{!?_without_milter:1}
%exclude %_sbindir/*milter*
%exclude %_mandir/man8/clamav-milter*
@@ -364,18 +412,79 @@
%doc clamav-milter/INSTALL
%_sbindir/*milter*
%_mandir/man8/clamav-milter*
-%config %{_initrddir}/clamd.milter
%config %{_initrddir}/clamav-milter
%config(noreplace) %verify(not mtime) %{_sysconfdir}/clamd.d/milter.conf
%config(noreplace) %verify(not mtime) %{_sysconfdir}/sysconfig/clamav-milter
-%attr(0700,%milteruser,%milteruser) %dir %milterclamddir
%attr(0700,%milteruser,%milteruser) %dir %milterstatedir
-%ghost %milterclamddir/*
%ghost %milterstatedir/*
%ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog
-
+%endif # _without_milter
%changelog
+* Fri Jan 28 2005 Enrico Scholz - 0:0.81-0.fdr.2
+- build the package with '--disable-zlib-vcheck' because RH is unable to
+ apply a fix for a 5 month old and solved security issue. Please fill
+ your comments at https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385
+- added 'BuildRequires: bc' (should work without also, but ./configure
+ gives out ugly warnings else)
+
+* Fri Jan 28 2005 Enrico Scholz - 0:0.81-0.fdr.1
+- updated to 0.81
+- do not ship the 'clamd.milter' daemon anymore; clamav-milter supports
+ an internal mode now which is enabled by default
+- updated -milter %%description
+
+* Thu Jan 20 2005 Enrico Scholz - 0:0.80-0.fdr.2
+- s!cron.d/clamav!cron.d/clamav-update! in the %%description of the -update
+ subpackage (https://bugzilla.fedora.us/show_bug.cgi?id=1715#c39)
+
+* Wed Nov 3 2004 Enrico Scholz - 0:0.80-0.fdr.1
+- updated to 0.80
+- removed DMS, FreeBSD-HOWTO and localized docs as it is not shipped anymore
+- buildrequire 'curl-devel'
+- renamed clamav.conf to clamd.conf (upstream change)
+- updated -initoff patch
+
+* Tue Sep 14 2004 Enrico Scholz - 0:0.75.1-0.fdr.1
+- updated to 0.75.1
+- use %%configure, the problems with the architecture specification
+ seem to have passed (probably because of an autoconf update)
+- set mode 0600 for the cron-script (required by vixie-cron)
+- made the cronjob a spambot and send mail about deactivated freshclam
+ service to nearly everybody... (root, postmaster, webmaster)
+- other fixes in the notification cronjob
+
+* Fri Jul 23 2004 Enrico Scholz - 0:0.75-0.fdr.1
+- updated to 0.75
+
+* Thu Jul 15 2004 Enrico Scholz - 0:0.74-0.fdr.2
+- moved /usr/bin/clamav-config from main into -devel
+
+* Wed Jun 30 2004 Enrico Scholz - 0:0.74-0.fdr.1
+- updated to 0.74
+
+* Mon Jun 14 2004 Enrico Scholz - 0:0.73-0.fdr.1
+- updated to 0.73
+- added pkgconfig file
+
+* Fri Jun 11 2004 Enrico Scholz - 0:0.72-0.fdr.3
+- notify the user about a deactivated clamav-update service
+- added clamd-gen script which generates template spec-files for
+ services using clamd
+- copied template configuration files to %pkgdatadir/template (needed
+ for clamd-gen)
+- moved the clamd-wrapper from %_initrddir to %{pkgdatadir}; a symlink
+ will be provided for compatibility reasons
+- conditionalized building of the -milter subpackage ('--without
+ milter' switch) to enable builds on RH73 (bug #1715, comment #5/#7)
+
+* Fri Jun 4 2004 Enrico Scholz - 0:0.72-0.fdr.2
+- removed 'BuildRequires: dietlibc'; it was a leftover from the
+ pre-use-signal era (before 0.70) (bug #1716)
+
+* Thu Jun 3 2004 Enrico Scholz - 0:0.72-0.fdr.1
+- updated to 0.72
+
* Thu May 20 2004 Enrico Scholz - 0:0.71-0.fdr.2
- removed the randomization in the cronjob; it seems to be impossible
to use the mod-operator (%%) there. Instead of, the user has to
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 04:10:52 -0000 1.2
+++ .cvsignore 3 Feb 2005 08:40:44 -0000 1.3
@@ -1 +1,3 @@
-clamav-0.71.tar.gz
+clamav-*.tar.gz*
+clamav-0.81.tar.gz
+clamav-0.81.tar.gz.sig
--- clamav-0.71.tar.gz.sig DELETED ---
--- clamav-0.70-initoff.patch DELETED ---
From fedora-extras-commits at redhat.com Thu Feb 3 10:12:39 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Thu, 3 Feb 2005 05:12:39 -0500
Subject: rpms/milter-greylist - New directory
Message-ID: <200502031012.j13ACdnd027536@cvs.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/rpms/milter-greylist
In directory cvs.fedora.redhat.com:/tmp/cvs-serv27529/milter-greylist
Log Message:
Directory /cvs/extras/rpms/milter-greylist added to the repository
From fedora-extras-commits at redhat.com Thu Feb 3 10:12:39 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Thu, 3 Feb 2005 05:12:39 -0500
Subject: rpms/milter-greylist/devel - New directory
Message-ID: <200502031012.j13ACdUu027539@cvs.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv27529/milter-greylist/devel
Log Message:
Directory /cvs/extras/rpms/milter-greylist/devel added to the repository
From fedora-extras-commits at redhat.com Thu Feb 3 10:12:56 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Thu, 3 Feb 2005 05:12:56 -0500
Subject: rpms/milter-greylist Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200502031012.j13ACuOU027602@cvs.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/rpms/milter-greylist
In directory cvs.fedora.redhat.com:/tmp/cvs-serv27593
Added Files:
Makefile import.log
Log Message:
Setup of module milter-greylist
--- NEW FILE Makefile ---
# Top level Makefile for module milter-greylist
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like a CVS checkout" && exit 1
clean :
@find . -type f -name *~ -exec rm -fv {} \;
--- NEW FILE import.log ---
From fedora-extras-commits at redhat.com Thu Feb 3 10:12:56 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Thu, 3 Feb 2005 05:12:56 -0500
Subject: rpms/milter-greylist/devel .cvsignore, NONE, 1.1 Makefile, NONE,
1.1 sources, NONE, 1.1
Message-ID: <200502031012.j13ACu8B027605@cvs.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv27593/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module milter-greylist
--- NEW FILE .cvsignore ---
***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'
--- NEW FILE sources ---
From fedora-extras-commits at redhat.com Thu Feb 3 10:13:36 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Thu, 3 Feb 2005 05:13:36 -0500
Subject: rpms/milter-greylist import.log,1.1,1.2
Message-ID: <200502031013.j13ADasn027716@cvs.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/rpms/milter-greylist
In directory cvs.fedora.redhat.com:/tmp/cvs-serv27707
Modified Files:
import.log
Log Message:
auto-import milter-greylist-1.6-1 on branch devel from milter-greylist-1.6-1.src.rpm
Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log 3 Feb 2005 10:12:54 -0000 1.1
+++ import.log 3 Feb 2005 10:13:34 -0000 1.2
@@ -0,0 +1 @@
+milter-greylist-1_6-1:HEAD:milter-greylist-1.6-1.src.rpm:1107425609
From fedora-extras-commits at redhat.com Thu Feb 3 10:13:36 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Thu, 3 Feb 2005 05:13:36 -0500
Subject: rpms/milter-greylist/devel milter-greylist-1.4-spfbool.patch, NONE,
1.1 milter-greylist-1.6-group.patch, NONE,
1.1 milter-greylist-1.6-rh.patch, NONE,
1.1 milter-greylist.spec, NONE, 1.1 .cvsignore, 1.1,
1.2 sources, 1.1, 1.2
Message-ID: <200502031013.j13ADalA027720@cvs.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv27707/devel
Modified Files:
.cvsignore sources
Added Files:
milter-greylist-1.4-spfbool.patch
milter-greylist-1.6-group.patch milter-greylist-1.6-rh.patch
milter-greylist.spec
Log Message:
auto-import milter-greylist-1.6-1 on branch devel from milter-greylist-1.6-1.src.rpm
milter-greylist-1.4-spfbool.patch:
--- NEW FILE milter-greylist-1.4-spfbool.patch ---
2005-02-03 Enrico Scholz
* spf.c: fix build issue with libspf
--- milter-greylist-1.4/spf.c.bool 2004-05-04 22:50:33.000000000 +0200
+++ milter-greylist-1.4/spf.c 2004-10-07 22:01:32.000000000 +0200
@@ -72,7 +72,7 @@
inet_ntop(AF_INET, in, addr, IPADDRLEN);
if ((p = SPF_init("milter-greylist", addr,
- NULL, NULL, NULL, FALSE, FALSE)) == NULL) {
+ NULL, NULL, NULL, SPF_FALSE, SPF_FALSE)) == NULL) {
syslog(LOG_ERR, "SPF_Init failed");
goto out1;
}
milter-greylist-1.6-group.patch:
--- NEW FILE milter-greylist-1.6-group.patch ---
2005-02-03 Enrico Scholz
* milter-greylist.c: change gid and supplementary groups also
--- milter-greylist-1.6/milter-greylist.c.group 2004-11-27 15:43:17.000000000 +0100
+++ milter-greylist-1.6/milter-greylist.c 2005-02-03 10:43:26.349877397 +0100
@@ -48,6 +48,7 @@
#include
#include
#include
+#include
#include
/* On IRIX, defines a EX_OK that clashes with */
@@ -866,6 +867,19 @@
exit(EX_OSERR);
}
+ if (initgroups(conf.c_user, pw->pw_gid) != 0) {
+ syslog(LOG_ERR, "%s: can not change supplementary groups: %s\n",
+ argv[0], strerror(errno));
+ exit(EX_OSERR);
+ }
+
+ if (setgid(pw->pw_gid) != 0 ||
+ setegid(pw->pw_gid) != 0) {
+ syslog(LOG_ERR, "%s: cannot change GID: %s\n",
+ argv[0], strerror(errno));
+ exit(EX_OSERR);
+ }
+
if ((setuid(pw->pw_uid) != 0) ||
(seteuid(pw->pw_uid) != 0)) {
syslog(LOG_ERR, "%s: cannot change UID: %s\n",
milter-greylist-1.6-rh.patch:
--- NEW FILE milter-greylist-1.6-rh.patch ---
2005-02-03 Enrico Scholz
* rc-redhat.sh.in: fix startup position; '50' was too early
because important services like 'named' will be started
later (55). '79' seems to be a good value as sendmail is
started at '80'
--- milter-greylist-1.6/rc-redhat.sh.in.rh 2004-11-28 01:33:29.000000000 +0100
+++ milter-greylist-1.6/rc-redhat.sh.in 2005-02-03 09:49:42.277934116 +0100
@@ -2,7 +2,7 @@
# $Id: rc-redhat.sh.in,v 1.1 2004/11/28 00:33:29 manu Exp $
# init file for milter-greylist
#
-# chkconfig: - 50 50
+# chkconfig: - 79 21
# description: Milter Greylist Daemon
#
# processname: @BINDIR@/milter-greylist
--- NEW FILE milter-greylist.spec ---
## This package accepts the following switches:
## --with spf ... enable SPF support
## --with minit ... enable minit support
## Fedora Extras specific customization below...
%{!?release_func:%define release_func() %1}
##
%define username grmilter
%define minitdir %_sysconfdir/minit
%define minitsvcdir %minitdir/services/grmilter
%define vardir /var/lib/%name
%define dbdir %vardir/db
%define rundir %vardir/run
%define __chkconfig /sbin/chkconfig
Summary: A milter for greylisting, the Next Step in the Spam Control War
Name: milter-greylist
Version: 1.6
Release: %release_func 1
Epoch: 0
License: BSD w/ advertising
Group: System Environment/Daemon
URL: http://hcpnet.free.fr/milter-greylist/
Source0: ftp://ftp.espci.fr/pub/milter-greylist/%name-%version.tgz
Patch0: milter-greylist-1.6-rh.patch
Patch1: milter-greylist-1.6-group.patch
Patch2: milter-greylist-1.4-spfbool.patch
BuildRoot: %_tmppath/%name-%version-%release-root
Requires: init(%name)
Requires(pre): fedora-usermgmt
Requires(postun): fedora-usermgmt
BuildRequires: bison flex m4
BuildRequires: sendmail-devel %{?_with_spf:libspf-devel}
%package sysv
Summary: The sysv-initscripts for %name
Group: System Environment/Daemon
Provides: init(%name) = sysv
Requires(preun): %name = %epoch:%version-%release
Requires(postun): %name = %epoch:%version-%release
Requires(preun): initscripts
Requires(postun): initscripts
Requires(post): %__chkconfig
Requires(preun): %__chkconfig
%package minit
Summary: The minit-initscripts for %name
Group: System Environment/Daemon
Provides: init(%name) = minit
Requires: %name = %epoch:%version-%release
Requires: %_sbindir/setuidgid
Requires(pre): minit-setup
Requires(postun): minit-setup
%description
Greylisting is a new method of blocking significant amounts of spam at
the mailserver level, but without resorting to heavyweight statistical
analysis or other heuristical (and error-prone) approaches. Consequently,
implementations are fairly lightweight, and may even decrease network
traffic and processor load on your mailserver.
This package provides a greylist filter for sendmail's milter API.
%description sysv
Greylisting is a new method of blocking significant amounts of spam at
the mailserver level, but without resorting to heavyweight statistical
analysis or other heuristical (and error-prone) approaches. Consequently,
implementations are fairly lightweight, and may even decrease network
traffic and processor load on your mailserver.
This package provides the SysV initscripts for the %name package.
%description minit
Greylisting is a new method of blocking significant amounts of spam at
the mailserver level, but without resorting to heavyweight statistical
analysis or other heuristical (and error-prone) approaches. Consequently,
implementations are fairly lightweight, and may even decrease network
traffic and processor load on your mailserver.
This package provides the minit initscripts for the %name package.
%prep
%setup -q
%patch0 -p1 -b .rh
%patch1 -p1 -b .group
%patch2 -p1 -b .spfbool
perl -pi -e 's!(\$\{INSTALL\}.*\s)(\S+\s*)$!$1\${DESTDIR}$2!' Makefile.in
perl -pi -e 's!--rpath!--XXXX!g' configure
for i in `find -type f`; do
sed -e 's!/var/milter-greylist/milter-greylist.sock!%rundir/milter-greylist.sock!g;
s!/var/milter-greylist/greylist.db!%dbdir/greylist.db!g;
' "$i" >"$i.tmp"
cmp -s "$i" "$i.tmp" || cat "$i.tmp" >"$i"
rm -f "$i".tmp
done
%define makeflags TEST=false BINDIR=%_sbindir
%build
%configure \
--with-user=%username \
%{?_with_spf:--with-libspf=/usr}
## is not SMP safe :(
%__make %makeflags
%install
rm -rf $RPM_BUILD_ROOT
%__install -d -m755 \
$RPM_BUILD_ROOT{/etc/mail,%rundir,%dbdir,%_initrddir,%minitsvcdir,%_var/run}
%__make DESTDIR=$RPM_BUILD_ROOT install %makeflags USER="$(id -u)"
%__install -p -m755 rc-redhat.sh $RPM_BUILD_ROOT%_initrddir/%name
# the minit stuff
ln -s %_sbindir/milter-greylist $RPM_BUILD_ROOT%minitsvcdir/run
touch $RPM_BUILD_ROOT%minitsvcdir/respawn
cat <$RPM_BUILD_ROOT%minitsvcdir/params
-D
-u%username
-p%rundir/milter-greylist.sock
EOF
# Short hack...
%{!?_with_minit:rm -rf $RPM_BUILD_ROOT%minitdir}
# create temporary files
touch $RPM_BUILD_ROOT%rundir/milter-greylist.sock
touch $RPM_BUILD_ROOT%_var/run/milter-greylist.pid
%pre
/usr/sbin/fedora-groupadd 7 -r %username &>/dev/null || :
/usr/sbin/fedora-useradd 7 -r -s /sbin/nologin -M -d %vardir \
-c 'Greylist-milter user' -g %username %username &>/dev/null || :
%postun
test "$1" != 0 || /usr/sbin/fedora-userdel %username &>/dev/null || :
test "$1" != 0 || /usr/sbin/fedora-groupdel %username &>/dev/null || :
%post sysv
%__chkconfig --add %name
%preun sysv
test "$1" != 0 || %__chkconfig --del %name
test "$1" != 0 || %_initrddir/%name stop >/dev/null || :
%postun sysv
test "$1" = 0 || %_initrddir/%name condrestart >/dev/null || :
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc ChangeLog README
%_mandir/man*/*
%attr(0640,root,%username) %config(noreplace) /etc/mail/greylist.conf
%dir %attr(0751,%username,%username) %vardir
%dir %attr(0770,root,%username) %dbdir
%dir %attr(0700,%username,root) %rundir
%_sbindir/*
%ghost %rundir/milter-greylist.sock
%ghost %_var/run/milter-greylist.pid
%files sysv
%defattr(-,root,root,-)
%config %_initrddir/*
%if 0%{?_with_minit:1}
%files minit
%defattr(-,root,root,-)
%dir %minitsvcdir
%minitsvcdir/run
%minitsvcdir/respawn
%config(noreplace) %minitsvcdir/params
%endif
%changelog
* Thu Feb 3 2005 Enrico Scholz - 0:1.6
- updated to 1.6
* Thu Oct 7 2004 Enrico Scholz - 0:1.4-0.fdr.2
- rebuilt
- applied patch to build with libspf-1.0.0
* Tue Jun 15 2004 Enrico Scholz - 0:1.4-0.fdr.1
- updated to 1.4
* Fri Jun 11 2004 Enrico Scholz - 0:1.3.9-0.fdr.1
- updated to 1.3.9
* Thu Apr 29 2004 Enrico Scholz - 0:1.2.1-1
- Initial build.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 3 Feb 2005 10:12:54 -0000 1.1
+++ .cvsignore 3 Feb 2005 10:13:34 -0000 1.2
@@ -0,0 +1 @@
+milter-greylist-1.6.tgz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 3 Feb 2005 10:12:54 -0000 1.1
+++ sources 3 Feb 2005 10:13:34 -0000 1.2
@@ -0,0 +1 @@
+9830e3a13aadf851a799131d9a40e931 milter-greylist-1.6.tgz
From fedora-extras-commits at redhat.com Thu Feb 3 12:34:23 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Feb 2005 07:34:23 -0500
Subject: rpms/libassuan/devel libassuan.spec,1.3,1.4
Message-ID: <200502031234.j13CYNxC029486@cvs.fedora.redhat.com>
Author: mschwendt
Update of /cvs/extras/rpms/libassuan/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv29479
Modified Files:
libassuan.spec
Log Message:
PIC for x86_64!
Index: libassuan.spec
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/libassuan.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libassuan.spec 1 Feb 2005 19:30:20 -0000 1.3
+++ libassuan.spec 3 Feb 2005 12:34:21 -0000 1.4
@@ -2,7 +2,7 @@
Summary: GnuPG IPC library
Name: libassuan
Version: 0.6.9
-Release: 1%{?dist_tag}
+Release: 2%{?dist_tag}
Source0: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz
Source1: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz.sig
URL: http://www.gnupg.org/
@@ -33,7 +33,7 @@
%build
%configure
-make %{?_smp_mflags}
+make CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" %{?_smp_mflags}
%install
@@ -79,6 +79,9 @@
%changelog
+* Thu Feb 3 2005 Michael Schwendt - 0.6.9-2
+- Build PIC to fix x86_64 linking.
+
* Thu Jan 06 2005 Rex Dieter - 0.6.9-1
- 0.6.9
From fedora-extras-commits at redhat.com Tue Feb 8 22:39:39 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 8 Feb 2005 17:39:39 -0500
Subject: rpms/k3b-ape/devel k3b-ape.spec,1.4,1.5
Message-ID: <200502082239.j18MddGM014277@cvs-int.fedora.redhat.com>
Author: mschwendt
Update of /cvs/extras/rpms/k3b-ape/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14271
Modified Files:
k3b-ape.spec
Log Message:
spec fix for x86_64
Index: k3b-ape.spec
===================================================================
RCS file: /cvs/extras/rpms/k3b-ape/devel/k3b-ape.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- k3b-ape.spec 10 Dec 2004 22:03:04 -0000 1.4
+++ k3b-ape.spec 8 Feb 2005 22:39:37 -0000 1.5
@@ -2,7 +2,7 @@
Name: k3b-ape
Version: 1.0
-Release: 4
+Release: 5
Epoch: 0
Summary: Monkey's audio decoder/encoder plugin for K3b
Group: Applications/Multimedia
@@ -30,7 +30,8 @@
%build
[ -z "$QTDIR" ] && . %{_sysconfdir}/profile.d/qt.sh
-./configure --prefix=$(kde-config --prefix) --libdir=%{_libdir}
+%configure --prefix=$(kde-config --prefix) \
+ --exec_prefix=$(kde-config --exec-prefix)
make %{?_smp_mflags}
@@ -50,6 +51,9 @@
%changelog
+* Tue Feb 8 2005 Michael Schwendt - 0:1.0-5
+- Use %%configure and fix the parameters for x86_64.
+
* Wed Apr 14 2004 Mihai Maties - 0:1.0-0.fdr.4
- Removed the Packager tag as Ville Skytt?? suggested
- Indeed "Thu" != "Tuesday" :) - corrected - (thanx Michael Schwendt)
From fedora-extras-commits at redhat.com Tue Feb 8 23:00:39 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 8 Feb 2005 18:00:39 -0500
Subject: rpms/clamav/devel clamav.spec,1.6,1.7
Message-ID: <200502082300.j18N0d45014505@cvs-int.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14499
Modified Files:
clamav.spec
Log Message:
- updated to 0.82
- minor spec cleanups
Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- clamav.spec 3 Feb 2005 08:40:44 -0000 1.6
+++ clamav.spec 8 Feb 2005 23:00:37 -0000 1.7
@@ -1,9 +1,10 @@
+## $Id$
+
## This package understands the following switches:
## --without milter ... deactivate the -milter subpackage
## Fedora Extras specific customization below...
-%{!?release_func:%define release_func() %1}
##
@@ -15,10 +16,13 @@
%define milterstatedir %_var/run/clamav-milter
%define pkgdatadir %_datadir/%name
+
+%{!?release_func:%define release_func() %1}
+
Summary: End-user tools for the Clam Antivirus scanner
Name: clamav
-Version: 0.81
-Release: %release_func 2
+Version: 0.82
+Release: %release_func 1
Epoch: 0
License: GPL
Group: Applications/File
@@ -113,15 +117,6 @@
(including signatures for popular polymorphic viruses, too) and is KEPT UP
TO DATE.
-WARNING: this package was built with '--disable-zlib-vcheck' because Red Hat
- is unable to apply a simple security fix within 5 months. On
- failures or successful DOS attacks on your mailserver, please
- blame RH but not fedora.us.
-
- See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 and
- http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797
- for references
-
%description lib
This package contains dynamic libraries shared between applications
@@ -182,23 +177,13 @@
## ------------------------------------------------------------
%build
-cat <= 1.2.2. This option can be removed for
+## FC4 builds.
+##
+## See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 and
+## http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797
+## also
%configure --disable-clamav --with-dbdir=/var/lib/clamav \
--disable-zlib-vcheck \
%{!?_without_milter:--enable-milter}
@@ -421,6 +406,10 @@
%endif # _without_milter
%changelog
+* Tue Feb 8 2005 Enrico Scholz - 0:0.82-1
+- updated to 0.82
+- minor spec cleanups
+
* Fri Jan 28 2005 Enrico Scholz - 0:0.81-0.fdr.2
- build the package with '--disable-zlib-vcheck' because RH is unable to
apply a fix for a 5 month old and solved security issue. Please fill
From fedora-extras-commits at redhat.com Tue Feb 8 23:01:10 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 8 Feb 2005 18:01:10 -0500
Subject: rpms/clamav/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <200502082301.j18N1AAr014534@cvs-int.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14528
Modified Files:
.cvsignore sources
Log Message:
updated
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 3 Feb 2005 08:40:44 -0000 1.3
+++ .cvsignore 8 Feb 2005 23:01:08 -0000 1.4
@@ -1,3 +1,2 @@
clamav-*.tar.gz*
-clamav-0.81.tar.gz
-clamav-0.81.tar.gz.sig
+clamav-*.*.rpm
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 3 Feb 2005 08:40:44 -0000 1.3
+++ sources 8 Feb 2005 23:01:08 -0000 1.4
@@ -1,2 +1,2 @@
-60081ddd9f29cbb8f0a2fe575e5a8afa clamav-0.81.tar.gz
-b3c33479713c18794dfe83aa7397c604 clamav-0.81.tar.gz.sig
+1b58972d8918f5174d7f05a35a48856b clamav-0.82.tar.gz
+f4010a5d15408fb83077fc5eb468eeb0 clamav-0.82.tar.gz.sig
From fedora-extras-commits at redhat.com Tue Feb 8 23:09:40 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 8 Feb 2005 18:09:40 -0500
Subject: rpms/opencdk/devel opencdk.spec,1.3,1.4
Message-ID: <200502082309.j18N9ewM014663@cvs-int.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/rpms/opencdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14657
Modified Files:
opencdk.spec
Log Message:
- updated to 0.5.5
- minor spec cleanups
Index: opencdk.spec
===================================================================
RCS file: /cvs/extras/rpms/opencdk/devel/opencdk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- opencdk.spec 2 Feb 2005 14:07:46 -0000 1.3
+++ opencdk.spec 8 Feb 2005 23:09:38 -0000 1.4
@@ -1,18 +1,23 @@
+# $Id$
+
+%{!?release_func:%define release_func() %1}
+
Summary: Provides basic parts of the OpenPGP message format
Name: opencdk
-Version: 0.4.5
-Release: 1
+Version: 0.5.5
+Release: %release_func 1
License: GPL
Group: System Environment/Libraries
URL: http://www.gnu.org/software/gnutls/download.html
-Source0: ftp://ftp.gnutls.org/pub/gnutls/opencdk/%{name}-%{version}.tar.gz
+Source0: ftp://ftp.gnutls.org/pub/gnutls/opencdk/%{name}-%{version}.tar.bz2
+Source1: ftp://ftp.gnutls.org/pub/gnutls/opencdk/%{name}-%{version}.tar.bz2.sig.asc
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildRequires: libgcrypt-devel zlib-devel perl
%package devel
Summary: Files which are needed to develop applications using opencdk
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = 0:%{version}-%{release}
Requires: libgcrypt-devel zlib-devel
@@ -85,5 +90,18 @@
%changelog
+* Wed Feb 9 2005 Enrico Scholz - 0.5.5-1
+- updated to 0.5.5
+- minor spec cleanups
+
+* Wed May 26 2004 Enrico Scholz - 0:0.5.4-0.fdr.0.1
+- updated to 0.5.4
+
+* Fri Dec 12 2003 Enrico Scholz - 0:0.5.3-0.fdr.1
+- updated to 0.5.3
+
+* Thu Nov 20 2003 Enrico Scholz - 0:0.5.1-0.fdr.1
+- updated to 0.5.1
+
* Tue Jun 10 2003 Enrico Scholz 0.4.5-0.fdr.1
- Initial build.
From fedora-extras-commits at redhat.com Tue Feb 8 23:09:49 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 8 Feb 2005 18:09:49 -0500
Subject: rpms/opencdk/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200502082309.j18N9npd014692@cvs-int.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/rpms/opencdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14686
Modified Files:
.cvsignore sources
Log Message:
updated
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/opencdk/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 04:55:49 -0000 1.2
+++ .cvsignore 8 Feb 2005 23:09:47 -0000 1.3
@@ -1 +1,2 @@
-opencdk-0.4.5.tar.gz
+opencdk*.tar.bz2*
+opencdk*.tar.bz2.sig.asc
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/opencdk/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 04:55:49 -0000 1.2
+++ sources 8 Feb 2005 23:09:47 -0000 1.3
@@ -1 +1,2 @@
-53e7822ae35d6b391951933e73d3cce0 opencdk-0.4.5.tar.gz
+aaff60107f0153873192ffda00699a96 opencdk-0.5.5.tar.bz2
+468bd9a43f44664a4ef81eb5efdf8ba8 opencdk-0.5.5.tar.bz2.sig.asc
From fedora-extras-commits at redhat.com Tue Feb 8 23:25:27 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 8 Feb 2005 18:25:27 -0500
Subject: rpms/ip-sentinel/devel ip-sentinel.spec,1.1,1.2
Message-ID: <200502082325.j18NPRrl014961@cvs-int.fedora.redhat.com>
Author: ensc
Update of /cvs/extras/rpms/ip-sentinel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14955
Modified Files:
ip-sentinel.spec
Log Message:
workaround https://bugzilla.redhat.com/beta/show_bug.cgi?id=147238
added %_with_fedora default
Index: ip-sentinel.spec
===================================================================
RCS file: /cvs/extras/rpms/ip-sentinel/devel/ip-sentinel.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ip-sentinel.spec 2 Feb 2005 22:42:40 -0000 1.1
+++ ip-sentinel.spec 8 Feb 2005 23:25:24 -0000 1.2
@@ -23,7 +23,11 @@
## --define username\ name ... set the name of the user running the daemon
-%{!?_with_minit:%define _without_minit --without minit}
+## Fedora Extras specific customization below...
+%{!?_with_minit:%global _without_minit --without minit}
+%{!?_without_fedora:%global _with_fedora --with fedora}
+##
+
%define uid 1
%define useradd /usr/sbin/%{?_with_fedora:fedora-}useradd %{?_with_fedora:%uid }
@@ -31,13 +35,14 @@
%define userdel /usr/sbin/%{?_with_fedora:fedora-}userdel
%define groupdel /usr/sbin/%{?_with_fedora:fedora-}groupdel
-%{!?username:%define username ip-sentinel}
+%{!?username:%global username ip-sentinel}
%define service ip-sentinel
%define homedir %_var/lib/ip-sentinel
%define minitdir %_sysconfdir/minit
%define minitsvcdir %minitdir/services/%name
-%{!?release_func:%define release_func() %1}
+
+%{!?release_func:%global release_func() %1}
Summary: A tool to prevent unauthorized usage of IPs
Name: ip-sentinel
From fedora-extras-commits at redhat.com Tue Feb 8 23:31:24 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 8 Feb 2005 18:31:24 -0500
Subject: rpms/opensc/devel opensc.spec,1.1,1.2
Message-ID: <200502082331.j18NVOWD015185@cvs-int.fedora.redhat.com>
Author: mschwendt
Update of /cvs/extras/rpms/opensc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15179
Modified Files:
opensc.spec
Log Message:
fix spec for x86_64 as it blocks gnupg2
Index: opensc.spec
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/opensc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- opensc.spec 2 Feb 2005 23:25:14 -0000 1.1
+++ opensc.spec 8 Feb 2005 23:31:22 -0000 1.2
@@ -6,7 +6,7 @@
Name: opensc
Version: 0.9.4
-Release: 1
+Release: 2
Summary: OpenSC SmartCard library and applications
Group: System Environment/Libraries
@@ -76,7 +76,7 @@
%if %{disable_static}
--disable-static \
%endif
- --with-plugin-path=%{plugindir} \
+ --with-plugin-dir=%{plugindir} \
--with-pin-entry=%{_bindir}/pinentry
make %{?_smp_mflags}
@@ -176,6 +176,9 @@
%changelog
+* Wed Feb 9 2005 Michael Schwendt - 0.9.4-2
+- Use --with-plugin-dir instead of --with-plugin-path (fixes x86_64).
+
* Thu Feb 3 2005 Ville Skytt?? - 0.9.4-1
- Drop unnecessary Epochs, pre-FC1 compat cruft, and no longer relevant
--with(out) rpmbuild options.
From fedora-extras-commits at redhat.com Wed Feb 9 01:54:45 2005
From: fedora-extras-commits at redhat.com (Phillip Compton (pcompton))
Date: Tue, 8 Feb 2005 20:54:45 -0500
Subject: devel/scribus scribus-x86_64.patch,NONE,1.1 scribus.spec,1.7,1.8
Message-ID: <200502090154.j191sjMu003688@cvs-int.fedora.redhat.com>
Author: pcompton
Update of /cvs/extras/devel/scribus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3682
Modified Files:
scribus.spec
Added Files:
scribus-x86_64.patch
Log Message:
Fix for x86_64 build, and qt-devel BR bump.
scribus-x86_64.patch:
--- NEW FILE scribus-x86_64.patch ---
diff -Nur scribus-1.2.1-orig/scribus/plugins/gettext/htmlim/Makefile.in scribus-1.2.1/scribus/plugins/gettext/htmlim/Makefile.in
--- scribus-1.2.1-orig/scribus/plugins/gettext/htmlim/Makefile.in 2005-01-08 10:10:04.000000000 +0100
+++ scribus-1.2.1/scribus/plugins/gettext/htmlim/Makefile.in 2005-02-03 01:04:48.654806024 +0100
@@ -287,7 +287,7 @@
target_vendor = @target_vendor@
x_includes = @x_includes@
x_libraries = @x_libraries@
-pluginsdir = $(prefix)/lib/scribus/plugins/gettext
+pluginsdir = $(libdir)/scribus/plugins/gettext
SUBDIRS =
plugins_LTLIBRARIES = libhtmlim.la
INCLUDES = $(LIBFREETYPE_CFLAGS) $(XML_CFLAGS) $(all_includes)
diff -Nur scribus-1.2.1-orig/scribus/plugins/gettext/sxwim/Makefile.in scribus-1.2.1/scribus/plugins/gettext/sxwim/Makefile.in
--- scribus-1.2.1-orig/scribus/plugins/gettext/sxwim/Makefile.in 2005-01-08 10:10:04.000000000 +0100
+++ scribus-1.2.1/scribus/plugins/gettext/sxwim/Makefile.in 2005-02-03 01:04:28.093931752 +0100
@@ -303,7 +303,7 @@
target_vendor = @target_vendor@
x_includes = @x_includes@
x_libraries = @x_libraries@
-pluginsdir = $(prefix)/lib/scribus/plugins/gettext
+pluginsdir = $(libdir)/scribus/plugins/gettext
SUBDIRS =
plugins_LTLIBRARIES = libsxwimplugin.la
INCLUDES = $(LIBFREETYPE_CFLAGS) $(XML_CFLAGS) $(all_includes)
Index: scribus.spec
===================================================================
RCS file: /cvs/extras/devel/scribus/scribus.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- scribus.spec 9 Jan 2005 19:29:45 -0000 1.7
+++ scribus.spec 9 Feb 2005 01:54:43 -0000 1.8
@@ -1,13 +1,14 @@
Name: scribus
Version: 1.2.1
-Release: 1
-Summary: DeskTop Publishing app in QT.
+Release: 3
+Summary: DeskTop Publishing application written in Qt
Group: Applications/Productivity
License: GPL
URL: http://www.scribus.net/
Source0: http://www.scribus.org.uk/downloads/1.2.1/scribus-1.2.1.tar.bz2
Source1: scribus.xml
+Patch0: scribus-x86_64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cups-devel
@@ -21,7 +22,7 @@
BuildRequires: libxml2-devel
BuildRequires: openssl-devel
BuildRequires: python-devel >= 2.2
-BuildRequires: qt-devel >= 1:3.0.5
+BuildRequires: qt-devel >= 1:3.3
BuildRequires: zlib-devel
Requires: ghostscript >= 7.07
Requires: python >= 2.2
@@ -55,7 +56,8 @@
%prep
-%setup -q
+%setup -q
+%patch -p1 -b .x86_64
%build
@@ -114,6 +116,12 @@
%changelog
+* Sun Feb 06 2005 Phillip Compton - 1.2.1-3
+- Bumped BR on qt-devel to 3.3.
+
+* Thu Feb 3 2005 Michael Schwendt - 1.2.1-2
+- Fix x86_64 build and summary.
+
* Sun Jan 09 2005 Phillip Compton - 1.2.1-1
- 1.2.1.
From fedora-extras-commits at redhat.com Wed Feb 9 02:03:18 2005
From: fedora-extras-commits at redhat.com (Phillip Compton (pcompton))
Date: Tue, 8 Feb 2005 21:03:18 -0500
Subject: devel/scribus-templates .cvsignore, 1.2, 1.3 scribus-templates.spec,
1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200502090203.j1923IaU004372@cvs-int.fedora.redhat.com>
Author: pcompton
Update of /cvs/extras/devel/scribus-templates
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4366
Modified Files:
.cvsignore scribus-templates.spec sources
Log Message:
scribus-templates 1.2.1
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/scribus-templates/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 05:20:02 -0000 1.2
+++ .cvsignore 9 Feb 2005 02:03:15 -0000 1.3
@@ -1 +1 @@
-scribus-temp-all-1.2.tar.bz2
+scribus-temp-all-1.2.1.tar.bz2
Index: scribus-templates.spec
===================================================================
RCS file: /cvs/extras/devel/scribus-templates/scribus-templates.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scribus-templates.spec 10 Dec 2004 22:03:11 -0000 1.3
+++ scribus-templates.spec 9 Feb 2005 02:03:15 -0000 1.4
@@ -1,15 +1,15 @@
Name: scribus-templates
-Version: 1.2
-Release: 4
+Version: 1.2.1
+Release: 1
Summary: This package includes additional templates for Scribus.
Group: Applications/Productivity
License: GPL
URL: http://www.scribus.net
-Source0: http://www.scribus.org.uk/downloads/1.2/scribus-temp-all-1.2.tar.bz2
+Source0: http://www.scribus.org.uk/downloads/1.2.1/scribus-temp-all-1.2.1.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: scribus >= 1.2
+Requires: scribus >= 1.2.1
BuildArch: noarch
@@ -19,12 +19,10 @@
%prep
-%setup -q -n scribus-temp-all-%{version}
+%setup -q
%build
-sed -i "s/Devel Templates/Newsletters/g;" templates/textbased/template.xml
-sed -i "s/Devel Templates/PDF Presentations/g;" templates/presentation/template.xml
%configure
make %{?_smp_mflags}
@@ -45,6 +43,9 @@
%changelog
+* Sun Feb 06 2005 Phillip Compton - 1.2.1-1
+- 1.2.1.
+
* Thu Nov 11 2004 Phillip Compton - 1.2-0.fdr.4
- Clean up spec/Bump Telease.
Index: sources
===================================================================
RCS file: /cvs/extras/devel/scribus-templates/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 05:20:02 -0000 1.2
+++ sources 9 Feb 2005 02:03:15 -0000 1.3
@@ -1 +1 @@
-f93b4a8dfab66c58654deacc5c86fbeb scribus-temp-all-1.2.tar.bz2
+19d102ff16c295e29bb7a051c66c2c58 scribus-temp-all-1.2.1.tar.bz2
From fedora-extras-commits at redhat.com Wed Feb 9 02:08:59 2005
From: fedora-extras-commits at redhat.com (Phillip Compton (pcompton))
Date: Tue, 8 Feb 2005 21:08:59 -0500
Subject: devel/gramps .cvsignore, 1.4, 1.5 gramps.spec, 1.3, 1.4 sources, 1.4,
1.5
Message-ID: <200502090208.j1928xuc004419@cvs-int.fedora.redhat.com>
Author: pcompton
Update of /cvs/extras/devel/gramps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4411
Modified Files:
.cvsignore gramps.spec sources
Log Message:
gramps 1.0.10
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/gramps/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 28 Nov 2004 20:07:09 -0000 1.4
+++ .cvsignore 9 Feb 2005 02:08:57 -0000 1.5
@@ -1 +1 @@
-gramps-1.0.8.tar.gz
+gramps-1.0.10.tar.gz
Index: gramps.spec
===================================================================
RCS file: /cvs/extras/devel/gramps/gramps.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gramps.spec 28 Nov 2004 20:07:09 -0000 1.3
+++ gramps.spec 9 Feb 2005 02:08:57 -0000 1.4
@@ -1,12 +1,12 @@
Name: gramps
-Version: 1.0.8
-Release: 3
+Version: 1.0.10
+Release: 1
Summary: Genealogical Research and Analysis Management Programming System.
Group: Applications/Productivity
License: GPL
URL: http://gramps.sourceforge.net/
-Source0: http://download.sourceforge.net/gramps/gramps-1.0.8.tar.gz
+Source0: http://download.sourceforge.net/gramps/gramps-1.0.10.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -86,9 +86,12 @@
%{_datadir}/pixmaps/*
%{_libdir}/gramps/
%{_mandir}/man1/*
-
+%exclude %{_datadir}/%{name}.desktop
%changelog
+* Sun Feb 06 2005 Phillip Compton
Author: pcompton
Update of /cvs/extras/devel/meld
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4520
Modified Files:
.cvsignore meld.spec sources
Log Message:
meld 0.9.5
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/meld/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 8 Nov 2004 04:53:23 -0000 1.3
+++ .cvsignore 9 Feb 2005 02:29:21 -0000 1.4
@@ -1 +1 @@
-meld-0.9.4.1.tar.bz2
+meld-0.9.5.tar.bz2
Index: meld.spec
===================================================================
RCS file: /cvs/extras/devel/meld/meld.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- meld.spec 10 Dec 2004 22:03:07 -0000 1.5
+++ meld.spec 9 Feb 2005 02:29:21 -0000 1.6
@@ -1,12 +1,12 @@
Name: meld
-Version: 0.9.4.1
-Release: 3
+Version: 0.9.5
+Release: 1
Summary: Visual diff and merge tool.
Group: Development/Tools
License: GPL
URL: http://meld.sourceforge.net/
-Source0: http://ftp.gnome.org/pub/gnome/sources/meld/0.9/meld-0.9.4.1.tar.bz2
+Source0: http://ftp.gnome.org/pub/gnome/sources/meld/0.9/meld-0.9.5.tar.bz2
Source1: meld
Patch0: desktop.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,8 +49,6 @@
install -p -D -m0644 glade2/*.glade* ${RPM_BUILD_ROOT}%{_datadir}/meld/glade2/
install -p -D -m0644 glade2/pixmaps/* ${RPM_BUILD_ROOT}%{_datadir}/meld/glade2/pixmaps/
install -p -D -m0644 glade2/pixmaps/icon.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/meld.png
-install -p -D -m0644 manual/manual.html ${RPM_BUILD_ROOT}%{_datadir}/meld/manual/manual.html
-install -p -D -m0644 manual/stylesheet.css ${RPM_BUILD_ROOT}%{_datadir}/meld/manual/stylesheet.css
install -p -D -m0644 po/*.po ${RPM_BUILD_ROOT}%{_datadir}/meld/po/
install -p -D -m0755 %{SOURCE1} ${RPM_BUILD_ROOT}%{_bindir}/meld
@@ -66,7 +64,7 @@
%files
%defattr(-,root,root,-)
-%doc AUTHORS COPYING TODO.txt
+%doc AUTHORS COPYING
%{_bindir}/meld
%{_datadir}/meld
%{_datadir}/applications/fedora-meld.desktop
@@ -74,6 +72,9 @@
%changelog
+* Sun Feb 06 2005 Phillip Compton - 0.9.5-1
+- 0.9.5.
+
* Thu Nov 11 2004 Phillip Compton - 0.9.4.1-0.fdr.3
- Clean up spec/Bump release.
Index: sources
===================================================================
RCS file: /cvs/extras/devel/meld/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 8 Nov 2004 04:53:23 -0000 1.3
+++ sources 9 Feb 2005 02:29:21 -0000 1.4
@@ -1 +1 @@
-cd5f02e084529c581ce52a22647ca4dc meld-0.9.4.1.tar.bz2
+dc86bf6f5ed1887da6a28ac1d91eb78d meld-0.9.5.tar.bz2
From fedora-extras-commits at redhat.com Wed Feb 9 02:35:06 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 8 Feb 2005 21:35:06 -0500
Subject: rpms/opensc/devel opensc.spec,1.2,1.3
Message-ID: <200502090235.j192Z651004571@cvs-int.fedora.redhat.com>
Author: mschwendt
Update of /cvs/extras/rpms/opensc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4565
Modified Files:
opensc.spec
Log Message:
More multi-lib fixes needed.
Index: opensc.spec
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/opensc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- opensc.spec 8 Feb 2005 23:31:22 -0000 1.2
+++ opensc.spec 9 Feb 2005 02:35:04 -0000 1.3
@@ -69,6 +69,9 @@
iconv -f iso-8859-1 -t utf-8 $file > $file.utf-8 ; mv $file.utf-8 $file
done
sh ./bootstrap # for patch0
+# Substitute hardcoded 'lib' in OpenSSL checks for multi-lib platforms.
+sed -i -e 's!/lib/libcrypto!/%{_lib}/libcrypto!g' configure
+sed -i -e 's!openssldir/lib !openssldir/%{_lib} !g' configure
%build
@@ -177,6 +180,7 @@
%changelog
* Wed Feb 9 2005 Michael Schwendt - 0.9.4-2
+- Substitute hardcoded 'lib' in OpenSSL checks for multi-lib platforms.
- Use --with-plugin-dir instead of --with-plugin-path (fixes x86_64).
* Thu Feb 3 2005 Ville Skytt?? - 0.9.4-1
From fedora-extras-commits at redhat.com Wed Feb 9 03:27:15 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 8 Feb 2005 22:27:15 -0500
Subject: rpms/mhash/devel mhash.spec,1.6,1.7 sources,1.3,1.4
Message-ID: <200502090327.j193RFId005335@cvs-int.fedora.redhat.com>
Author: mschwendt
Update of /cvs/extras/rpms/mhash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5329
Modified Files:
mhash.spec sources
Log Message:
Version update
Index: mhash.spec
===================================================================
RCS file: /cvs/extras/rpms/mhash/devel/mhash.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mhash.spec 10 Dec 2004 22:03:07 -0000 1.6
+++ mhash.spec 9 Feb 2005 03:27:13 -0000 1.7
@@ -1,12 +1,12 @@
-Summary: Thread-safe hash algorithms library.
+Summary: Thread-safe hash algorithms library
Name: mhash
-Version: 0.9.1
+Version: 0.9.2
Release: 1
Epoch: 0
URL: http://mhash.sourceforge.net/
License: LGPL
Group: System Environment/Libraries
-Source: http://download.sourceforge.net/mhash/mhash-0.9.1.tar.gz
+Source: http://download.sourceforge.net/mhash/mhash-%{version}.tar.bz2
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
Provides: libmhash = %{epoch}:%{version}-%{release}
@@ -19,13 +19,13 @@
message authentication, following RFC 2104. In the later versions
some key generation algorithms, which use hash algorithms, have been
added. Currently, the library supports the algorithms: SHA1, GOST,
-HAVAL256, HAVAL224, HAVAL192, HAVAL160, HAVAL128, MD5, MD4,
+HAVAL256, HAVAL224, HAVAL192, HAVAL160, HAVAL128, MD5, MD4, MD2,
RIPEMD128/160/256/320, TIGER, TIGER160, TIGER128, SHA224/384/512,
-Whirlpool, CRC32B and CRC32 checksums.
+Whirlpool, SNEFRU128/256, CRC32B and CRC32 checksums.
%package -n %{name}-devel
-Summary: Header files and libraries for developing apps which use mhash.
+Summary: Header files and libraries for developing apps which use mhash
Group: Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
Provides: libmhash-devel = %{epoch}:%{version}-%{release}
@@ -67,7 +67,7 @@
%files -n %{name}-devel
%defattr(-,root,root,-)
-%doc ChangeLog ./doc/*.txt ./doc/*.html ./doc/*.c ./doc/skid2-authentication
+%doc ChangeLog ./doc/*.txt ./doc/*.c ./doc/skid2-authentication
%{_includedir}/*.h
%{_libdir}/*.a
%{_libdir}/*.so
@@ -76,6 +76,9 @@
%changelog
+* Wed Jan 12 2005 Michael Schwendt - 0:0.9.2-1
+- Update to 0.9.2.
+
* Sun Apr 18 2004 Michael Schwendt - 0:0.9.1-0.fdr.1
- Update to 0.9.1.
- Add EVR to virtual provides.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mhash/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 8 Nov 2004 04:52:10 -0000 1.3
+++ sources 9 Feb 2005 03:27:13 -0000 1.4
@@ -1 +1 @@
-8ade81ae33ccbf75e096c1baeecfd153 mhash-0.9.1.tar.gz
+507e0034985eee6364d404bfc761ee02 mhash-0.9.2.tar.bz2
From fedora-extras-commits at redhat.com Wed Feb 9 06:49:03 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Wed, 9 Feb 2005 01:49:03 -0500
Subject: rpms/perl-Razor-Agent/devel .cvsignore, 1.2,
1.3 perl-Razor-Agent.spec, 1.3, 1.4 sources, 1.2,
1.3 razor-agents-2.40-manerror.patch, 1.1, NONE
Message-ID: <200502090649.j196n3hW008824@cvs-int.fedora.redhat.com>
Author: wtogami
Update of /cvs/extras/rpms/perl-Razor-Agent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8812
Modified Files:
.cvsignore perl-Razor-Agent.spec sources
Removed Files:
razor-agents-2.40-manerror.patch
Log Message:
2.67
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Razor-Agent/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 05:07:35 -0000 1.2
+++ .cvsignore 9 Feb 2005 06:49:01 -0000 1.3
@@ -1 +1,2 @@
razor-agents-2.40.tar.gz
+razor-agents-2.67.tar.gz
Index: perl-Razor-Agent.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Razor-Agent/devel/perl-Razor-Agent.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Razor-Agent.spec 10 Dec 2004 22:03:09 -0000 1.3
+++ perl-Razor-Agent.spec 9 Feb 2005 06:49:01 -0000 1.4
@@ -2,16 +2,15 @@
%define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)
Name: perl-Razor-Agent
-Version: 2.40
-Release: 2
+Version: 2.67
+Release: 0.FC3
Epoch: 0
Summary: Use a Razor catalogue server to filter spam messages
Group: Applications/Internet
License: Artistic
URL: http://razor.sourceforge.net/
-Source0: http://dl.sf.net/razor/razor-agents-2.40.tar.gz
-Patch0: razor-agents-2.40-manerror.patch
+Source0: http://dl.sf.net/razor/razor-agents-2.67.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# autodep misses this, razor-admin -register fails
@@ -40,7 +39,7 @@
%prep
%setup -q -n razor-agents-%{version}
# don't use -b for backup files, because these would be installed, too
-%patch0 -p1
+#%patch0 -p1
%build
@@ -94,6 +93,9 @@
%changelog
+* Sun Feb 06 2005 Warren Togami 0:2.67-0.FC3
+- 2.67
+
* Mon Mar 29 2004 Warren Togami 0:2.40-0.fdr.2
- #1428 man error patch0
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Razor-Agent/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 05:07:35 -0000 1.2
+++ sources 9 Feb 2005 06:49:01 -0000 1.3
@@ -1 +1 @@
-ca1a340e13464661aa0efebd869fcebc razor-agents-2.40.tar.gz
+0118b6030ea261ea85e73a55cc7eac8e razor-agents-2.67.tar.gz
--- razor-agents-2.40-manerror.patch DELETED ---
From fedora-extras-commits at redhat.com Wed Feb 9 06:54:02 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Wed, 9 Feb 2005 01:54:02 -0500
Subject: rpms/perl-Razor-Agent/FC-2 perl-Razor-Agent.spec, 1.2, 1.3 sources,
1.2, 1.3 razor-agents-2.40-manerror.patch, 1.1, NONE
Message-ID: <200502090654.j196s2tm008899@cvs-int.fedora.redhat.com>
Author: wtogami
Update of /cvs/extras/rpms/perl-Razor-Agent/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8887
Modified Files:
perl-Razor-Agent.spec sources
Removed Files:
razor-agents-2.40-manerror.patch
Log Message:
2.67
Index: perl-Razor-Agent.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Razor-Agent/FC-2/perl-Razor-Agent.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Razor-Agent.spec 8 Nov 2004 05:07:41 -0000 1.2
+++ perl-Razor-Agent.spec 9 Feb 2005 06:54:00 -0000 1.3
@@ -2,16 +2,15 @@
%define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)
Name: perl-Razor-Agent
-Version: 2.40
-Release: 0.fdr.2.2
+Version: 2.67
+Release: 0.FC2
Epoch: 0
Summary: Use a Razor catalogue server to filter spam messages
Group: Applications/Internet
License: Artistic
URL: http://razor.sourceforge.net/
-Source0: http://dl.sf.net/razor/razor-agents-2.40.tar.gz
-Patch0: razor-agents-2.40-manerror.patch
+Source0: http://dl.sf.net/razor/razor-agents-2.67.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# autodep misses this, razor-admin -register fails
@@ -40,7 +39,7 @@
%prep
%setup -q -n razor-agents-%{version}
# don't use -b for backup files, because these would be installed, too
-%patch0 -p1
+#%patch0 -p1
%build
@@ -94,6 +93,9 @@
%changelog
+* Sun Feb 06 2005 Warren Togami 0:2.67-0.FC2
+- 2.67
+
* Mon Mar 29 2004 Warren Togami 0:2.40-0.fdr.2
- #1428 man error patch0
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Razor-Agent/FC-2/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 05:07:35 -0000 1.2
+++ sources 9 Feb 2005 06:54:00 -0000 1.3
@@ -1 +1 @@
-ca1a340e13464661aa0efebd869fcebc razor-agents-2.40.tar.gz
+0118b6030ea261ea85e73a55cc7eac8e razor-agents-2.67.tar.gz
--- razor-agents-2.40-manerror.patch DELETED ---
From fedora-extras-commits at redhat.com Wed Feb 9 07:51:13 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 9 Feb 2005 02:51:13 -0500
Subject: rpms/libfwbuilder/devel libfwbuilder.spec,1.2,1.3
Message-ID: <200502090751.j197pDpV009672@cvs-int.fedora.redhat.com>
Author: scop
Update of /cvs/extras/rpms/libfwbuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9666
Modified Files:
libfwbuilder.spec
Log Message:
Remove extra quotes from Group tag in -devel.
Index: libfwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/libfwbuilder.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libfwbuilder.spec 23 Jan 2005 05:43:00 -0000 1.2
+++ libfwbuilder.spec 9 Feb 2005 07:51:11 -0000 1.3
@@ -1,7 +1,7 @@
Name: libfwbuilder
Summary: Firewall Builder API
Version: 2.0.5
-Release: 2
+Release: 3
License: GPL
Group: System Environment/Libraries
Url: http://www.fwbuilder.org/
@@ -26,7 +26,7 @@
%package devel
Summary: Firewall Builder API Libraries and Header Files
-Group: "Development/Libraries"
+Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: libxslt-devel
Requires: openssl-devel
@@ -70,6 +70,9 @@
%changelog
+* Sun Feb 6 2005 Ville Skytt?? - 2.0.5-3
+- Remove extra quotes from Group tag in -devel.
+
* Sat Jan 22 2005 Warren Togami 2.0.5-2
- spec cleanup
From fedora-extras-commits at redhat.com Wed Feb 9 10:19:00 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 9 Feb 2005 05:19:00 -0500
Subject: rpms/udftools - New directory
Message-ID: <200502091019.j19AJ06d012891@cvs-int.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/udftools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12884/udftools
Log Message:
Directory /cvs/extras/rpms/udftools added to the repository
From fedora-extras-commits at redhat.com Wed Feb 9 10:19:00 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 9 Feb 2005 05:19:00 -0500
Subject: rpms/udftools/devel - New directory
Message-ID: <200502091019.j19AJ0WL012894@cvs-int.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/udftools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12884/udftools/devel
Log Message:
Directory /cvs/extras/rpms/udftools/devel added to the repository
From fedora-extras-commits at redhat.com Wed Feb 9 10:19:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 9 Feb 2005 05:19:19 -0500
Subject: rpms/udftools Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200502091019.j19AJJmb012955@cvs-int.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/udftools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12944
Added Files:
Makefile import.log
Log Message:
Setup of module udftools
--- NEW FILE Makefile ---
# Top level Makefile for module udftools
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like 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 Feb 9 10:19:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 9 Feb 2005 05:19:19 -0500
Subject: rpms/udftools/devel .cvsignore, NONE, 1.1 Makefile, NONE,
1.1 sources, NONE, 1.1
Message-ID: <200502091019.j19AJJj8012958@cvs-int.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/udftools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12944/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module udftools
--- NEW FILE .cvsignore ---
***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'
--- NEW FILE sources ---
From fedora-extras-commits at redhat.com Wed Feb 9 10:20:03 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 9 Feb 2005 05:20:03 -0500
Subject: rpms/udftools import.log,1.1,1.2
Message-ID: <200502091020.j19AK3i1013059@cvs-int.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/udftools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13050
Modified Files:
import.log
Log Message:
auto-import udftools-1.0.0b3-1 on branch devel from udftools-1.0.0b3-1.src.rpm
Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/udftools/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log 9 Feb 2005 10:19:17 -0000 1.1
+++ import.log 9 Feb 2005 10:20:01 -0000 1.2
@@ -0,0 +1 @@
+udftools-1_0_0b3-1:HEAD:udftools-1.0.0b3-1.src.rpm:1107944391
From fedora-extras-commits at redhat.com Wed Feb 9 10:20:03 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 9 Feb 2005 05:20:03 -0500
Subject: rpms/udftools/devel udftools-1.0.0b3.patch, NONE, 1.1 udftools.spec,
NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200502091020.j19AK3q8013063@cvs-int.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/udftools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13050/devel
Modified Files:
.cvsignore sources
Added Files:
udftools-1.0.0b3.patch udftools.spec
Log Message:
auto-import udftools-1.0.0b3-1 on branch devel from udftools-1.0.0b3-1.src.rpm
udftools-1.0.0b3.patch:
--- NEW FILE udftools-1.0.0b3.patch ---
From: Peter Osterlund
Subject: Re: [RFC][PATCH] Control pktcdvd with an auxiliary character device
To: linux-kernel at vger.kernel.org
Cc: Christoph Hellwig , Arnd Bergmann ,
Jens Axboe , Andrew Morton
Date: Wed Jul 14 02:17:27 2004 +0200
Peter Osterlund writes:
> Peter Osterlund writes:
>
> > Christoph Hellwig writes:
> >
> > > On Sun, Jul 11, 2004 at 01:20:45AM +0200, Arnd Bergmann wrote:
> > > > These are actually incorrect definitions since the ioctl argument is
> > > > not a pointer to unsigned int but instead just an int. However, that's
> > > > too late to fix without breaking the existing tools.
> > >
> > > The tools need to change anyway to get away from the broken behaviour to
> > > issue in ioctl on the actual block device to bind it..
> >
> > OK, I'll create a patch that gets rid of the ioctl interface and uses
> > an auxiliary character device instead to control device bindings.
>
> Here is a patch for 2.6.7-mm7 that does that. The driver creates a
> misc character device and bind/unbind of the block devices are
> controlled by ioctl commands on the char device.
>
> This patch needs corresponding changes in the pktsetup user space
> program. I'll post a patch for pktsetup as a separate message.
And here is a patch for udftools-1.0.0b3 that updates the pktsetup
program to make it able to use the character device for block device
setup/teardown.
---
udftools-1.0.0b3-petero/pktsetup/pktsetup.c | 245 +++++++++++++++++++++++++++-
1 files changed, 238 insertions(+), 7 deletions(-)
diff -puN pktsetup/pktsetup.c~pktsetup-char-dev pktsetup/pktsetup.c
--- udftools-1.0.0b3/pktsetup/pktsetup.c~pktsetup-char-dev 2004-07-12 19:57:51.000000000 +0200
+++ udftools-1.0.0b3-petero/pktsetup/pktsetup.c 2004-07-14 00:34:02.471317888 +0200
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1999,2000 Jens Axboe
+ * Copyright (c) 2004 Peter Osterlund
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -19,6 +20,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -33,8 +35,33 @@
#define PACKET_SETUP_DEV _IOW('X', 1, unsigned int)
#define PACKET_TEARDOWN_DEV _IOW('X', 2, unsigned int)
#endif
+#ifndef PACKET_CTRL_CMD
+#define PACKET_CTRL_CMD _IOWR('X', 1, struct pkt_ctrl_command)
+#endif
+
+#define MAJOR(dev) ((dev & 0xfff00) >> 8)
+#define MINOR(dev) ((dev & 0xff) | ((dev >> 12) & 0xfff00))
+#define MKDEV(ma,mi) ((mi & 0xff) | (ma << 8) | ((mi & ~0xff) << 12))
+
+#define MISC_MAJOR 10
+#define CTL_DIR "/dev/pktcdvd"
+#define CTL_DEV "control"
+
+#define PKT_CTRL_CMD_SETUP 0
+#define PKT_CTRL_CMD_TEARDOWN 1
+#define PKT_CTRL_CMD_STATUS 2
+
+struct pkt_ctrl_command {
+ __u32 command; /* in: Setup, teardown, status */
+ __u32 dev_index; /* in/out: Device index */
+ __u32 dev; /* in/out: Device nr for cdrw device */
+ __u32 pkt_dev; /* out: Device nr for packet device */
+ __u32 num_devices; /* out: Largest device index + 1 */
+ __u32 padding;
+};
+
-int init_cdrom(int fd)
+static int init_cdrom(int fd)
{
if (ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT) < 0) {
perror("drive not ready\n");
@@ -54,7 +81,7 @@ int init_cdrom(int fd)
return 0;
}
-void setup_dev(char *pkt_device, char *device, int rem)
+static void setup_dev(char *pkt_device, char *device, int rem)
{
int pkt_fd, dev_fd, cmd;
@@ -88,29 +115,233 @@ void setup_dev(char *pkt_device, char *d
close(pkt_fd);
}
-int usage(void)
+static int usage(void)
{
- printf("pktsetup /dev/pktcdvd0 /dev/cdrom\tsetup device\n");
- printf("pktsetup -d /dev/pktcdvd0\t\ttear down device\n");
+ printf("For pktcdvd < 0.2.0:\n");
+ printf(" pktsetup /dev/pktcdvd0 /dev/cdrom setup device\n");
+ printf(" pktsetup -d /dev/pktcdvd0 tear down device\n");
+ printf("For pktcdvd >= 0.2.0:\n");
+ printf(" pktsetup dev_name /dev/cdrom setup device\n");
+ printf(" pktsetup -d dev_name tear down device\n");
+ printf(" pktsetup -d major:minor tear down device\n");
+ printf(" pktsetup -s show device mappings\n");
return 1;
}
+/*
+ * Find the minor device number for the pktcdvd control device.
+ */
+static int get_misc_minor(void)
+{
+ int minor;
+ char name[64];
+ FILE *f;
+
+ if ((f = fopen("/proc/misc", "r")) == NULL)
+ return -1;
+ while (fscanf(f, " %d %64s", &minor, name) == 2) {
+ if (strcmp(name, "pktcdvd") == 0) {
+ fclose(f);
+ return minor;
+ }
+ }
+ fclose(f);
+ return -1;
+}
+
+static const char *pkt_dev_name(const char *dev)
+{
+ static char buf[128];
+ snprintf(buf, sizeof(buf), "%s/%s", CTL_DIR, dev);
+ return buf;
+}
+
+static void create_ctl_dev(void)
+{
+ int misc_minor;
+ struct stat stat_buf;
+ int dev;
+
+ if ((misc_minor = get_misc_minor()) < 0) {
+ system("/sbin/modprobe pktcdvd");
+ misc_minor = get_misc_minor();
+ }
+ if (misc_minor < 0) {
+ fprintf(stderr, "Can't find pktcdvd character device\n");
+ return;
+ }
+ dev = MKDEV(MISC_MAJOR, misc_minor);
+
+ if ((stat(pkt_dev_name(CTL_DEV), &stat_buf) >= 0) &&
+ S_ISCHR(stat_buf.st_mode) && (stat_buf.st_rdev == dev))
+ return; /* Already set up */
+
+ mkdir(CTL_DIR, 0755);
+ unlink(pkt_dev_name(CTL_DEV));
+ mknod(pkt_dev_name(CTL_DEV), S_IFCHR | 0644, dev);
+}
+
+static int remove_stale_dev_node(int ctl_fd, char *devname)
+{
+ struct stat stat_buf;
+ int i, dev;
+ struct pkt_ctrl_command c;
+
+ if (stat(pkt_dev_name(devname), &stat_buf) < 0)
+ return 0;
+ if (!S_ISBLK(stat_buf.st_mode))
+ return 1;
+ dev = stat_buf.st_rdev;
+ memset(&c, 0, sizeof(struct pkt_ctrl_command));
+ for (i = 0; ; i++) {
+ c.command = PKT_CTRL_CMD_STATUS;
+ c.dev_index = i;
+ if (ioctl(ctl_fd, PACKET_CTRL_CMD, &c) < 0) {
+ perror("ioctl");
+ return 1;
+ }
+ if (i >= c.num_devices)
+ break;
+ if (c.pkt_dev == dev)
+ return 1; /* busy */
+ }
+ unlink(pkt_dev_name(devname));
+ return 0;
+}
+
+static void setup_dev_chardev(char *pkt_device, char *device, int rem)
+{
+ struct pkt_ctrl_command c;
+ struct stat stat_buf;
+ int ctl_fd, dev_fd;
+
+ memset(&c, 0, sizeof(struct pkt_ctrl_command));
+
+ create_ctl_dev();
+ if ((ctl_fd = open(pkt_dev_name(CTL_DEV), O_RDONLY)) < 0) {
+ perror("ctl open");
+ return;
+ }
+
+ if (!rem) {
+ if ((dev_fd = open(device, O_RDONLY | O_NONBLOCK)) == -1) {
+ perror("open cd-rom");
+ goto out_close;
+ }
+ if (init_cdrom(dev_fd)) {
+ close(dev_fd);
+ goto out_close;
+ }
+ close(dev_fd);
+
+ if (stat(device, &stat_buf) < 0) {
+ perror("stat cd-rom");
+ goto out_close;
+ }
+ if (!S_ISBLK(stat_buf.st_mode)) {
+ fprintf(stderr, "Not a block device\n");
+ goto out_close;
+ }
+ c.command = PKT_CTRL_CMD_SETUP;
+ c.dev = stat_buf.st_rdev;
+
+ if (remove_stale_dev_node(ctl_fd, pkt_device) != 0) {
+ fprintf(stderr, "Device node '%s' already in use\n", pkt_device);
+ goto out_close;
+ }
+ if (ioctl(ctl_fd, PACKET_CTRL_CMD, &c) < 0) {
+ perror("ioctl");
+ goto out_close;
+ }
+ mknod(pkt_dev_name(pkt_device), S_IFBLK | 0640, c.pkt_dev);
+ } else {
+ int major, minor, remove_node;
+
+ if ((stat(pkt_dev_name(pkt_device), &stat_buf) >= 0) &&
+ S_ISBLK(stat_buf.st_mode)) {
+ major = MAJOR(stat_buf.st_rdev);
+ minor = MINOR(stat_buf.st_rdev);
+ remove_node = 1;
+ } else if (sscanf(pkt_device, "%d:%d", &major, &minor) == 2) {
+ remove_node = 0;
+ } else {
+ fprintf(stderr, "Can't find major/minor numbers\n");
+ goto out_close;
+ }
+
+ c.command = PKT_CTRL_CMD_TEARDOWN;
+ c.pkt_dev = MKDEV(major, minor);
+ if (ioctl(ctl_fd, PACKET_CTRL_CMD, &c) < 0) {
+ perror("ioctl");
+ goto out_close;
+ }
+ if (remove_node)
+ unlink(pkt_dev_name(pkt_device));
+ }
+
+out_close:
+ close(ctl_fd);
+}
+
+static void show_mappings(void)
+{
+ struct pkt_ctrl_command c;
+ int ctl_fd, i;
+
+ memset(&c, 0, sizeof(struct pkt_ctrl_command));
+
+ create_ctl_dev();
+ if ((ctl_fd = open(pkt_dev_name(CTL_DEV), O_RDONLY)) < 0) {
+ perror("ctl open");
+ return;
+ }
+
+ for (i = 0; ; i++) {
+ c.command = PKT_CTRL_CMD_STATUS;
+ c.dev_index = i;
+ if (ioctl(ctl_fd, PACKET_CTRL_CMD, &c) < 0) {
+ perror("ioctl");
+ goto out_close;
+ }
+ if (i >= c.num_devices)
+ break;
+ if (c.dev) {
+ printf("%2d : %d:%d -> %d:%d\n",
+ i, MAJOR(c.pkt_dev), MINOR(c.pkt_dev),
+ MAJOR(c.dev), MINOR(c.dev));
+ }
+ }
+
+out_close:
+ close(ctl_fd);
+}
+
int main(int argc, char **argv)
{
int rem = 0, c;
+ char *pkt_device;
+ char *device;
if (argc == 1)
return usage();
- while ((c = getopt(argc, argv, "d")) != EOF) {
+ while ((c = getopt(argc, argv, "ds?")) != EOF) {
switch (c) {
case 'd':
rem = 1;
break;
+ case 's':
+ show_mappings();
+ return 0;
default:
return usage();
}
}
- setup_dev(argv[optind], argv[optind + 1], rem);
+ pkt_device = argv[optind];
+ device = argv[optind + 1];
+ if (strchr(pkt_device, '/'))
+ setup_dev(pkt_device, device, rem);
+ else
+ setup_dev_chardev(pkt_device, device, rem);
return 0;
}
_
--
Peter Osterlund - petero2 at telia.com
http://w1.894.telia.com/~u89404340
--- NEW FILE udftools.spec ---
Summary: Linux UDF Filesystem userspace utilities
Name: udftools
Version: 1.0.0b3
Release: 1
License: GPL
Group: Applications/Archiving
URL: http://sourceforge.net/projects/linux-udf/
Source: http://dl.sf.net/linux-udf/udftools-%{version}.tar.gz
Patch: udftools-1.0.0b3.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: readline-devel
%description
Linux UDF Filesystem userspace utilities.
%prep
%setup
%patch -p1
%build
%configure
%{__make} %{_smp_mflags}
%install
%{__rm} -rf %{buildroot}
%makeinstall
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-, root, root, 0755)
%doc AUTHORS ChangeLog COPYING
%{_bindir}/*
%{_libdir}/libudffs.a
%exclude %{_libdir}/libudffs.la
%{_mandir}/man?/*
%changelog
* Mon Feb 7 2005 Matthias Saou 1.0.0b3-1
- Initial RPM release, based on spec file from John Treacy.
- Exclude .la file.
- Remove unneeded /sbin/ldconfig calls (only a static lib for now).
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/udftools/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 9 Feb 2005 10:19:17 -0000 1.1
+++ .cvsignore 9 Feb 2005 10:20:01 -0000 1.2
@@ -0,0 +1 @@
+udftools-1.0.0b3.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/udftools/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 9 Feb 2005 10:19:17 -0000 1.1
+++ sources 9 Feb 2005 10:20:01 -0000 1.2
@@ -0,0 +1 @@
+2f491ddd63f31040797236fe18db9e60 udftools-1.0.0b3.tar.gz
From fedora-extras-commits at redhat.com Wed Feb 9 14:11:01 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 9 Feb 2005 09:11:01 -0500
Subject: rpms/libgcrypt1/devel libgcrypt-1.1.12.tar.gz.sig, 1.1,
NONE libgcrypt-1.1.7-splint.patch, 1.1, NONE libgcrypt1.spec,
1.2, NONE Makefile, 1.2, NONE sources, 1.2,
NONE wk@g10code.com, 1.1, NONE
Message-ID: <200502091411.j19EB1EY016039@cvs-int.fedora.redhat.com>
Author: mschwendt
Update of /cvs/extras/rpms/libgcrypt1/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16033
Removed Files:
libgcrypt-1.1.12.tar.gz.sig libgcrypt-1.1.7-splint.patch
libgcrypt1.spec Makefile sources wk at g10code.com
Log Message:
Obsolete, since not needed as BR anywhere anymore.
--- libgcrypt-1.1.12.tar.gz.sig DELETED ---
--- libgcrypt-1.1.7-splint.patch DELETED ---
--- libgcrypt1.spec DELETED ---
--- Makefile DELETED ---
--- sources DELETED ---
--- wk at g10code.com DELETED ---
From fedora-extras-commits at redhat.com Wed Feb 9 14:12:32 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 9 Feb 2005 09:12:32 -0500
Subject: rpms/manedit/devel manedit-0.5.11-multilib.patch, NONE,
1.1 manedit-0.5.11-nostrip.patch, NONE, 1.1 manedit.spec, 1.6, 1.7
Message-ID: <200502091412.j19ECWQl016080@cvs-int.fedora.redhat.com>
Author: mschwendt
Update of /cvs/extras/rpms/manedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16074
Modified Files:
manedit.spec
Added Files:
manedit-0.5.11-multilib.patch manedit-0.5.11-nostrip.patch
Log Message:
x86_64 fix + enable debuginfo package
manedit-0.5.11-multilib.patch:
--- NEW FILE manedit-0.5.11-multilib.patch ---
diff -Nur manedit-0.5.11-orig/manedit/platforms.ini manedit-0.5.11/manedit/platforms.ini
--- manedit-0.5.11-orig/manedit/platforms.ini 2004-04-17 23:36:20.000000000 +0200
+++ manedit-0.5.11/manedit/platforms.ini 2005-02-09 15:02:30.899962320 +0100
@@ -104,10 +104,10 @@
PlatformSearchPathInclude = /usr/include/
PlatformSearchPathInclude = /usr/X11R6/include/
PlatformSearchPathInclude = /usr/local/include/
- PlatformSearchPathLib = /lib/
- PlatformSearchPathLib = /usr/lib/
- PlatformSearchPathLib = /usr/X11R6/lib/
- PlatformSearchPathLib = /usr/local/lib/
+ PlatformSearchPathLib = /@LIB@/
+ PlatformSearchPathLib = /usr/@LIB@/
+ PlatformSearchPathLib = /usr/X11R6/@LIB@/
+ PlatformSearchPathLib = /usr/local/@LIB@/
PlatformSearchPathEtc = /etc/
PlatformSearchPathEtc = /usr/etc/
PlatformSearchPathEtc = /usr/local/etc/
@@ -191,7 +191,7 @@
MustExist = Yes
FeatureCFLAGS = `gtk-config --cflags`
FeatureLIBS = `gtk-config --libs`
- FeatureLIB_DIR = -L/usr/X11R6/lib/
+ FeatureLIB_DIR = -L/usr/X11R6/@LIB@/
FeatureDepend = gtk-lib
DependType = Library
MustExist = Yes
manedit-0.5.11-nostrip.patch:
--- NEW FILE manedit-0.5.11-nostrip.patch ---
diff -Nur manedit-0.5.11-orig/manedit/Makefile.install.UNIX manedit-0.5.11/manedit/Makefile.install.UNIX
--- manedit-0.5.11-orig/manedit/Makefile.install.UNIX 2004-04-17 23:36:17.000000000 +0200
+++ manedit-0.5.11/manedit/Makefile.install.UNIX 2005-02-09 15:04:35.725072744 +0100
@@ -12,10 +12,10 @@
#
INSTALL = install
-INSTBINFLAGS = -m 0755 -s
+INSTBINFLAGS = -m 0755
INSTSCRFLAGS = -m 0755
INSTUIDFLAGS = -m 4755
-INSTLIBFLAGS = -m 0755 -s
+INSTLIBFLAGS = -m 0755
INSTINCFLAGS = -m 0644
INSTMANFLAGS = -m 0644
INSTCFGFLAGS = -m 0644
Index: manedit.spec
===================================================================
RCS file: /cvs/extras/rpms/manedit/devel/manedit.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- manedit.spec 17 Nov 2004 19:52:00 -0000 1.6
+++ manedit.spec 9 Feb 2005 14:12:30 -0000 1.7
@@ -1,8 +1,8 @@
Name: manedit
Version: 0.5.11
-Release: 2
+Release: 3
Epoch: 0
-Summary: GUI editor for creating man pages.
+Summary: GUI editor for creating man pages
Group: Development/Tools
License: GPL
@@ -10,6 +10,8 @@
Source0: ftp://wolfpack.twu.net/users/wolfpack/manedit-0.5.11.tar.bz2
Source1: manedit.desktop
Patch: manedit-0.5.11-bzip2.patch
+Patch1: manedit-0.5.11-nostrip.patch
+Patch2: manedit-0.5.11-multilib.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk+-devel zlib-devel desktop-file-utils bzip2-devel
@@ -24,8 +26,11 @@
%prep
%setup -q
%patch -p1 -b .bzip2
+%patch1 -p1 -b .nostrip
+%patch2 -p1 -b .multilib
perl -pi -e "s|/usr/man|%{_mandir}|" manedit/pref.c
perl -pi -e "s|/usr/man|%{_mandir}|" manedit/prefcb.c
+perl -pi -e "s|\@LIB\@|%{_lib}|" manedit/platforms.ini
%build
#manedit uses some weird configuration system
@@ -60,6 +65,10 @@
%{_datadir}/applications/*
%changelog
+* Wed Feb 9 2005 Michael Schwendt - 0:0.5.11-3
+- Add patch for multilib and substitute hardcoded 'lib' in %%prep.
+- Add patch to disable stripping.
+
* Wed Nov 17 2004 Michael Schwendt - 0:0.5.11-2
- BR bzip2-devel + patch to enable bzip2, bump release
From fedora-extras-commits at redhat.com Wed Feb 9 15:39:56 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 9 Feb 2005 10:39:56 -0500
Subject: rpms/torcs/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 torcs.spec,
1.2, 1.3 torcs-1.2.2-build.patch, 1.1, NONE
Message-ID: <200502091539.j19FduJc017434@cvs-int.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/torcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17410/torcs/devel
Modified Files:
.cvsignore sources torcs.spec
Removed Files:
torcs-1.2.2-build.patch
Log Message:
Update torcs to 1.2.3, which now builds on x86_64 and fix plib to make that possible.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torcs/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 13 Jan 2005 18:52:14 -0000 1.3
+++ .cvsignore 9 Feb 2005 15:39:54 -0000 1.4
@@ -1,6 +1,5 @@
-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
+TORCS-1.2.3-src.tgz
+TORCS-1.2.3-src-robots-base.tgz
+TORCS-1.2.3-src-robots-berniw.tgz
+TORCS-1.2.3-src-robots-bt.tgz
+TORCS-1.2.3-src-robots-olethros.tgz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torcs/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 13 Jan 2005 18:52:14 -0000 1.3
+++ sources 9 Feb 2005 15:39:54 -0000 1.4
@@ -1,6 +1,5 @@
-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
+0f1dc6a3f08e1ae9f80e118c350bb4b4 TORCS-1.2.3-src.tgz
+43d670da19adb2e4c632390611d2dc31 TORCS-1.2.3-src-robots-base.tgz
+ba4f75b0707a592cb18ea971da8c1382 TORCS-1.2.3-src-robots-berniw.tgz
+605d82faeb3d547ccb9acbbac9281ff9 TORCS-1.2.3-src-robots-bt.tgz
+2cd15c851a6f07410a4363114a5b2880 TORCS-1.2.3-src-robots-olethros.tgz
Index: torcs.spec
===================================================================
RCS file: /cvs/extras/rpms/torcs/devel/torcs.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- torcs.spec 13 Jan 2005 18:52:14 -0000 1.2
+++ torcs.spec 9 Feb 2005 15:39:54 -0000 1.3
@@ -2,23 +2,20 @@
Summary: The Open Racing Car Simulator
Name: torcs
-Version: 1.2.2
-Release: 4
+Version: 1.2.3
+Release: 1
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
+Source3: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-bt.tgz
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: gcc-c++, plib-devel >= 1.8.3, freeglut-devel
BuildRequires: libpng-devel, libjpeg-devel, zlib-devel
BuildRequires: desktop-file-utils
@@ -42,15 +39,14 @@
%prep
-%setup -a 1 -a 2 -a 3 -a 4 -a 5
-%patch -p1 -b .build
+%setup -a 1 -a 2 -a 3
# Put the drivers back where they belong
%{__mv} %{name}-%{version}/src/drivers/* src/drivers/
%build
%configure
-%{__make} %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags}"
+%{__make} %{?_smp_mflags}
%install
@@ -76,7 +72,7 @@
--dir %{buildroot}%{_datadir}/applications \
%{name}.desktop
-# We need this for proper automatic stripping to take place
+# We need this for proper automatic stripping to take place (still in 1.2.3)
find %{buildroot}%{_libdir}/%{name} -name '*.so' | xargs %{__chmod} +x
@@ -117,6 +113,11 @@
%changelog
+* Mon Feb 7 2005 Matthias Saou 1.2.3-1
+- Update to 1.2.3.
+- Remove billy and K1999 robot packages (no longer upstream).
+- Update plib requirement from plib16 to plib (1.8.x).
+
* Fri Nov 5 2004 Matthias Saou 1.2.2-4
- Add +x chmod'ing to .so files in order to get them stripped properly.
--- torcs-1.2.2-build.patch DELETED ---
From fedora-extras-commits at redhat.com Wed Feb 9 15:39:56 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 9 Feb 2005 10:39:56 -0500
Subject: rpms/torcs-data/devel .cvsignore, 1.2, 1.3 sources, 1.2,
1.3 torcs-data.spec, 1.2, 1.3
Message-ID: <200502091539.j19FduEp017440@cvs-int.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/torcs-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17410/torcs-data/devel
Modified Files:
.cvsignore sources torcs-data.spec
Log Message:
Update torcs to 1.2.3, which now builds on x86_64 and fix plib to make that possible.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torcs-data/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 13 Jan 2005 18:41:22 -0000 1.2
+++ .cvsignore 9 Feb 2005 15:39:54 -0000 1.3
@@ -1,11 +1,6 @@
-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
+TORCS-1.2.3-data.tgz
+TORCS-1.2.3-data-tracks-dirt.tgz
+TORCS-1.2.3-data-tracks-oval.tgz
+TORCS-1.2.3-data-tracks-road.tgz
+TORCS-1.2.3-data-cars-extra.tgz
+TORCS-1.2.3-data-cars-nascar.tgz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torcs-data/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 13 Jan 2005 18:41:22 -0000 1.2
+++ sources 9 Feb 2005 15:39:54 -0000 1.3
@@ -1,11 +1,6 @@
-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
+aad3396e3524dc24436225fe119a1fcf TORCS-1.2.3-data.tgz
+ff3e6b722311b637afec8087968c0958 TORCS-1.2.3-data-tracks-dirt.tgz
+f245ac621677371dec762703d681d000 TORCS-1.2.3-data-tracks-oval.tgz
+3a9409d67e2e57a260cd62fd7a60c19b TORCS-1.2.3-data-tracks-road.tgz
+143bd1dd82c22170604b7d504e1d8811 TORCS-1.2.3-data-cars-extra.tgz
+4ff4e4caabcdfe23d9cba7f50db6b87a TORCS-1.2.3-data-cars-nascar.tgz
Index: torcs-data.spec
===================================================================
RCS file: /cvs/extras/rpms/torcs-data/devel/torcs-data.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- torcs-data.spec 13 Jan 2005 18:45:38 -0000 1.2
+++ torcs-data.spec 9 Feb 2005 15:39:54 -0000 1.3
@@ -1,6 +1,6 @@
Summary: The Open Racing Car Simulator data files
Name: torcs-data
-Version: 1.2.2
+Version: 1.2.3
Release: 1
License: GPL
Group: Amusements/Games
@@ -10,12 +10,7 @@
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
+Source5: http://dl.sf.net/torcs/TORCS-%{version}-data-cars-nascar.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: torcs, %{name}-tracks = %{version}
BuildArch: noarch
@@ -83,45 +78,6 @@
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
@@ -135,37 +91,11 @@
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
+for source in %{SOURCE0} %{SOURCE1} %{SOURCE2} \
+ %{SOURCE3} %{SOURCE4} %{SOURCE5}; do
package="`basename ${source} .tgz | sed 's/TORCS-%{version}-//g'`"
mkdir -p ${package}%{_datadir}/games/torcs/
( cd ${package}%{_datadir}/games/torcs/
@@ -218,33 +148,17 @@
%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
+* Mon Feb 7 2005 Matthias Saou 1.2.3-1
+- Update to 1.2.3.
+- Removed "non-free" cars (kcendra ones, Patwo-Design and VM).
+
* Thu Feb 26 2004 Matthias Saou 1.2.2-1
-- Update to 1.2.1
+- Update to 1.2.2
- Added all new tracks : dirt, oval and road.
- Added all new cars : kcendra-gt, kcendra-roadsters, kcendra-sport, nascar
and VM.
From fedora-extras-commits at redhat.com Wed Feb 9 15:39:56 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 9 Feb 2005 10:39:56 -0500
Subject: rpms/plib/devel plib.spec,1.3,1.4
Message-ID: <200502091539.j19Fdu5o017430@cvs-int.fedora.redhat.com>
Author: thias
Update of /cvs/extras/rpms/plib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17410/plib/devel
Modified Files:
plib.spec
Log Message:
Update torcs to 1.2.3, which now builds on x86_64 and fix plib to make that possible.
Index: plib.spec
===================================================================
RCS file: /cvs/extras/rpms/plib/devel/plib.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plib.spec 24 Nov 2004 12:08:36 -0000 1.3
+++ plib.spec 9 Feb 2005 15:39:54 -0000 1.4
@@ -1,9 +1,7 @@
-# $Id$
-
Summary: Set of portable libraries especially useful for games
Name: plib
Version: 1.8.3
-Release: 4
+Release: 5
License: LGPL
Group: System Environment/Libraries
URL: http://plib.sourceforge.net/
@@ -22,7 +20,6 @@
%package devel
Summary: Set of portable libraries especially useful for games
Group: Development/Libraries
-
Obsoletes: plib <= 1.6.0
%description devel
@@ -38,7 +35,7 @@
%build
-%configure
+%configure CXXFLAGS="%{optflags} -fPIC"
%{__make} %{?_smp_mflags}
@@ -59,6 +56,9 @@
%changelog
+* Wed Feb 9 2005 Matthias Saou 1.8.3-5
+- Force -fPIC to be added to CXXFLAGS to fix linking against the lib on x86_64.
+
* Wed Nov 24 2004 Matthias Saou 1.8.3-4
- Bump release to provide Extras upgrade path.
From fedora-extras-commits at redhat.com Wed Feb 9 19:33:13 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 9 Feb 2005 14:33:13 -0500
Subject: rpms/gazpacho/devel .cvsignore, 1.2, 1.3 gazpacho.spec, 1.1,
1.2 sources, 1.2, 1.3
Message-ID: <200502091933.j19JXDKw020935@cvs-int.fedora.redhat.com>
Author: katzj
Update of /cvs/extras/rpms/gazpacho/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20923
Modified Files:
.cvsignore gazpacho.spec sources
Log Message:
* Wed Feb 9 2005 Jeremy Katz - 0.5.0-1
- update to 0.5.0
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 28 Jan 2005 15:56:32 -0000 1.2
+++ .cvsignore 9 Feb 2005 19:33:10 -0000 1.3
@@ -1 +1 @@
-Gazpacho-0.4.0.tar.bz2
+Gazpacho-0.5.0.tar.bz2
Index: gazpacho.spec
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/devel/gazpacho.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gazpacho.spec 28 Jan 2005 15:56:32 -0000 1.1
+++ gazpacho.spec 9 Feb 2005 19:33:10 -0000 1.2
@@ -1,6 +1,6 @@
Summary: Glade Interface Creater
Name: gazpacho
-Version: 0.4.0
+Version: 0.5.0
Release: 1
License: GPL
Group: Development/Tools
@@ -40,6 +40,9 @@
%changelog
+* Wed Feb 9 2005 Jeremy Katz - 0.5.0-1
+- update to 0.5.0
+
* Fri Jan 28 2005 Jeremy Katz - 0.4.0-1
- Initial build.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 28 Jan 2005 15:56:32 -0000 1.2
+++ sources 9 Feb 2005 19:33:10 -0000 1.3
@@ -1 +1 @@
-b0f037944b7d100ed5991679b4728cac Gazpacho-0.4.0.tar.bz2
+939815bdc85a07f026c29b7d5579241d Gazpacho-0.5.0.tar.bz2
From fedora-extras-commits at redhat.com Wed Feb 9 20:12:18 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 9 Feb 2005 15:12:18 -0500
Subject: rpms/prozilla/devel prozilla.spec,1.6,1.7
Message-ID: <200502092012.j19KCIWS021906@cvs-int.fedora.redhat.com>
Author: mschwendt
Update of /cvs/extras/rpms/prozilla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21900
Modified Files:
prozilla.spec
Log Message:
Copyright -> License
Index: prozilla.spec
===================================================================
RCS file: /cvs/extras/rpms/prozilla/devel/prozilla.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- prozilla.spec 2 Feb 2005 20:51:23 -0000 1.6
+++ prozilla.spec 9 Feb 2005 20:12:15 -0000 1.7
@@ -3,7 +3,7 @@
Version: 1.3.7.3
Release: 1
Epoch: 0
-Copyright: GPL
+License: GPL
Group: Applications/Internet
Source0: http://prozilla.genesys.ro/downloads/prozilla/tarballs/%{name}-%{version}.tar.gz
URL: http://prozilla.genesys.ro/
From fedora-extras-commits at redhat.com Wed Feb 9 22:01:53 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 9 Feb 2005 17:01:53 -0500
Subject: rpms/tpb/devel tpb-nvram.permissions, NONE,
1.1 tpb-defaultconfig.patch, 1.2, 1.3 tpb.spec, 1.4, 1.5
Message-ID: <200502092201.j19M1rQw023451@cvs-int.fedora.redhat.com>
Author: scop
Update of /cvs/extras/rpms/tpb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23445
Modified Files:
tpb-defaultconfig.patch tpb.spec
Added Files:
tpb-nvram.permissions
Log Message:
Add udev-awareness to /dev/nvram handling (#147306), better default OSD font.
--- NEW FILE tpb-nvram.permissions ---
# udev permissions/ownership map for nvram for use with tpb
nvram:root:root:0644
tpb-defaultconfig.patch:
Index: tpb-defaultconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/tpb/devel/tpb-defaultconfig.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tpb-defaultconfig.patch 8 Nov 2004 05:28:39 -0000 1.2
+++ tpb-defaultconfig.patch 9 Feb 2005 22:01:51 -0000 1.3
@@ -28,7 +28,7 @@
# one. Default is the default font of the xosd library.
#
-#OSDFONT -*-lucidatypewriter-*-*-*-*-*-240-*-*-*-*-*-*
-+OSDFONT -*-*-*-r-*-sans-17-*-*-*-*-*-*-*
++OSDFONT -*-luxi sans-*-r-*-*-17-*-*-*-*-*-*-*
## OSDCOLOR
# Defines the color of the on-screen display. You may use "xcolors" to choose
Index: tpb.spec
===================================================================
RCS file: /cvs/extras/rpms/tpb/devel/tpb.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tpb.spec 10 Dec 2004 22:03:12 -0000 1.4
+++ tpb.spec 9 Feb 2005 22:01:51 -0000 1.5
@@ -1,6 +1,6 @@
Name: tpb
Version: 0.6.3
-Release: 1
+Release: 2
Epoch: 0
Summary: IBM ThinkPad button support utility
@@ -9,10 +9,12 @@
URL: http://www.nongnu.org/tpb/
Source0: http://savannah.nongnu.org/download/tpb/tpb-0.6.3.tar.gz
Source1: http://savannah.nongnu.org/download/tpb/tpb-0.6.3.tar.gz.sig
+Source2: %{name}-nvram.permissions
Patch0: %{name}-defaultconfig.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: xosd-devel >= 0:2.0.0, XFree86-devel, gettext
+BuildRequires: xosd-devel >= 0:2.0.0, XFree86-devel, gettext, /sbin/MAKEDEV
+Requires: udev
%description
With TPB it is possible to bind a program to the ThinkPad, Mail, Home
@@ -43,25 +45,34 @@
make install DESTDIR=$RPM_BUILD_ROOT
install -Dm 755 %{name}.xinit \
$RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/%{name}.sh
+install -Dpm 644 %{SOURCE2} \
+ $RPM_BUILD_ROOT%{_sysconfdir}/udev/permissions.d/49-%{name}-nvram.permissions
+/sbin/MAKEDEV -M nvram > %{name}.files
+/sbin/MAKEDEV -d %{_sysconfdir}/udev/devices -M nvram >> %{name}.files
+sed -i s/600/644/ %{name}.files # console.perms.d would be nice
%find_lang %{name}
+cat %{name}.lang >> %{name}.files
%clean
rm -rf $RPM_BUILD_ROOT
-%files -f %{name}.lang
+%files -f %{name}.files
%defattr(-,root,root,-)
%doc ChangeLog COPYING CREDITS README doc/callback_example.sh doc/nvram.txt
%config %{_sysconfdir}/X11/xinit/xinitrc.d/%{name}.sh
+%config(noreplace) %{_sysconfdir}/udev/permissions.d/*%{name}-nvram.permissions
%config(noreplace) %{_sysconfdir}/tpbrc
%{_bindir}/tpb
%{_mandir}/man1/tpb.1*
-# Note: need read access here.
-%attr(644,root,root) %dev(c,10,144) /dev/nvram
%changelog
+* Wed Feb 9 2005 Ville Skytt?? - 0:0.6.3-2
+- Add udev-awareness to /dev/nvram handling (#147306, Matthew Saltzman).
+- Change default OSD font to "luxi sans", "sans" doesn't work early enough.
+
* Tue Aug 24 2004 Ville Skytt?? - 0:0.6.3-0.fdr.1
- Update to 0.6.3.
- Further small improvements to default config.
From fedora-extras-commits at redhat.com Wed Feb 9 22:06:41 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 9 Feb 2005 17:06:41 -0500
Subject: rpms/imlib2/devel imlib2.spec,1.8,1.9
Message-ID: <200502092206.j19M6f3c023502@cvs-int.fedora.redhat.com>
Author: scop
Update of /cvs/extras/rpms/imlib2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23492
Modified Files:
imlib2.spec
Log Message:
Link loaders with the main lib, fixes load/save problems with some apps.
http://bugs.debian.org/293815
http://www.linuxtv.org/mailinglists/vdr/2005/02-2005/threads.html#00140
Index: imlib2.spec
===================================================================
RCS file: /cvs/extras/rpms/imlib2/devel/imlib2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- imlib2.spec 18 Jan 2005 20:45:26 -0000 1.8
+++ imlib2.spec 9 Feb 2005 22:06:39 -0000 1.9
@@ -1,7 +1,7 @@
Summary: A graphic library for file loading, saving, rendering, and manipulation
Name: imlib2
Version: 1.2.0
-Release: 4
+Release: 5
Epoch: 0
License: BSD
Group: System Environment/Libraries
@@ -10,10 +10,7 @@
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
+BuildRequires: libungif-devel freetype-devel libtool bzip2-devel %{__perl}
%package devel
Summary: Development package for %{name}
@@ -46,6 +43,10 @@
%ifarch x86_64
%patch0 -b .patch0
%endif
+# loaders need to link with the main lib
+%{__perl} -pi -e \
+ 's|^(\w+_la_LDFLAGS .*)|$1 -L\$(top_builddir)/src/lib| ;
+ s|^(\w+_la_LIBADD .*)|$1 -lImlib2|' src/modules/loaders/Makefile.*
# -----------------------------------------------------------------------------
@@ -61,7 +62,8 @@
%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
+%{__perl} -pi.orig -e 's|-Wl,--rpath -Wl,/usr/lib64||g;' \
+ Makefile */Makefile */*/Makefile imlib2-config
%endif
make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
@@ -122,6 +124,9 @@
# -----------------------------------------------------------------------------
%changelog
+* Wed Feb 9 2005 Ville Skytt?? - 0:1.2.0-5
+- Link loaders with the main lib, fixes load/save problems with some apps.
+
* Tue Jan 18 2005 Michael Schwendt - 0:1.2.0-4
- Really include libtool archives to fix fedora.us bug #2284.
From fedora-extras-commits at redhat.com Wed Feb 9 22:12:35 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 9 Feb 2005 17:12:35 -0500
Subject: rpms/fedora-rpmdevtools/devel .cvsignore, 1.5,
1.6 fedora-rpmdevtools.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <200502092212.j19MCZFr023579@cvs-int.fedora.redhat.com>
Author: scop
Update of /cvs/extras/rpms/fedora-rpmdevtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23573
Modified Files:
.cvsignore fedora-rpmdevtools.spec sources
Log Message:
0.3.1, fixes #147014.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 17 Jan 2005 22:11:51 -0000 1.5
+++ .cvsignore 9 Feb 2005 22:12:33 -0000 1.6
@@ -1 +1 @@
-fedora-rpmdevtools-0.3.0.tar.bz2
+fedora-rpmdevtools-0.3.1.tar.bz2
Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/fedora-rpmdevtools.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-rpmdevtools.spec 17 Jan 2005 22:11:51 -0000 1.5
+++ fedora-rpmdevtools.spec 9 Feb 2005 22:12:33 -0000 1.6
@@ -2,7 +2,7 @@
%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.3.0
+Version: 0.3.1
Release: 1
Epoch: 0
Summary: Fedora RPM Development Tools
@@ -129,6 +129,10 @@
%changelog
+* Sun Feb 6 2005 Ville Skytt?? - 0:0.3.1-1
+- Make buildrpmtree and wipebuildtree less dependent on a specific
+ configuration (#147014, Ignacio Vazquez-Abrams).
+
* 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.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 17 Jan 2005 22:11:51 -0000 1.5
+++ sources 9 Feb 2005 22:12:33 -0000 1.6
@@ -1 +1 @@
-18e7e0d9cdb6830ec919907343a32907 fedora-rpmdevtools-0.3.0.tar.bz2
+f602fb0535375b4591c67319de60040f fedora-rpmdevtools-0.3.1.tar.bz2
From fedora-extras-commits at redhat.com Wed Feb 9 22:50:06 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 9 Feb 2005 17:50:06 -0500
Subject: rpms/tla/devel tla-sysneon.patch, NONE, 1.1 .cvsignore, 1.3,
1.4 sources, 1.3, 1.4 tla.spec, 1.4,
1.5 tla-1.2-alt-nolibneon.patch, 1.1,
NONE tla-1.2.1.tar.gz.sig, 1.1, NONE
Message-ID: <200502092250.j19Mo6Bd023758@cvs-int.fedora.redhat.com>
Author: scop
Update of /cvs/extras/rpms/tla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23752
Modified Files:
.cvsignore sources tla.spec
Added Files:
tla-sysneon.patch
Removed Files:
tla-1.2-alt-nolibneon.patch tla-1.2.1.tar.gz.sig
Log Message:
Update to 1.3 (b.f.u #2400).
tla-sysneon.patch:
--- NEW FILE tla-sysneon.patch ---
diff -Naru tla-1.3.orig/src/tla/libarch/pfs-dav.c tla-1.3/src/tla/libarch/pfs-dav.c
--- tla-1.3.orig/src/tla/libarch/pfs-dav.c 2004-12-23 06:30:26.000000000 +0200
+++ tla-1.3/src/tla/libarch/pfs-dav.c 2005-01-30 11:05:37.203806225 +0200
@@ -21,14 +21,14 @@
#include "tla/libfsutils/file-contents.h"
#include "tla/libarch/archives.h"
#include "tla/libarch/pfs-dav.h"
-#include "tla/libneon/ne_session.h"
-#include "tla/libneon/ne_basic.h"
-#include "tla/libneon/ne_request.h"
-#include "tla/libneon/ne_auth.h"
-#include "tla/libneon/ne_props.h"
-#include "tla/libneon/ne_uri.h"
-#include "tla/libneon/ne_redirect.h"
-#include "tla/libneon/ne_socket.h"
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
diff -Naru tla-1.3.orig/src/tla/tla/Makefile.in tla-1.3/src/tla/tla/Makefile.in
--- tla-1.3.orig/src/tla/tla/Makefile.in 2004-12-23 06:30:26.000000000 +0200
+++ tla-1.3/src/tla/tla/Makefile.in 2005-01-30 11:06:40.201846088 +0200
@@ -3,7 +3,7 @@
../libawk/libawk.a \
../libdate/libdate.a \
$(objroot)/hackerlab/libhackerlab/libhackerlab.a \
- ../libneon/libneon.a \
+ -lneon \
-lm
mains := tla.c
diff -Naru tla-1.3.orig/src/tla/tla/PLUGIN/REQ tla-1.3/src/tla/tla/PLUGIN/REQ
--- tla-1.3.orig/src/tla/tla/PLUGIN/REQ 2004-12-23 06:30:26.000000000 +0200
+++ tla-1.3/src/tla/tla/PLUGIN/REQ 2005-01-30 11:06:13.503304833 +0200
@@ -2,4 +2,3 @@
libawk tla
libfsutils tla
libdate tla
-libneon tla
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tla/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 8 Nov 2004 05:28:17 -0000 1.3
+++ .cvsignore 9 Feb 2005 22:50:04 -0000 1.4
@@ -1 +1,2 @@
-tla-1.2.1.tar.gz
+tla-1.3.tar.gz
+tla-1.3.tar.gz.sig
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tla/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 8 Nov 2004 05:28:17 -0000 1.3
+++ sources 9 Feb 2005 22:50:04 -0000 1.4
@@ -1 +1,2 @@
-40c70c9f881a2b0258441a447e1bd53d tla-1.2.1.tar.gz
+6093412e85d63fe79469bf386308d437 tla-1.3.tar.gz
+599814dc01e96df0e3d20599be101efe tla-1.3.tar.gz.sig
Index: tla.spec
===================================================================
RCS file: /cvs/extras/rpms/tla/devel/tla.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tla.spec 10 Dec 2004 22:03:12 -0000 1.4
+++ tla.spec 9 Feb 2005 22:50:04 -0000 1.5
@@ -1,5 +1,5 @@
Name: tla
-Version: 1.2.1
+Version: 1.3
Release: 1
Epoch: 0
Summary: The Low-Budget arch Revision Control System
@@ -11,9 +11,9 @@
Source1: http://ftp.gnu.org/gnu/gnu-arch/%{name}-%{version}.tar.gz.sig
# Patch0 from SuSE 9.1's tla-1.2-15
Patch0: tla-1.2pre0-posix.patch
-# Patch1..3 from ALT Linux's tla-1.2-alt6
+# Patch1,3 from ALT Linux's tla-1.2-alt6
Patch1: tla-1.2-texi.diff
-Patch2: tla-1.2-alt-nolibneon.patch
+Patch2: tla-sysneon.patch
Patch3: tla-1.2-alt-texinfo.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,7 +49,7 @@
export CFLAGS=$RPM_OPT_FLAGS
../configure \
--prefix=%{_prefix} --with-install-link-tools=yes --with-cc=%{__cc}
-make # %{?_smp_mflags} # 1.2 is not parallel build clean
+make # %{?_smp_mflags} # 1.[23] is not parallel build clean
cd ../docs-tla/texi
makeinfo arch.texi
cd ../..
@@ -87,8 +87,7 @@
%files
%defattr(-,root,root,-)
-%doc COPYING src/tla/ChangeLog src/tla/=THANKS src/tla/=TODO
-%doc src/docs-tla/HOWTO.crypto src/docs-tla/html
+%doc COPYING src/tla/ChangeLog src/docs-tla/HOWTO.crypto src/docs-tla/html
%{_bindir}/make-links
%{_bindir}/remove-links
%{_bindir}/tla
@@ -96,6 +95,9 @@
%changelog
+* Sun Jan 30 2005 Ville Skytt?? - 0:1.3-1
+- Update to 1.3.
+
* Sun Sep 26 2004 Ville Skytt?? - 0:1.2.1-0.fdr.1
- Update to 1.2.1.
--- tla-1.2-alt-nolibneon.patch DELETED ---
--- tla-1.2.1.tar.gz.sig DELETED ---
From fedora-extras-commits at redhat.com Wed Feb 9 23:16:20 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 9 Feb 2005 18:16:20 -0500
Subject: rpms/logjam - New directory
Message-ID: <200502092316.j19NGKOu025463@cvs-int.fedora.redhat.com>
Author: spot
Update of /cvs/extras/rpms/logjam
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25456/logjam
Log Message:
Directory /cvs/extras/rpms/logjam added to the repository
From fedora-extras-commits at redhat.com Wed Feb 9 23:16:20 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 9 Feb 2005 18:16:20 -0500
Subject: rpms/logjam/devel - New directory
Message-ID: <200502092316.j19NGK4W025466@cvs-int.fedora.redhat.com>
Author: spot
Update of /cvs/extras/rpms/logjam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25456/logjam/devel
Log Message:
Directory /cvs/extras/rpms/logjam/devel added to the repository
From fedora-extras-commits at redhat.com Wed Feb 9 23:16:35 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 9 Feb 2005 18:16:35 -0500
Subject: rpms/logjam Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200502092316.j19NGZAC025525@cvs-int.fedora.redhat.com>
Author: spot
Update of /cvs/extras/rpms/logjam
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25516
Added Files:
Makefile import.log
Log Message:
Setup of module logjam
--- NEW FILE Makefile ---
# Top level Makefile for module logjam
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like 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 Feb 9 23:16:35 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 9 Feb 2005 18:16:35 -0500
Subject: rpms/logjam/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
NONE, 1.1
Message-ID: <200502092316.j19NGZmt025528@cvs-int.fedora.redhat.com>
Author: spot
Update of /cvs/extras/rpms/logjam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25516/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module logjam
--- NEW FILE .cvsignore ---
***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'
--- NEW FILE sources ---
From fedora-extras-commits at redhat.com Wed Feb 9 23:17:22 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 9 Feb 2005 18:17:22 -0500
Subject: rpms/logjam import.log,1.1,1.2
Message-ID: <200502092317.j19NHMfR025633@cvs-int.fedora.redhat.com>
Author: spot
Update of /cvs/extras/rpms/logjam
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25624
Modified Files:
import.log
Log Message:
auto-import logjam-4.4.0-3 on branch devel from logjam-4.4.0-3.src.rpm
Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/logjam/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log 9 Feb 2005 23:16:33 -0000 1.1
+++ import.log 9 Feb 2005 23:17:20 -0000 1.2
@@ -0,0 +1 @@
+logjam-4_4_0-3:HEAD:logjam-4.4.0-3.src.rpm:1107990845
From fedora-extras-commits at redhat.com Wed Feb 9 23:17:22 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 9 Feb 2005 18:17:22 -0500
Subject: rpms/logjam/devel logjam-4.4.0-compilefix.patch, NONE,
1.1 logjam.desktop, NONE, 1.1 logjam.spec, NONE,
1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200502092317.j19NHMEV025637@cvs-int.fedora.redhat.com>
Author: spot
Update of /cvs/extras/rpms/logjam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25624/devel
Modified Files:
.cvsignore sources
Added Files:
logjam-4.4.0-compilefix.patch logjam.desktop logjam.spec
Log Message:
auto-import logjam-4.4.0-3 on branch devel from logjam-4.4.0-3.src.rpm
logjam-4.4.0-compilefix.patch:
--- NEW FILE logjam-4.4.0-compilefix.patch ---
--- logjam-4.4.0/src/network-libxml.c.BAD 2005-01-20 21:14:39.000000000 -0600
+++ logjam-4.4.0/src/network-libxml.c 2005-01-20 21:14:45.000000000 -0600
@@ -73,6 +73,7 @@
_("File not found."));
goto out;
default:
+ ;
}
response = g_string_new(NULL);
--- NEW FILE logjam.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Logjam
Type=Application
Exec=/usr/bin/logjam
Icon=/usr/share/pixmaps/gnome-log.png
Categories=Application;Network;X-Red-Hat-Base;
--- NEW FILE logjam.spec ---
Name: logjam
Version: 4.4.0
Summary: The GTK2-client for LiveJournal
Release: 3
Source: http://logjam.danga.com/download/logjam-%{version}.tar.bz2
Source1: logjam.desktop
Prereq: curl >= 7.9, gtk2, gtkspell, xmms, gtkhtml3
BuildRequires: curl-devel, gtk2-devel, gtkspell-devel, xmms-devel, gtkhtml3-devel
URL: http://logjam.danga.com/
Patch0: logjam-4.4.0-compilefix.patch
Epoch: 1
License: GPL
Group: X11/Applications
Vendor: Evan Martin
Packager: Tom "spot" Callaway
BuildRoot: %{_tmppath}/logjam-%{version}.root
Obsoletes: loserjabber, logjam-gnome
%description
This is the new GTK2 client for LiveJournal (http://www.livejournal.com).
%prep
%setup -n %{name}-%{version}
%patch0 -p1 -b .compilefix
%build
CFLAGS="$RPM_OPT_FLAGS" ; export CFLAGS
%configure
%__make
%install
mkdir -p $RPM_BUILD_ROOT
%makeinstall
%find_lang %{name}
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
cp %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/applications
%files -f %{name}.lang
%defattr(-,root,root)
%{_bindir}/logjam
%{_bindir}/logjam-xmms-client
%{_mandir}/man1/logjam.1.gz
%{_datadir}/applications/logjam.desktop
%{_datadir}/pixmaps/logjam*
%doc doc/README COPYING doc/TODO
%clean
rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Feb 3 2005 Tom "spot" Callaway
- fc3 cleanup
* Tue May 11 2004 Justin M. Forbes <64bit_fedora at comcast.net>
- bump to 4.4.0
* Tue Mar 9 2004 Tom "spot" Callaway
- bump to 4.3.2
- install gtkhtml3-devel (whoops!)
- remove old xmms configure option
* Thu Feb 5 2004 Tom "spot" Callaway
- bump to 4.3.0pre2
- Revert dash naming workaround
* Mon Feb 2 2004 Tom "spot" Callaway
- bump to 4.3.0-pre1
- Workaround dash naming
* Wed Aug 6 2003 Tom "spot" Callaway
- bump to 4.2.3
- Kylie Minogue does not approve.
* Wed Jun 11 2003 Tom "spot" Callaway
- spec changes make sense once explained. :)
- bump to 4.2.0
- all old patches obsoleted
- added logjam desktop entry from Adam Konkle (modified slightly)
* Mon May 26 2003 Tom "spot" Callaway
- added patches for a compilation fix and russian support
- modified spec. i still think its pointless, but whatever.
* Tue Apr 29 2003 Tom "spot" Callaway
- bump to 4.1.2
- and i follow the tracks that lead me down, i'll never follow whats right
* Sat Apr 12 2003 Tom "spot" Callaway
- bump to 4.1.1
- black velvet with that slow southern style
* Mon Apr 7 2003 Tom "spot" Callaway
- bump to 4.1.0
- rebuilt against gtkspell 2.0.4
* Fri Dec 6 2002 Tom "spot" Callaway
- bump to 4.0.1
* Tue Nov 19 2002 Tom "spot" Callaway
- rebuilt against gtkspell 2.0.3
* Tue Oct 29 2002 Tom "spot" Callaway
- 4.0.0 official release
* Tue Oct 15 2002 Tom "spot" Callaway
- 3.1cvs20021015 release, removed patch0,1,3
* Sun May 26 2002 Tom "spot" Callaway
- 3.1cvs20020526 release, spec rewrite, lots of patching
* Mon Jan 07 2002 Tom "spot" Callaway
- 3.0.2 release, spec cleanups
* Mon Nov 12 2001 Tom "spot" Callaway
- 3.0.1 release, lots of new features/bugfixes.
* Fri Sep 07 2001 Tom "spot" Callaway
- Rebuild without ssl for compat. :~(
* Thu Sep 06 2001 Tom "spot" Callaway
- Removed curl-devel from the Prereq: to BuildRequires:
* Sat Jul 14 2001 Tom "spot" Callaway
- Point release, out of CVS finally
* Wed Jun 27 2001 Tom "spot" Callaway