SPECS: grubby.spec - 6.0.24 - patch to make it compile (removing C99)

[patrys]

Author: patrys                       Date: Mon Dec 17 13:42:05 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 6.0.24
- patch to make it compile (removing C99)

---- Files affected:
SPECS:
   grubby.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SPECS/grubby.spec
diff -u SPECS/grubby.spec:1.13 SPECS/grubby.spec:1.14
--- SPECS/grubby.spec:1.13	Tue Feb 13 08:16:47 2007
+++ SPECS/grubby.spec	Mon Dec 17 14:42:00 2007
@@ -5,16 +5,17 @@
 Summary:	Command line tool for configuring grub, lilo, and elilo
 Summary(pl.UTF-8):	Działające z linii poleceń narzędzie do konfiguracji gruba, lilo i elilo
 Name:		grubby
-Version:	5.0.4
-Release:	2
+Version:	6.0.24
+Release:	1
 License:	GPL
 Group:		Base
 Source0:	mkinitrd-%{version}.tar.bz2
-# Source0-md5:	2ba9ccda4f10e80239ca86fed9bb81d0
+# Source0-md5:	4bcef73138bb05da98e54cbfe48cb8f1
 Patch0:		%{name}-menu.lst.patch
 Patch1:		%{name}-pld.patch
 Patch2:		%{name}-geninitrd.patch
-Patch3:		%{name}-poptshared.patch
+Patch3:		%{name}-c99.patch
+BuildRequires:	libdhcp-devel
 BuildRequires:	popt-devel
 Requires:	geninitrd >= 8243
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -36,6 +37,36 @@
 nowe jądra i potrzebujących odczytać informacje o aktualnym środowisku
 startowym.
 
+%package -n bdevid
+Summary:	Boot-time device identification
+Group:		System
+Requires:	bdevid-libs = %{version}-%{release}
+
+%description -n bdevid
+Boot-time device identification.
+
+%package -n bdevid-libs
+Summary:	Boot-time device identification libraries
+Group:		Development/Libraries
+
+%description -n bdevid-libs
+Boot-time device identification libraries.
+
+%package -n bdevid-devel
+Summary:	Headers and libraries for programs using bdevid
+Group:		Development/Libraries
+
+%description -n bdevid-devel
+Headers and libraries for programs using bdevid.
+
+%package -n python-bdevid
+Summary:	Python bindings for bdevid
+Group:		Libraries/Python
+Requires:	bdevid-libs = %{version}-%{release}
+
+%description -n python-bdevid
+Python bindings for bdevid.
+
 %prep
 %setup -q -n mkinitrd-%{version}
 %patch0 -p1
@@ -44,8 +75,10 @@
 %patch3 -p1
 
 %build
-cd %{name}
-%{__make} CC="%{__cc}"
+#cd %{name}
+CFLAGS="%{rpmcflags}"; export CFLAGS
+%{__make} \
+	CC="%{__cc}"
 
 %if %{with tests}
 %{__make} test
@@ -55,7 +88,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} -C %{name} install \
-	BUILDROOT=$RPM_BUILD_ROOT \
+	DESTDIR=$RPM_BUILD_ROOT \
+	mandir=%{_mandir}
+
+%{__make} -C bdevid install \
+	DESTDIR=$RPM_BUILD_ROOT \
 	mandir=%{_mandir}
 
 install installkernel $RPM_BUILD_ROOT%{_sbindir}
@@ -70,12 +107,37 @@
 %attr(755,root,root) %{_sbindir}/installkernel
 %{_mandir}/man8/grubby.8*
 
+%files -n bdevid
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/bdevid
+%attr(755,root,root) /lib/bdevid/*.so
+
+%files -n bdevid-libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libbdevid.so.*.*.*
+
+%files -n bdevid-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libbdevid.so
+%attr(755,root,root) %{_libdir}/libbdevidprobe.a
+%{_includedir}/bdevid.h
+%{_includedir}/bdevid
+%{_pkgconfigdir}/*.pc
+
+%files -n python-bdevid
+%defattr(644,root,root,755)
+%attr(755,root,root) %{py_sitedir}/bdevid.so
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2007-12-17 13:42:00  patrys
+- 6.0.24
+- patch to make it compile (removing C99)
+
 Revision 1.13  2007-02-13 07:16:47  glen
 - tabs in preamble
 
================================================================

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