- try teaching find-lang about the new gnome help layout (#736523)
This commit is contained in:
parent
6d748ba15f
commit
bd02f6c71b
19
rpm-4.9.x-gnome-help.patch
Normal file
19
rpm-4.9.x-gnome-help.patch
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
diff --git a/scripts/find-lang.sh b/scripts/find-lang.sh
|
||||||
|
index c3dbdbe..c8f4612 100755
|
||||||
|
--- a/scripts/find-lang.sh
|
||||||
|
+++ b/scripts/find-lang.sh
|
||||||
|
@@ -107,6 +107,14 @@ s:%lang(C) ::
|
||||||
|
|
||||||
|
find $TOP_DIR -type d|sed '
|
||||||
|
s:'"$TOP_DIR"'::
|
||||||
|
+'"$NO_ALL_NAME$GNOME"'s:\(.*/share/help/\)\([^/_]\+\)\(/'"$NAME"'\)$:%lang(\2) %doc \1\2\3/:
|
||||||
|
+'"$ALL_NAME$GNOME"'s:\(.*/share/help/\)\([^/_]\+\)\(/[a-zA-Z0-9.\_\-]\+\)$:%lang(\2) %doc \1\2\3/:
|
||||||
|
+s:^\([^%].*\)::
|
||||||
|
+s:%lang(C) ::
|
||||||
|
+/^$/d' >> $MO_NAME
|
||||||
|
+
|
||||||
|
+find "$TOP_DIR" -type d|sed '
|
||||||
|
+s:'"$TOP_DIR"'::
|
||||||
|
'"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'$\):%dir \1:
|
||||||
|
'"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'/[a-zA-Z0-9.\_\-]/.\+\)::
|
||||||
|
'"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'\/\)\([^/_]\+\):%lang(\2) \1\2:
|
8
rpm.spec
8
rpm.spec
@ -21,7 +21,7 @@
|
|||||||
Summary: The RPM package management system
|
Summary: The RPM package management system
|
||||||
Name: rpm
|
Name: rpm
|
||||||
Version: %{rpmver}
|
Version: %{rpmver}
|
||||||
Release: %{?snapver:0.%{snapver}.}1%{?dist}
|
Release: %{?snapver:0.%{snapver}.}2%{?dist}
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Url: http://www.rpm.org/
|
Url: http://www.rpm.org/
|
||||||
Source0: http://rpm.org/releases/rpm-4.9.x/%{name}-%{srcver}.tar.bz2
|
Source0: http://rpm.org/releases/rpm-4.9.x/%{name}-%{srcver}.tar.bz2
|
||||||
@ -48,6 +48,8 @@ Patch302: rpm-4.7.1-geode-i686.patch
|
|||||||
Patch303: rpm-4.9.0-debuginfo-allnames.patch
|
Patch303: rpm-4.9.0-debuginfo-allnames.patch
|
||||||
# Probably to be upstreamed in slightly different form
|
# Probably to be upstreamed in slightly different form
|
||||||
Patch304: rpm-4.9.1.1-ld-flags.patch
|
Patch304: rpm-4.9.1.1-ld-flags.patch
|
||||||
|
# Based on patch from OpenSUSE, without the C-lang related enhancements
|
||||||
|
Patch305: rpm-4.9.x-gnome-help.patch
|
||||||
|
|
||||||
# Partially GPL/LGPL dual-licensed and some bits with BSD
|
# Partially GPL/LGPL dual-licensed and some bits with BSD
|
||||||
# SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD
|
# SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD
|
||||||
@ -213,6 +215,7 @@ packages on a system.
|
|||||||
%patch302 -p1 -b .geode
|
%patch302 -p1 -b .geode
|
||||||
%patch303 -p1 -b .debuginfo-allnames
|
%patch303 -p1 -b .debuginfo-allnames
|
||||||
%patch304 -p1 -b .ldflags
|
%patch304 -p1 -b .ldflags
|
||||||
|
%patch305 -p1 -b .gnome-help
|
||||||
|
|
||||||
%if %{with int_bdb}
|
%if %{with int_bdb}
|
||||||
ln -s db-%{bdbver} db
|
ln -s db-%{bdbver} db
|
||||||
@ -426,6 +429,9 @@ exit 0
|
|||||||
%doc COPYING doc/librpm/html/*
|
%doc COPYING doc/librpm/html/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Oct 12 2011 Panu Matilainen <pmatilai@redhat.com> - 4.9.1.2-2
|
||||||
|
- try teaching find-lang about the new gnome help layout (#736523)
|
||||||
|
|
||||||
* Thu Sep 29 2011 Panu Matilainen <pmatilai@redhat.com> - 4.9.1.2-1
|
* Thu Sep 29 2011 Panu Matilainen <pmatilai@redhat.com> - 4.9.1.2-1
|
||||||
- update to 4.9.1.2 (CVE-2011-3378)
|
- update to 4.9.1.2 (CVE-2011-3378)
|
||||||
- drop upstreamed rpmdb signal patch
|
- drop upstreamed rpmdb signal patch
|
||||||
|
Loading…
Reference in New Issue
Block a user