SPECS: gnome-keyring.spec - added temporary workaround for libtasn1 without...

qboosh qboosh at pld-linux.org
Fri Dec 26 17:47:13 CET 2008


Author: qboosh                       Date: Fri Dec 26 16:47:12 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added temporary workaround for libtasn1 without m4 macro

---- Files affected:
SPECS:
   gnome-keyring.spec (1.59 -> 1.60) 

---- Diffs:

================================================================
Index: SPECS/gnome-keyring.spec
diff -u SPECS/gnome-keyring.spec:1.59 SPECS/gnome-keyring.spec:1.60
--- SPECS/gnome-keyring.spec:1.59	Sun Oct 19 13:35:39 2008
+++ SPECS/gnome-keyring.spec	Fri Dec 26 17:47:07 2008
@@ -120,6 +120,9 @@
 %prep
 %setup -q
 
+# no longer provided by libtasn1, waiting for this package to switch to pkgconfig
+sed -ne '/AM_PATH_LIBTASN1/,/^])$/p' aclocal.m4 >> acinclude.m4
+
 %build
 %{__glib_gettextize}
 %{__intltoolize}
@@ -141,8 +144,8 @@
 %{__make} install install-pam \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT/%{_lib}/security/pam_gnome_keyring.{l,}a
-rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/gnome-keyring-pkcs11.{l,}a
+%{__rm} $RPM_BUILD_ROOT/%{_lib}/security/pam_gnome_keyring.{l,}a
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/gnome-keyring-pkcs11.{l,}a
 
 %find_lang %{name}
 
@@ -207,6 +210,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.60  2008/12/26 16:47:07  qboosh
+- added temporary workaround for libtasn1 without m4 macro
+
 Revision 1.59  2008/10/19 11:35:39  megabajt
 - updated to 2.24.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnome-keyring.spec?r1=1.59&r2=1.60&f=u



More information about the pld-cvs-commit mailing list