SPECS: grubby.spec - added pic patch instead of wrong specflags ha...

[qboosh]

Author: qboosh                       Date: Tue Dec 25 19:13:45 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added pic patch instead of wrong specflags hack
- lib64 fixes
- proper bdevid split, added nash-devel package

---- Files affected:
SPECS:
   grubby.spec (1.21 -> 1.22) 

---- Diffs:

================================================================
Index: SPECS/grubby.spec
diff -u SPECS/grubby.spec:1.21 SPECS/grubby.spec:1.22
--- SPECS/grubby.spec:1.21	Tue Dec 25 19:25:26 2007
+++ SPECS/grubby.spec	Tue Dec 25 20:13:40 2007
@@ -8,7 +8,7 @@
 Name:		grubby
 Version:	6.0.24
 Release:	1
-License:	GPL
+License:	GPL v2
 Group:		Base
 Source0:	mkinitrd-%{version}.tar.bz2
 # Source0-md5:	4bcef73138bb05da98e54cbfe48cb8f1
@@ -16,6 +16,7 @@
 Patch1:		%{name}-pld.patch
 Patch2:		%{name}-geninitrd.patch
 Patch3:		%{name}-c99.patch
+Patch4:		%{name}-pic.patch
 BuildRequires:	device-mapper-devel
 BuildRequires:	e2fsprogs-devel
 BuildRequires:	libdhcp-devel > 1.9
@@ -24,8 +25,6 @@
 Requires:	geninitrd >= 8243
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		specflags_x86_64	-fPIC
-
 %define		_sbindir	/sbin
 
 %description
@@ -93,14 +92,26 @@
 
 %package -n nash-libs
 Summary:	Nash library
-Summary(pl.UTF-8):	Biblioteka nasha
+Summary(pl.UTF-8):	Biblioteka nash
 Group:		Libraries
 
 %description -n nash-libs
 Nash library.
 
 %description -n nash-libs -l pl.UTF-8
-Biblioteka nasha.
+Biblioteka nash.
+
+%package -n nash-devel
+Summary:	Header files for nash library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki nash
+Group:		Development/Libraries
+Requires:	nash-libs = %{version}-%{release}
+
+%description -n nash-devel
+Header files for nash library.
+
+%description -n nash-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki nash.
 
 %prep
 %setup -q -n mkinitrd-%{version}
@@ -108,12 +119,13 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
-#cd %{name}
 CFLAGS="%{rpmcflags}"; export CFLAGS
 %{__make} \
-	CC="%{__cc}"
+	CC="%{__cc}" \
+	LIB=%{_lib}
 
 %if %{with tests}
 %{__make} test
@@ -124,6 +136,7 @@
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
+	LIB=%{_lib} \
 	mandir=%{_mandir}
 
 install installkernel $RPM_BUILD_ROOT%{_sbindir}
@@ -147,12 +160,12 @@
 %files -n bdevid
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/bdevid
-%dir /lib/bdevid
-%attr(755,root,root) /lib/bdevid/*.so
 
 %files -n bdevid-libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libbdevid.so.*.*.*
+%attr(755,root,root) %{_libdir}/libbdevid.so.%{version}
+%dir /%{_lib}/bdevid
+%attr(755,root,root) /%{_lib}/bdevid/*.so
 
 %files -n bdevid-devel
 %defattr(644,root,root,755)
@@ -160,7 +173,8 @@
 %attr(755,root,root) %{_libdir}/libbdevidprobe.a
 %{_includedir}/bdevid.h
 %{_includedir}/bdevid
-%{_pkgconfigdir}/*.pc
+%{_pkgconfigdir}/libbdevid.pc
+%{_pkgconfigdir}/libbdevidprobe.pc
 
 %files -n python-bdevid
 %defattr(644,root,root,755)
@@ -168,7 +182,15 @@
 
 %files -n nash-libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libnash.so.*.*.*
+%attr(755,root,root) %{_libdir}/libnash.so.%{version}
+
+%files -n nash-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libnash.so
+%{_includedir}/blkent.h
+%{_includedir}/nash.h
+%{_includedir}/nash
+%{_pkgconfigdir}/libnash.pc
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -176,6 +198,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2007-12-25 19:13:40  qboosh
+- added pic patch instead of wrong specflags hack
+- lib64 fixes
+- proper bdevid split, added nash-devel package
+
 Revision 1.21  2007-12-25 18:25:26  qboosh
 - ldconfig calls
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/grubby.spec?r1=1.21&r2=1.22&f=u