rpm.spec: create /usr/src/redhat/* in %install.

CVS patchset: 2382
CVS date: 1998/10/02 13:50:49

diff --git a/CHANGES b/CHANGES
index e0430f4..6de1e6c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -19,6 +19,7 @@
 2.5.4 -> 2.5.5:
        - getOutputFrom(): fix race between last read on pipe and child death
          (exacerbated in 2.5.4).
+       - rpm.spec: create /usr/src/redhat/* in %install.
 
 2.5.3 -> 2.5.4:
        - expand args using popt on pre-rpmReadConfigFiles arg pass.

diff --git a/rpm.spec b/rpm.spec
index 56ddb4c..f9368d7 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -26,26 +26,23 @@ creation of graphical package managers and other tools that need
 intimate knowledge of RPM packages.
 
 %prep
-%setup
+%setup -q
 
+%build
+CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr
+make
+
+%install
 rm -rf $RPM_BUILD_ROOT
-mkdir $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/usr/lib
-mkdir -p $RPM_BUILD_ROOT/usr/src/redhat
+
 mkdir -p $RPM_BUILD_ROOT/usr/src/redhat/SOURCES
 mkdir -p $RPM_BUILD_ROOT/usr/src/redhat/SPECS
-mkdir -p $RPM_BUILD_ROOT/usr/src/redhat/RPMS
 mkdir -p $RPM_BUILD_ROOT/usr/src/redhat/SRPMS
 mkdir -p $RPM_BUILD_ROOT/usr/src/redhat/BUILD
 mkdir -p $RPM_BUILD_ROOT/usr/src/redhat/RPMS/${RPM_ARCH}
 mkdir -p $RPM_BUILD_ROOT/usr/src/redhat/RPMS/noarch
-%build
-
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr
 
-make
-
-%install
 make installprefix="$RPM_BUILD_ROOT" install
 
 %clean