SPECS (AC-branch): rpm.spec - rpm-build-tools now available from o...

glen glen at pld-linux.org
Thu Aug 30 13:02:34 CEST 2007


Author: glen                         Date: Thu Aug 30 11:02:34 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- rpm-build-tools now available from own spec; rel 46

---- Files affected:
SPECS:
   rpm.spec (1.555.2.198 -> 1.555.2.199) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.555.2.198 SPECS/rpm.spec:1.555.2.199
--- SPECS/rpm.spec:1.555.2.198	Thu Jun 14 23:33:10 2007
+++ SPECS/rpm.spec	Thu Aug 30 13:02:29 2007
@@ -31,7 +31,7 @@
 Summary(uk):	íÅÎÅÄÖÅÒ ÐÁËÅÔ¦× ×¦Ä RPM
 Name:		rpm
 Version:	4.4.2
-Release:	45
+Release:	46
 License:	GPL
 Group:		Base
 Source0:	ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
@@ -53,12 +53,8 @@
 Source15:	%{name}-macros.java
 Source16:	find-java-prov.sh
 Source17:	RPM-GPG-KEY
-
-Source30:	builder
-Source31:	adapter.awk
-Source32:	pldnotify.awk
 # http://svn.pld-linux.org/banner.sh/
-Source33:	banner.sh
+Source18:	banner.sh
 Patch0:		%{name}-pl.po.patch
 Patch1:		%{name}-rpmrc.patch
 Patch2:		%{name}-arch.patch
@@ -496,40 +492,6 @@
 ò¦ÚÎÏÍÁΦÔΦ ÄÏÐÏͦÖΦ ÓËÒÉÐÔÉ ÔÁ ÕÔÉ̦ÔÉ, Ñ˦ ×ÉËÏÒÉÓÔÏ×ÕÀÔØÓÑ ÄÌÑ
 ÐÏÂÕÄÏ×É RPM'¦×.
 
-%package build-tools
-Summary:	Scripts for managing .spec files and building RPM packages
-Summary(de):	Scripts fürs Bauen binärer RPM-Pakete
-Summary(pl):	Skrypty pomocnicze do zarz±dznia plikami .spec i budowania RPM-ów
-Summary(pt_BR):	Scripts e programas executáveis usados para construir pacotes
-Summary(ru):	óËÒÉÐÔÙ É ÕÔÉÌÉÔÙ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ÓÂÏÒËÉ ÐÁËÅÔÏ×
-Summary(uk):	óËÒÉÐÔÉ ÔÁ ÕÔÉ̦ÔÉ, ÎÅÏÂȦÄΦ ÄÌÑ ÐÏÂÕÄÏ×É ÐÁËÅÔ¦×
-Group:		Applications/File
-Requires:	%{name}-build = %{version}-%{release}
-# these are optional
-#Requires:	cvs
-Requires:	wget
-
-%description build-tools
-Scripts for managing .spec files and building RPM packages.
-
-%description build-tools -l de
-Scripts fürs Bauen RPM-Pakete.
-
-%description build-tools -l pl
-Skrypty pomocnicze do zarz±dzania plikami .spec i do budowania RPM-ów.
-
-%description build-tools -l pt_BR
-Este pacote contém scripts e programas executáveis que são usados para
-construir pacotes usando o RPM.
-
-%description build-tools -l ru
-òÁÚÌÉÞÎÙÅ ×ÓÐÏÍÏÇÁÔÅÌØÎÙÅ ÓËÒÉÐÔÙ É ÉÓÐÏÌÎÑÅÍÙÅ ÐÒÏÇÒÁÍÍÙ, ËÏÔÏÒÙÅ
-ÉÓÐÏÌØÚÕÀÔÓÑ ÄÌÑ ÓÂÏÒËÉ RPM'Ï×.
-
-%description build-tools -l uk
-ò¦ÚÎÏÍÁΦÔΦ ÄÏÐÏͦÖΦ ÓËÒÉÐÔÉ ÔÁ ÕÔÉ̦ÔÉ, Ñ˦ ×ÉËÏÒÉÓÔÏ×ÕÀÔØÓÑ ÄÌÑ
-ÐÏÂÕÄÏ×É RPM'¦×.
-
 %package javaprov
 Summary:	Additional utilities for checking Java provides/requires in rpm packages
 Group:		Applications/File
@@ -827,10 +789,7 @@
 install %{SOURCE5} $RPM_BUILD_ROOT%{_rpmlibdir}/find-lang.sh
 install %{SOURCE14} $RPM_BUILD_ROOT/etc/sysconfig/rpm
 
-install %{SOURCE30} $RPM_BUILD_ROOT%{_bindir}/builder
-install %{SOURCE31} $RPM_BUILD_ROOT%{_bindir}/adapter.awk
-install %{SOURCE32} $RPM_BUILD_ROOT%{_bindir}/pldnotify.awk
-install %{SOURCE33} $RPM_BUILD_ROOT%{_bindir}/banner.sh
+install %{SOURCE18} $RPM_BUILD_ROOT%{_bindir}/banner.sh
 
 install rpmio/ugid.h $RPM_BUILD_ROOT%{_includedir}/rpm
 
@@ -1154,12 +1113,6 @@
 %lang(pl) %{_mandir}/pl/man1/gendiff.1*
 %lang(pl) %{_mandir}/pl/man8/rpmbuild.8*
 
-%files build-tools
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/builder
-%attr(755,root,root) %{_bindir}/adapter.awk
-%attr(755,root,root) %{_bindir}/pldnotify.awk
-
 %files javaprov
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/javadeps
@@ -1206,6 +1159,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.555.2.199  2007/08/30 11:02:29  glen
+- rpm-build-tools now available from own spec; rel 46
+
 Revision 1.555.2.198  2007/06/14 21:33:10  glen
 - add patch to ignore Suggests and other tags (by jbj); rel 45
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm.spec?r1=1.555.2.198&r2=1.555.2.199&f=u



More information about the pld-cvs-commit mailing list