Browse Source

rpm:
- update vine patch
- split vine specific macros to /etc/rpm/macros.vine
- fix ruby macros
- update ja.po (fix bogus translations)

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7004 ec354946-7b23-47d6-9f5a-488ba84defc7

daisuke 11 years ago
parent
commit
b874a9c270
1 changed files with 13 additions and 4 deletions
  1. 13 4
      r/rpm/rpm-vl.spec

+ 13 - 4
r/rpm/rpm-vl.spec

@@ -25,16 +25,16 @@ Summary(ja): RPM パッケージ管理システム
 Name: rpm
 Version: 4.10.1
 %{expand: %%define rpm_version %{version}}
-Release: 1%{_dist_release}
+Release: 2%{_dist_release}
 Group: System Environment/Base
 License: GPL
 
 Source: http://rpm.org/releases/rpm-4.8.x/rpm-%{version}.tar.bz2
-Source100: rpm-4.9.1.2-ja.po
+Source10: macros.vine
+Source100: rpm-4.10.1-ja.po
 Source110: GROUPS_for_vine.txt
 Source120: GROUPS-DESC_for_vine.txt
 Source130: COMPAT32_for_vine
-
 Source200: rpm44-perldeps.pl
 
 Patch1: rpm-4.5.90-pkgconfig-path.patch
@@ -332,6 +332,9 @@ install -m 644 scripts/rpm.log ${RPM_BUILD_ROOT}/etc/logrotate.d/rpm
 
 mkdir -p $RPM_BUILD_ROOT/etc/rpm
 
+# install vine macros
+cp %{SOURCE10} $RPM_BUILD_ROOT/etc/rpm/macros.vine
+
 mkdir -p $RPM_BUILD_ROOT/var/spool/repackage
 mkdir -p $RPM_BUILD_ROOT/var/lib/rpm
 for dbi in \
@@ -450,7 +453,7 @@ exit 0
 %config(noreplace,missingok)	/etc/cron.daily/rpm
 %config(noreplace,missingok)	/etc/logrotate.d/rpm
 %dir				/etc/rpm
-#%config(noreplace,missingok)	/etc/rpm/macros.*
+%config(noreplace,missingok)	/etc/rpm/macros.*
 %attr(0755, rpm, rpm)	%dir /var/lib/rpm
 %attr(0755, rpm, rpm)	%dir /var/spool/repackage
 
@@ -591,6 +594,12 @@ exit 0
 
 
 %changelog
+* Thu Oct 25 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 4.10.1-2
+- update vine patch
+  - split vine specific macros to /etc/rpm/macros.vine
+  - fix ruby macros
+- update ja.po (fix bogus translations)
+
 * Wed Oct 03 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 4.10.1-1
 - update to 4.10.1