SPECS: pan.spec - previous commit reverted

adamg adamg at pld-linux.org
Fri Dec 26 03:50:41 CET 2008


Author: adamg                        Date: Fri Dec 26 02:50:41 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- previous commit reverted

---- Files affected:
SPECS:
   pan.spec (1.86 -> 1.87) 

---- Diffs:

================================================================
Index: SPECS/pan.spec
diff -u SPECS/pan.spec:1.86 SPECS/pan.spec:1.87
--- SPECS/pan.spec:1.86	Fri Dec 26 02:52:47 2008
+++ SPECS/pan.spec	Fri Dec 26 03:50:35 2008
@@ -55,16 +55,7 @@
 mv -f po/sr@{Latn,latin}.po
 
 %build
-<<<<<<< pan.spec
-rm -f missing
-%{__sed} -i 's,\(^ALL_LINGUAS=.*\)\(no\),\1nb,' configure.in
-%{__intltoolize} --automake
-%{__gettextize}
-#%%{__glib_gettextize}
-%{__libtoolize}
-=======
 %{__intltoolize}
->>>>>>> 1.84
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
@@ -98,6 +89,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.87  2008/12/26 02:50:35  adamg
+- previous commit reverted
+
 Revision 1.86  2008/12/26 01:52:47  adamg
 - updated to 1.3.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/pan.spec?r1=1.86&r2=1.87&f=u



More information about the pld-cvs-commit mailing list