SPECS: rpm-macros.spec - prepare for macros.build

[glen]

Author: glen                         Date: Fri Oct 28 12:22:45 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- prepare for macros.build

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

---- Diffs:

================================================================
Index: SPECS/rpm-macros.spec
diff -u SPECS/rpm-macros.spec:1.31 SPECS/rpm-macros.spec:1.32
--- SPECS/rpm-macros.spec:1.31	Fri Oct 28 10:28:32 2005
+++ SPECS/rpm-macros.spec	Fri Oct 28 14:22:39 2005
@@ -10,12 +10,12 @@
 # - move macros.pld to /usr/lib/rpm, but first need to change rpmmrc
 #   for it to search the macrofile from there.
 # - commit debuginfo.patch to rpm.macros
-%define	rpm_macros_rev	1.251
+%define	rpm_macros_rev	1.253
 Summary:	PLD Linux RPM Macros
 Summary(pl):	Makra RPM dla Linuksa PLD
 Name:		rpm-macros
 Version:	%{rpm_macros_rev}
-Release:	1
+Release:	1.2
 License:	GPL
 Group:		Base
 Source0:	rpm.macros
@@ -27,6 +27,8 @@
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_rpmlibdir /usr/lib/rpm
+
 %description
 This package contains rpm macros for PLD Linux.
 
@@ -40,24 +42,26 @@
 rpm-build (być może ten pakiet zostanie w przyszłości wydzielony).
 
 %prep
-%setup -q -c -T
+%setup -qcT
 install %{SOURCE0} macros.in
 %patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/rpm
+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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{_sysconfdir}/rpm/*
+#%{_sysconfdir}/rpm/*
+%{_rpmlibdir}/*
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -65,6 +69,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2005/10/28 12:22:39  glen
+- prepare for macros.build
+
 Revision 1.31  2005/10/28 08:28:32  glen
 - rpm_macros_rev 1.251
 - alias rpm-build-macros
================================================================

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