[zoneminder] Remove some things unnecessary on modern Fedora.

Jason ティビツ tibbs at fedoraproject.org
Sat Jan 22 22:22:31 UTC 2011


commit 0e7fe5a768866b3fc2b4168b46a9319f6db81813
Author: Jason Tibbitts <tibbs at math.uh.edu>
Date:   Sat Jan 22 00:09:54 2011 -0600

    Remove some things unnecessary on modern Fedora.

 zoneminder.spec |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)
---
diff --git a/zoneminder.spec b/zoneminder.spec
index 2ed2fce..7af1af0 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -12,7 +12,6 @@ Group:      System Environment/Daemons
 # Mootools is inder the MIT license: http://mootools.net/
 License:    GPLv2+ and LGPLv2+ and MIT 
 URL:        http://www.zoneminder.com/
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source:     http://www.zoneminder.com/fileadmin/downloads/ZoneMinder-%{version}.tar.gz
 Source2: 	zoneminder.conf
@@ -107,8 +106,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 install -d $RPM_BUILD_ROOT%{_localstatedir}/run
 make install DESTDIR=$RPM_BUILD_ROOT \
 	     INSTALLDIRS=vendor
@@ -141,9 +138,6 @@ install -m 644 %{SOURCE6} mootools-1.2.3-core-yc.js
 ln -s mootools-1.2.3-core-yc.js mootools.js
 popd
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 
 %post
 /sbin/chkconfig --add zoneminder
@@ -203,6 +197,7 @@ fi
 %changelog
 * Fri Jan 21 2011 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.24.2-6
 - Unbundle mootools; instead link to the separately pacakged copy.
+- Remove BuildRoot:, %%clean and buildroot cleaning in %%install.
 
 * Wed Jun 02 2010 Marcela Maslanova <mmaslano at redhat.com> - 1.24.2-5
 - Mass rebuild with perl-5.12.0


More information about the scm-commits mailing list