SPECS: forcefield.spec - fixed python version hack and cracklib patch

qboosh qboosh at pld-linux.org
Sat Jan 12 18:24:56 CET 2008


Author: qboosh                       Date: Sat Jan 12 17:24:56 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed python version hack and cracklib patch

---- Files affected:
SPECS:
   forcefield.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/forcefield.spec
diff -u SPECS/forcefield.spec:1.2 SPECS/forcefield.spec:1.3
--- SPECS/forcefield.spec:1.2	Sat Jan 12 18:02:12 2008
+++ SPECS/forcefield.spec	Sat Jan 12 18:24:50 2008
@@ -3,8 +3,6 @@
 # TODO:
 # - real descriptions
 # - check BR-s and R-s
-# - investigate if the cracklib patch realy make forcefield *not*
-#   require python-crypt
 #
 %define     _snap   20070924
 Summary:	A GNOME GUI for TrueCrypt
@@ -22,12 +20,14 @@
 Patch0:		%{name}-install.patch
 Patch1:		%{name}-cracklib.patch
 URL:		http://www.bockcay.de/forcefield
+BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake >= 1:1.9
 BuildRequires:	python >= 1:2.5
 BuildRequires:	python-gnome-devel
 BuildRequires:	python-pygtk-devel >= 2:2.0
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.311
+BuildRequires:	sed >= 4.0
 Requires(post,preun):	GConf2 >= 2.4.0
 Requires(post,postun):	gtk+2
 Requires(post,postun):	hicolor-icon-theme
@@ -57,23 +57,27 @@
 %patch0 -p1
 %patch1 -p1
 
+sed -i -e 's|include/python2.4|include/python%{py_ver} $(CFLAGS) -fPIC|g' src/lib/Makefile.am
+# kill precompiled x86 module
+rm data/misc/crack.so
+
 %build
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-%configure
-%{__perl} -pi -e 's|python2.4|python%{py_ver}|g' src/lib/Makefile.in
+%configure \
+	--disable-schemas-install
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
+%py_postclean
 %find_lang %{name}
 
 %clean
@@ -98,7 +102,7 @@
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 %dir %{py_sitedir}/%{name}
 %{py_sitedir}/%{name}/*.py[co]
-%attr(755,root,root) %{py_sitedir}/%{name}/*.so
+%attr(755,root,root) %{py_sitedir}/%{name}/zero_out.so
 %{_datadir}/%{name}
 %{_iconsdir}/hicolor/24x24/apps/%{name}.png
 %{_desktopdir}/%{name}.desktop
@@ -110,6 +114,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2008-01-12 17:24:50  qboosh
+- fixed python version hack and cracklib patch
+
 Revision 1.2  2008-01-12 17:02:12  qboosh
 - pl and post/preun/postun fixes
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/forcefield.spec?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list