packages: rpm-build-macros/rpm-find-lang, rpm-build-macros/rpm-build-macros...

[megabajt]

Author: megabajt                     Date: Fri Sep 30 09:45:44 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added support for new gnome help location
- release 2

---- Files affected:
packages/rpm-build-macros:
   rpm-find-lang (1.34 -> 1.35) , rpm-build-macros.spec (1.299 -> 1.300) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm-find-lang
diff -u packages/rpm-build-macros/rpm-find-lang:1.34 packages/rpm-build-macros/rpm-find-lang:1.35
--- packages/rpm-build-macros/rpm-find-lang:1.34	Tue Dec 14 17:15:07 2010
+++ packages/rpm-build-macros/rpm-find-lang	Fri Sep 30 11:45:39 2011
@@ -228,8 +228,10 @@
 		cat __find.dirs
 	fi
 ) | sed '
+'"$NO_ALL_NAME$GNOME"'s:\(.*/share/help/\)\([^/]\+\)\(/'"$NAME"'\)$:%lang(\2) \1\2\3:
 '"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'$\):%dir \1:
 '"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'/\)\([^/]\+\)$:%lang(\2) \1\2:
+'"$ALL_NAME$GNOME"'s:\(.*/share/help/\)\([^/]\+\)\(/[^/]\+\)$:%lang(\2) \1\2\3:
 '"$ALL_NAME$GNOME"'s:\(.*/gnome/help/[^/]\+$\):%dir \1:
 '"$ALL_NAME$GNOME"'s:\(.*/gnome/help/[^/]\+/\)\([^/]\+\)$:%lang(\2) \1\2:
 /^[^%]/d

================================================================
Index: packages/rpm-build-macros/rpm-build-macros.spec
diff -u packages/rpm-build-macros/rpm-build-macros.spec:1.299 packages/rpm-build-macros/rpm-build-macros.spec:1.300
--- packages/rpm-build-macros/rpm-build-macros.spec:1.299	Thu Aug 25 21:14:39 2011
+++ packages/rpm-build-macros/rpm-build-macros.spec	Fri Sep 30 11:45:39 2011
@@ -1,11 +1,11 @@
 # $Revision$, $Date$
 %define		rpm_macros_rev	1.619
-%define		find_lang_rev	1.34
+%define		find_lang_rev	1.35
 Summary:	PLD Linux RPM build macros
 Summary(pl.UTF-8):	Makra do budowania pakietów RPM dla Linuksa PLD
 Name:		rpm-build-macros
 Version:	%{rpm_macros_rev}
-Release:	1
+Release:	2
 License:	GPL
 Group:		Development/Building
 Source0:	rpm.macros
@@ -92,6 +92,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.300  2011/09/30 09:45:39  megabajt
+- added support for new gnome help location
+- release 2
+
 Revision 1.299  2011/08/25 19:14:39  arekm
 - disable constify grsec plugin for modules
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm-find-lang?r1=1.34&r2=1.35&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm-build-macros.spec?r1=1.299&r2=1.300&f=u