SPECS: tzdata.spec - adapter is smart

[glen]

Author: glen                         Date: Sun Apr  9 12:15:33 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- adapter is smart

---- Files affected:
SPECS:
   tzdata.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/tzdata.spec
diff -u SPECS/tzdata.spec:1.3 SPECS/tzdata.spec:1.4
--- SPECS/tzdata.spec:1.3	Sat Apr  8 22:52:31 2006
+++ SPECS/tzdata.spec	Sun Apr  9 14:15:28 2006
@@ -15,7 +15,7 @@
 BuildRequires:	gawk
 BuildRequires:	perl-base
 BuildArch:	noarch
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -n -u)
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 This package contains data files with rules for various timezones
@@ -26,7 +26,7 @@
 całym świecie.
 
 %prep
-%setup -n tzdata
+%setup -q -n %{name}
 mkdir %{name}%{version}
 tar xzf %{SOURCE1} -C %{name}%{version}
 mkdir tzcode%{version}
@@ -35,19 +35,20 @@
 %build
 sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
-    -e 's|@install_root@|%{buildroot}|' \
+    -e 's|@install_root@|$RPM_BUILD_ROOT|' \
   Makeconfig.in > Makeconfig
 %{__make}
 grep -v tz-art.htm tzcode%{version}/tz-link.htm > tzcode%{version}/tz-link.html
 
 %install
+rm -rf $RPM_BUILD_ROOT
 %{__make} install
 echo ====================TESTING=========================
 %{__make} check
 echo ====================TESTING END=====================
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
@@ -60,6 +61,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2006/04/09 12:15:28  glen
+- adapter is smart
+
 Revision 1.3  2006/04/08 20:52:31  darekr
 - remove BR glibc-devel which is required by rpm-build
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/tzdata.spec?r1=1.3&r2=1.4&f=u