packages: tzdata/tzdata.spec - revert breakage in r1.90 (wrong TZDIR), make...

[glen]

Author: glen                         Date: Mon Oct 25 16:45:48 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- revert breakage in r1.90 (wrong TZDIR), make check works fine by itself

---- Files affected:
packages/tzdata:
   tzdata.spec (1.93 -> 1.94) 

---- Diffs:

================================================================
Index: packages/tzdata/tzdata.spec
diff -u packages/tzdata/tzdata.spec:1.93 packages/tzdata/tzdata.spec:1.94
--- packages/tzdata/tzdata.spec:1.93	Mon Oct 25 18:32:47 2010
+++ packages/tzdata/tzdata.spec	Mon Oct 25 18:45:43 2010
@@ -142,19 +142,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d}
-install -d $RPM_BUILD_ROOT%{_includedir}
-install -d $RPM_BUILD_ROOT%{_mandir}/man5
-
+install -d $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},%{_mandir}/man5,%{_includedir}}
 %{__make} install
 
 %if %{with tests}
+# test needs to be ran after "make install", as it uses installed files
 : ====================TESTING=========================
 %{__make} check \
 	CC="%{__cc}" \
 	CFLAGS="%{rpmcflags} %{rpmldflags}"
-TZDIR=$(pwd)/obj ./obj/test-tz
-TZDIR=$(pwd)/obj ./obj/tst-timezone
 : ====================TESTING END=====================
 %endif
 
@@ -250,6 +246,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.94  2010/10/25 16:45:43  glen
+- revert breakage in r1.90 (wrong TZDIR), make check works fine by itself
+
 Revision 1.93  2010/10/25 16:32:47  glen
 - will send without tests
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tzdata/tzdata.spec?r1=1.93&r2=1.94&f=u