[rhdb-utils] - Merge-review cleanup (#226370)

paragn paragn at fedoraproject.org
Sat Sep 11 03:52:57 UTC 2010


commit ffcd48106cd77f57838e686f6cb0e3ca22522aad
Author: Parag Nemade <paragn at fedoraproject.org>
Date:   Sat Sep 11 09:17:40 2010 +0530

    - Merge-review cleanup (#226370)

 rhdb-utils.spec |   24 ++++++++++--------------
 1 files changed, 10 insertions(+), 14 deletions(-)
---
diff --git a/rhdb-utils.spec b/rhdb-utils.spec
index da1901a..e1e7391 100644
--- a/rhdb-utils.spec
+++ b/rhdb-utils.spec
@@ -6,14 +6,12 @@
 Summary: Miscellaneous utilities for PostgreSQL - Red Hat Edition
 Name: rhdb-utils
 Version: 8.4.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://sources.redhat.com/rhdb/
 # pg_crc.c is copied from postgresql, hence MIT; the rest is GPL
 License: GPLv2+ and MIT
 Group: Applications/Databases
-
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: postgresql-devel >= 8.4
+BuildRequires: postgresql-devel
 
 Source0: http://sources.redhat.com/rhdb/tools/pg_filedump-%{version}.tar
 # We keep a copy of pg_crc.c in this SRPM so we don't need to have the
@@ -29,30 +27,28 @@ PostgreSQL - Red Hat Edition.
 %prep
 %setup -q -n pg_filedump-%{version}
 
-cp %{SOURCE1} pg_crc.c
+cp -p %{SOURCE1} pg_crc.c
 
 %patch1 -p1
 
 %build
+#Following flags needed as per rh##596204 
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fwrapv"
-
-make
+make %{?_smp_mflags} 
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-
 mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
-install -m 755 pg_filedump ${RPM_BUILD_ROOT}%{_bindir}
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
+install -p -m 755 pg_filedump ${RPM_BUILD_ROOT}%{_bindir}
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/pg_filedump
 %doc ChangeLog README.pg_filedump
 
 %changelog
+* Sat Sep 11 2010 Parag Nemade <paragn AT fedoraproject.org> 8.4.0-4
+- Merge-review cleanup (#226370)
+
 * Fri Jun  4 2010 Tom Lane <tgl at redhat.com> 8.4.0-3
 - Add -fno-strict-aliasing to CFLAGS per rpmdiff complaint, and -fwrapv
   too just to be on the safe side.


More information about the scm-commits mailing list