[svn] r5374 - in trunk/rpms: gl-117 passwdgen perl-Email-MIME-ContentType revelation

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Mon May 7 23:55:33 CEST 2007


Author: dag
Date: 2007-05-07 23:55:28 +0200 (Mon, 07 May 2007)
New Revision: 5374

Added:
   trunk/rpms/passwdgen/passwdgen-2.2-gcc3.patch
   trunk/rpms/passwdgen/passwdgen-2.2-lafix.patch
Modified:
   trunk/rpms/gl-117/gl-117.spec
   trunk/rpms/passwdgen/passwdgen.spec
   trunk/rpms/perl-Email-MIME-ContentType/perl-Email-MIME-ContentType.spec
   trunk/rpms/revelation/revelation.spec
Log:
Updates

Modified: trunk/rpms/gl-117/gl-117.spec
===================================================================
--- trunk/rpms/gl-117/gl-117.spec	2007-05-07 21:54:16 UTC (rev 5373)
+++ trunk/rpms/gl-117/gl-117.spec	2007-05-07 21:55:28 UTC (rev 5374)
@@ -7,9 +7,6 @@
 
 %{?dist: %{expand: %%define %dist 1}}
 
-%{?el3:%define _without_freeglut 1}
-%{?rh9:%define _without_freeglut 1}
-
 %{?el4:%define _without_modxorg 1}
 %{?el3:%define _without_modxorg 1}
 %{?el2:%define _without_modxorg 1}
@@ -18,6 +15,9 @@
 %{?fc2:%define _without_modxorg 1}
 %{?fc1:%define _without_modxorg 1}
 
+%{?el3:%define _without_freeglut 1}
+%{?rh9:%define _without_freeglut 1}
+
 Summary: Action flight simulator
 Name: gl-117
 Version: 1.3.2

Added: trunk/rpms/passwdgen/passwdgen-2.2-gcc3.patch
===================================================================
--- trunk/rpms/passwdgen/passwdgen-2.2-gcc3.patch	                        (rev 0)
+++ trunk/rpms/passwdgen/passwdgen-2.2-gcc3.patch	2007-05-07 21:55:28 UTC (rev 5374)
@@ -0,0 +1,72 @@
+--- passwdgen-2.2/class/password.h.orig	Fri Nov 24 01:54:19 2000
++++ passwdgen-2.2/class/password.h	Sat Oct 12 15:28:48 2002
+@@ -54,7 +54,7 @@
+     void hand (int hand); 
+     void pronounceable (bool pronounce);
+     char *generate ();
+-    friend ostream &operator << (ostream &os, password &a);
++    friend std::ostream &operator << (std::ostream &os, password &a);
+ 
+   protected:
+     void lengthErr () throw (pwdgenerr);
+--- passwdgen-2.2/class/password.cpp.orig	Fri Nov 24 02:23:44 2000
++++ passwdgen-2.2/class/password.cpp	Sat Oct 12 15:29:13 2002
+@@ -21,6 +21,8 @@
+ #include <config.h>
+ #include "password.h"
+ 
++using namespace std;
++
+ password::password ()
+ {
+   minLength = 0;
+--- passwdgen-2.2/class/pwdgenerr.h.orig	Thu Nov 23 21:03:43 2000
++++ passwdgen-2.2/class/pwdgenerr.h	Sat Oct 12 15:28:07 2002
+@@ -21,11 +21,11 @@
+ class pwdgenerr
+ {
+   public:
+-    pwdgenerr (string error, int value);
++    pwdgenerr (std::string error, int value);
+     int value ();
+-    string *message ();
++    std::string *message ();
+ 
+   protected:
+-    string errorMsg;
++    std::string errorMsg;
+     int errorInt;
+ };
+--- passwdgen-2.2/class/pwdgenerr.cpp.orig	Thu Nov 23 21:04:02 2000
++++ passwdgen-2.2/class/pwdgenerr.cpp	Sat Oct 12 15:29:38 2002
+@@ -18,6 +18,8 @@
+ 
+ #include "pwdgenerr.h"
+ 
++using namespace std;
++
+ pwdgenerr::pwdgenerr (string e, int a)
+ {
+   errorMsg = e;
+--- passwdgen-2.2/src/cli.cpp.orig	Fri Nov 24 02:31:48 2000
++++ passwdgen-2.2/src/cli.cpp	Sat Oct 12 15:31:46 2002
+@@ -28,6 +28,8 @@
+ 
+ #include "../class/password.h"
+ 
++using namespace std;
++
+ void instructUser ();
+ void displayHelp ();
+ void displayVersion ();
+--- passwdgen-2.2/src/main.cpp.orig	Fri Nov 24 02:31:40 2000
++++ passwdgen-2.2/src/main.cpp	Sat Oct 12 15:31:25 2002
+@@ -20,6 +20,8 @@
+ #include <config.h>
+ #include "cli.h"
+ 
++using namespace std;
++
+ int main (int argc, char **argv)
+ {
+   password a;

Added: trunk/rpms/passwdgen/passwdgen-2.2-lafix.patch
===================================================================
--- trunk/rpms/passwdgen/passwdgen-2.2-lafix.patch	                        (rev 0)
+++ trunk/rpms/passwdgen/passwdgen-2.2-lafix.patch	2007-05-07 21:55:28 UTC (rev 5374)
@@ -0,0 +1,11 @@
+--- class/Makefile.in.orig	2007-05-07 11:57:42.000000000 +0200
++++ class/Makefile.in	2007-05-07 11:57:48.000000000 +0200
+@@ -80,7 +80,7 @@
+ lib_LTLIBRARIES = libpasswdgen.la
+ libpasswdgen_la_SOURCES = password.cpp pwdgenerr.cpp
+ 
+-libpasswdgen_la_LDFLAGS =          -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)            -release $(LT_RELEASE)					        -export-dynamic         $(X_LIBS)
++libpasswdgen_la_LDFLAGS =          -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)            -release $(LT_RELEASE)					        -export-dynamic
+ 
+ 
+ libpasswdgenincludedir = $(prefix)/include/passwdgen

Modified: trunk/rpms/passwdgen/passwdgen.spec
===================================================================
--- trunk/rpms/passwdgen/passwdgen.spec	2007-05-07 21:54:16 UTC (rev 5373)
+++ trunk/rpms/passwdgen/passwdgen.spec	2007-05-07 21:55:28 UTC (rev 5374)
@@ -6,14 +6,17 @@
 Summary: Random Password Generator
 Name: passwdgen
 Version: 2.2
-Release: 1.2
+Release: 2
 License: GPL
 Group: System Environment/Base
 URL: http://directory.fsf.org/security/auth/pwdgen.html
-#http://members-http-1.rwc1.sfba.home.net/denisl/passwdgen/
+#URL: http://www.securityfocus.com/tools/1649/scoreit
+#URL: http://members-http-1.rwc1.sfba.home.net/denisl/passwdgen/
 
-Source: http://downloads.securityfocus.com/tools/passwdgen-2.2.tar.gz
-#http://members-http-1.rwc1.sfba.home.net/denisl/passwdgen/download/passwdgen-%{version}.tar.gz
+Source: http://www.securityfocus.com/data/tools/passwdgen-%{version}.tar.gz
+#Source: http://members-http-1.rwc1.sfba.home.net/denisl/passwdgen/download/passwdgen-%{version}.tar.gz
+Patch0: passwdgen-2.2-lafix.patch
+Patch1: passwdgen-2.2-gcc3.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: gcc-c++, autoconf, automake
@@ -35,36 +38,40 @@
 
 %prep
 %setup
+%patch0 -p0
+%patch1 -p1
 
 %build
 %configure
-### FIXME: Workaround in strange build-problem
-%{__mkdir} -p class/.libs/.libs
-%{__ln_s} -f ../libpasswdgen.so class/.libs/.libs/libpasswdgen.so
+%{__make} %{?_smp_mflags}
 
-### FIXME: Fix headerfiles
-%{__perl} -pi.orig -e 's|<string>|<string.h>|' class/*.h
-%{__make} %{?_smp_mflags} \
-%{?rh8:CXX="g++296"}
-
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
 
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
 %clean
 %{__rm} -rf %{buildroot}
 
 %files
 %defattr(-, root, root, 0755)
-%doc AUTHORS ChangeLog NEWS README
-%doc %{_mandir}/man1/*
-%{_bindir}/*
-%{_libdir}/*
+%doc AUTHORS ChangeLog COPYING NEWS README
+%doc %{_mandir}/man1/passwdgen.1*
+%{_bindir}/passwdgen
 %{_includedir}/passwdgen/
+%{_libdir}/libpasswdgen.so
+%{_libdir}/libpasswdgen-2.2.so*
+%exclude %{_libdir}/libpasswdgen.a
+%exclude %{_libdir}/libpasswdgen.la
 
 %changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 2.2-1.2
-- Rebuild for Fedora Core 5.
+* Mon May 07 2007 Dag Wieers <dag at wieers.com> - 2.2-2
+- Added build patched from PLD.
 
+* Mon Aug 25 2003 Dag Wieers <dag at wieers.com> - 2.2-1
+- Cosmetic changes.
+
 * Mon Dec 30 2002 Dag Wieers <dag at wieers.com> - 2.2-0
 - Initial package. (using DAR)

Modified: trunk/rpms/perl-Email-MIME-ContentType/perl-Email-MIME-ContentType.spec
===================================================================
--- trunk/rpms/perl-Email-MIME-ContentType/perl-Email-MIME-ContentType.spec	2007-05-07 21:54:16 UTC (rev 5373)
+++ trunk/rpms/perl-Email-MIME-ContentType/perl-Email-MIME-ContentType.spec	2007-05-07 21:55:28 UTC (rev 5374)
@@ -2,16 +2,16 @@
 # Authority: dries
 # Upstream: Simon Cozens <simon$cpan,org>
 
-%define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)
-%define perl_vendorarch %(eval "`perl -V:installvendorarch`"; echo $installvendorarch)
+%define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
+%define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
 
 %define real_name Email-MIME-ContentType
 
 Summary: Parse a MIME Content-Type Header
 Name: perl-Email-MIME-ContentType
-Version: 1.01
-Release: 1.2
-License: Artistic
+Version: 1.014
+Release: 1
+License: Artistic/GPL
 Group: Applications/CPAN
 URL: http://search.cpan.org/dist/Email-MIME-ContentType/
 
@@ -28,9 +28,7 @@
 %setup -n %{real_name}-%{version}
 
 %build
-%{__perl} Makefile.PL \
-	INSTALLDIRS="vendor" \
-	PREFIX="%{buildroot}%{_prefix}"
+%{__perl} Makefile.PL INSTALLDIRS="vendor" PREFIX="%{buildroot}%{_prefix}"
 %{__make} %{?_smp_mflags}
 
 %install
@@ -38,23 +36,22 @@
 %makeinstall
 
 ### Clean up buildroot
-%{__rm} -rf %{buildroot}%{perl_archlib} \
-                %{buildroot}%{perl_vendorarch}
+%{__rm} -rf %{buildroot}%{perl_archlib} %{buildroot}%{perl_vendorarch}
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %files
 %defattr(-, root, root, 0755)
-%doc Changes README
-%doc %{_mandir}/man3/*
+%doc Changes LICENSE MANIFEST META.yml README
+%doc %{_mandir}/man3/Email::MIME::ContentType.3pm*
 %dir %{perl_vendorlib}/Email/
 %dir %{perl_vendorlib}/Email/MIME/
 %{perl_vendorlib}/Email/MIME/ContentType.pm
 
 %changelog
-* Wed Mar 22 2006 Dries Verachtert <dries at ulyssis.org> - 1.01-1.2
-- Rebuild for Fedora Core 5.
+* Sat May 05 2007 Dag Wieers <dag at wieers.com> - 1.014-1
+- Updated to release 1.014.
 
 * Fri Mar  4 2005 Dries Verachtert <dries at ulyssis.org> - 1.01-1
 - Updated to release 1.01.

Modified: trunk/rpms/revelation/revelation.spec
===================================================================
--- trunk/rpms/revelation/revelation.spec	2007-05-07 21:54:16 UTC (rev 5373)
+++ trunk/rpms/revelation/revelation.spec	2007-05-07 21:55:28 UTC (rev 5374)
@@ -16,10 +16,12 @@
 Source: ftp://oss.codepoet.no/revelation/revelation-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires: python >= 2.3, python-devel, python-crypto >= 1.9
-BuildRequires: gnome-keyring-devel, pygtk2-devel >= 2.8, gnome-python2
+BuildRequires: python-devel >= 2.3, python-crypto >= 1.9
+BuildRequires: gnome-keyring-devel, pygtk2-devel >= 2.8, gnome-python2-devel
 BuildRequires: gnome-vfs2-devel, libgnomeui-devel, gnome-python2-bonobo
 BuildRequires: GConf2-devel, gnome-python2-gconf, gnome-python2-desktop
+BuildRequires: gnome-python2-applet, gnome-panel-devel, gnome-python2-extras
+BuildRequires: cracklib-devel, cracklib-dicts
 %{?el5:BuildRequires: gnome-python2-extras, gnome-panel-devel}
 %{?fc6:BuildRequires: gnome-python2-extras, gnome-panel-devel}
 %{?fc5:BuildRequires: gnome-python2-extras, gnome-panel-devel}
@@ -27,6 +29,7 @@
 Requires: python >= 2.3, pygtk2 >= 2.4, python-crypto >= 1.9
 Requires: gnome-python2-canvas, gnome-python2-gconf, gnome-python2-gnomevfs
 Requires: gnome-python2-bonobo, cracklib, gnome-python2-applet
+Requires: cracklib-dicts
 
 %description
 Revelation is a password manager. It organizes accounts in
@@ -39,7 +42,8 @@
 %configure \
 	--disable-desktop-update \
 	--disable-mime-update \
-	--disable-schemas-install
+	--disable-schemas-install \
+	--with-cracklib-dict="/usr/share/cracklib/pw_dict"
 %{__make} %{?_smp_mflags}
 
 %install
@@ -47,15 +51,25 @@
 %{__make} install DESTDIR="%{buildroot}"
 %find_lang %{name}
 
+%{__rm} -f %{buildroot}%{_datadir}/revelation/pwdict*
+
 %post
 export GCONF_CONFIG_SOURCE="$(gconftool-2 --get-default-source)"
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null
-/usr/bin/update-mime-database %{_datadir}/mime &>/dev/null || :
-/usr/bin/update-desktop-database -q || :
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}-applet.schemas &>/dev/null
+update-mime-database %{_datadir}/mime &>/dev/null || :
+update-desktop-database -q || :
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &> /dev/null || :
 
+%preun
+export GCONF_CONFIG_SOURCE="$(gconftool-2 --get-default-source)"
+gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
+gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}-applet.schemas &>/dev/null || :
+
 %postun
-/usr/bin/update-mime-database %{_datadir}/mime &>/dev/null || :
-/usr/bin/update-desktop-database -q || :
+update-mime-database %{_datadir}/mime &>/dev/null || :
+update-desktop-database -q || :
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &> /dev/null || :
 
 %clean
 %{__rm} -rf %{buildroot}




More information about the commits mailing list