SPECS: e2fsprogs.spec - call make once when possible - mkinstalldi...

Sat Aug 26 23:24:32 CEST 2006

Author: glen                         Date: Sat Aug 26 21:24:32 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- call make once when possible
- mkinstalldirs hackfix
- check-files cleanup

---- Files affected:
SPECS:
   e2fsprogs.spec (1.150 -> 1.151) 

---- Diffs:

================================================================
Index: SPECS/e2fsprogs.spec
diff -u SPECS/e2fsprogs.spec:1.150 SPECS/e2fsprogs.spec:1.151

--- SPECS/e2fsprogs.spec:1.150	Fri Aug 25 21:26:06 2006
+++ SPECS/e2fsprogs.spec	Sat Aug 26 23:24:26 2006
@@ -42,16 +42,16 @@
 Patch0:		%{name}-info.patch
 Patch1:		e2compr-info.patch
 URL:		http://e2fsprogs.sourceforge.net/
-BuildRequires:	automake
 BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRequires:	device-mapper-devel
 BuildRequires:	gettext-devel >= 0.11
 BuildRequires:	texinfo
 %if %{with static}
 BuildRequires:	device-mapper-static
 BuildRequires:	glibc-static
-BuildRequires:	libsepol-static
 BuildRequires:	libselinux-static
+BuildRequires:	libsepol-static
 %endif
 Requires(post,postun):	/sbin/ldconfig
 Requires:	fsck = %{version}-%{release}
@@ -552,11 +552,7 @@
 	--enable-fsck \
 	--disable-rpath
 
-%{__make} libs \
-	LDFLAGS="%{rpmldflags}"
-%{__make} progs \
-	LDFLAGS="%{rpmldflags}"
-%{__make} docs \
+%{__make} libs progs docs \
 	LDFLAGS="%{rpmldflags}"
 
 cd doc
@@ -568,14 +564,9 @@
 
 echo "install-shlibs:" >> intl/Makefile
 
-%{__make} install \
-	root_libdir=/%{_lib} \
-	DESTDIR=$RPM_BUILD_ROOT
-%{__make} install-libs \
-	root_libdir=/%{_lib} \
-	DESTDIR=$RPM_BUILD_ROOT
-%{__make} -C po install	\
+%{__make} install install-libs \
 	root_libdir=/%{_lib} \
+	mkinstalldirs='install -d' \
 	DESTDIR=$RPM_BUILD_ROOT
 
 ln -sf e2fsck $RPM_BUILD_ROOT/sbin/fsck.ext2
@@ -607,6 +598,8 @@
 %find_lang %{name}
 %endif
 
+rm -f $RPM_BUILD_ROOT%{_mandir}/README.e2fsprogs-non-english-man-pages
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -751,6 +744,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.151  2006/08/26 21:24:26  glen
+- call make once when possible
+- mkinstalldirs hackfix
+- check-files cleanup
+
 Revision 1.150  2006/08/25 19:26:06  qboosh
 - fsck needs ldconfig (for libblkid.so.1); release 2
 
@@ -806,7 +804,7 @@
 - fsck.nfs moved to nfs-utils
 
 Revision 1.133  2004/06/05 21:58:33  arekm
-fsck.nfs added
+- fsck.nfs added
 
 Revision 1.132  2004/02/29 19:53:22  qboosh
 - updated to 1.35 (important when using SELinux on big-endians)
@@ -852,7 +850,7 @@
 - added Conflicts: e2fsprogs-* before split to lib*
 
 Revision 1.120  2003/10/09 09:21:05  qboosh
-- some post-split cleanups (descriptions, dependencies, missing %%lang)
+- some post-split cleanups (descriptions, dependencies, missing %lang)
 - moved genuuid utility to libuuid
 
 Revision 1.119  2003/10/09 00:38:07  wiget
@@ -867,7 +865,7 @@
 - separated libcom_err and libuuid into subpackages
 
 Revision 1.116  2003/09/07 21:56:44  ankry
-- typo in %%if
+- typo in %if
 
 Revision 1.115  2003/09/07 21:31:12  ankry
 - remove empty translation file
@@ -906,7 +904,7 @@
 
 Revision 1.105  2003/04/22 06:43:18  kloczek
 - updated to 1.33: bug fixes,
-- gnostrip patch from RH (for better %%{debug} support).
+- gnostrip patch from RH (for better %{debug} support).
 
 Revision 1.104  2003/03/02 18:28:13  juandon
 - spec is parallel make friendly now
@@ -947,12 +945,12 @@
 - removed rlimit-workaround outdated patch.
 
 Revision 1.94  2002/06/23 20:52:49  kloczek
-- perl -pi -e "s/^gettextize --copy --force/\%%\{__gettextize\}/"
+- perl -pi -e "s/^gettextize --copy --force/\%\{__gettextize\}/"
 
 Revision 1.93  2002/05/21 23:12:57  kloczek
-- perl -pi -e "s/^automake -a -c -f --foreing/\%%\{__automake\}/; \
-               s/^automake -a -c -f/\%%\{__automake\}/; \
-	       s/^autoconf/\%%\{__autoconf\}/"
+- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
+               s/^automake -a -c -f/\%\{__automake\}/; \
+       s/^autoconf/\%\{__autoconf\}/"
 
 Revision 1.92  2002/05/20 22:43:02  ankry
 - remove empty (it) and example (nyc) translation files from build
@@ -1017,7 +1015,7 @@
   Group field using gettext).
 
 Revision 1.77  2002/02/19 18:53:33  gotar
-- %%desc
+- %desc
 
 Revision 1.76  2002/02/02 20:01:10  ankry
 - adding es/fr/pt_BR/ru/uk (and eventually de) Group translations
@@ -1058,7 +1056,7 @@
 - release 2
 
 Revision 1.65  2001/07/26 05:42:06  saq
-- reverting last change: removing new macros from %%p{re,ost}{,un}
+- reverting last change: removing new macros from %p{re,ost}{,un}
 
 Revision 1.63  2001/06/24 08:50:34  misiek
 - updated to 1.22
@@ -1069,7 +1067,7 @@
 - release 2: fixed info patch - removed double @dircategory entry.
 
 Revision 1.61  2001/06/17 14:47:05  kloczek
-- fixed %%package BOOT header.
+- fixed %package BOOT header.
 
 Revision 1.60  2001/06/17 11:28:22  misiek
 - updated to 1.21
@@ -1123,7 +1121,7 @@
 - updated to 1.19 and adapterized
 
 Revision 1.45  2000/06/09 07:22:49  kloczek
-- added using %%{__make} macro.
+- added using %{__make} macro.
 
 Revision 1.44  2000/06/07 06:04:27  wiget
 - Release:6
@@ -1136,7 +1134,7 @@
 
 Revision 1.41  2000/05/01 20:11:40  zagrodzki
 - removed Prereq: /usr/sbin/fix-info-dir
-- fix-info-dir in %%pre/post is executed only when info is already
+- fix-info-dir in %pre/post is executed only when info is already
   installed
 
 Revision 1.40  2000/04/11 14:25:44  wiget
@@ -1175,10 +1173,10 @@
 
 Revision 1.32  1999/10/26 11:05:56  kloczek
 - updated to 1.16,
-- new en and pl Summary and %%description.
+- new en and pl Summary and %description.
 
 Revision 1.31  1999/09/24 10:45:02  pius
-- moved running of /usr/sbin/fix-info-dir to %%postun
+- moved running of /usr/sbin/fix-info-dir to %postun
 - release up
 
 Revision 1.30  1999/09/19 09:14:08  pius
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/e2fsprogs.spec?r1=1.150&r2=1.151&f=u

