SPECS: rpm-macros.spec - rename to rpm-build-macros

glen glen at pld-linux.org
Fri Oct 28 22:53:41 CEST 2005


Author: glen                         Date: Fri Oct 28 20:53:41 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rename to rpm-build-macros

---- Files affected:
SPECS:
   rpm-macros.spec (1.32 -> 1.33) 

---- Diffs:

================================================================
Index: SPECS/rpm-macros.spec
diff -u SPECS/rpm-macros.spec:1.32 SPECS/rpm-macros.spec:1.33
--- SPECS/rpm-macros.spec:1.32	Fri Oct 28 14:22:39 2005
+++ SPECS/rpm-macros.spec	Fri Oct 28 22:53:36 2005
@@ -13,17 +13,15 @@
 %define	rpm_macros_rev	1.253
 Summary:	PLD Linux RPM Macros
 Summary(pl):	Makra RPM dla Linuksa PLD
-Name:		rpm-macros
+Name:		rpm-build-macros
 Version:	%{rpm_macros_rev}
-Release:	1.2
+Release:	1.3
 License:	GPL
 Group:		Base
 Source0:	rpm.macros
-Patch0:		%{name}-debuginfo.patch
 Requires:	rpm-build
 Provides:	rpmbuild(macros) = %{rpm_macros_rev}
-Provides:	rpm-build-macros
-Conflicts:	rpm < 4.4.1
+Obsoletes:	rpm-macros
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -42,25 +40,17 @@
 rpm-build (być może ten pakiet zostanie w przyszłości wydzielony).
 
 %prep
-%setup -qcT
-install %{SOURCE0} macros.in
-%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/rpm,%{_rpmlibdir}}
-sed -e '
-# truncate until %%_topdir macro
-1,/^%%_topdir/d
-' macros.in > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.pld
-cp macros.in $RPM_BUILD_ROOT%{_rpmlibdir}/macros.build
+install -d $RPM_BUILD_ROOT%{_rpmlibdir}
+cp %{SOURCE0} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.build
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-#%{_sysconfdir}/rpm/*
 %{_rpmlibdir}/*
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -69,6 +59,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.33  2005/10/28 20:53:36  glen
+- rename to rpm-build-macros
+
 Revision 1.32  2005/10/28 12:22:39  glen
 - prepare for macros.build
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/rpm-macros.spec?r1=1.32&r2=1.33&f=u




More information about the pld-cvs-commit mailing list