rpms/dietlibc/F-8 dietlibc.spec,1.41,1.42

[Enrico Scholz (ensc)]

Author: ensc

Update of /cvs/extras/rpms/dietlibc/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23676

Modified Files:
	dietlibc.spec 
Log Message:
- updated to CVS snapshot 20080221; removed most of the last patches
  as they are now in upstream
- moved files into platform neutral /usr/lib dir (not using %%_lib or
  %%_libdir macro)
- added -devel subpackage due to multiarch issues; main package contains
  only the 'diet' binary plus some tools while -devel holds all the
  header and object files.



Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/F-8/dietlibc.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- dietlibc.spec	21 Jun 2008 13:39:09 -0000	1.41
+++ dietlibc.spec	21 Jun 2008 13:41:48 -0000	1.42
@@ -6,7 +6,8 @@
 ## --with dynamic   ...  enable dynamic lib support
 
 
-%global snapshot	20080212
+%global snapshot	20080221
+%global pkglibdir	%_prefix/lib/dietlibc
 
 %ifarch %ix86 x86_64
 %bcond_without		ssp
@@ -48,18 +49,18 @@
 Patch31:	dietlibc-0.31-defpath.patch
 Patch32:	dietlibc-0.31-stacksmash.patch
 Patch33:	dietlibc-0.31-stacksmash-dyn.patch
-Patch34:	dietlibc-0.31.20080212-printffmt.patch
-Patch40:	dietlibc-0.31-printftest.patch
 Patch41:	dietlibc-0.31.20080212-teststdout.patch
-Patch42:	dietlibc-0.31.20080212-strlen.patch
-Patch43:	dietlibc-0.31.20080212-ulong.patch
-Patch44:	dietlibc-0.31.20080212-strend.patch
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 %{?with_dynamic:Requires:	dietlibc-lib = %version-%release}
 %{!?with_dynamic:Obsoletes:	dietlibc-lib < %version-%release}
 
-#### HACK!!
-BuildRequires:	strace gdb
+Requires:	%name-devel = %version-%release
+
+
+%package devel
+Summary:	dietlibc development files
+Group:		Development/Libraries
+Requires:	%name = %version-%release
 
 
 %package lib
@@ -73,6 +74,12 @@
 used to create small statically linked binaries for Linux on alpha,
 arm, hppa, ia64, i386, mips, s390, sparc, sparc64, ppc and x86_64.
 
+%description devel
+The diet libc is a libc that is optimized for small size. It can be
+used to create small statically linked binaries for Linux on alpha,
+arm, hppa, ia64, i386, mips, s390, sparc, sparc64, ppc and x86_64.
+
+This package contains the header and object files for dietlibc.
 
 %description lib
 The diet libc is a libc that is optimized for small size. It can be
@@ -90,13 +97,8 @@
 %patch31 -p1 -b .defpath
 %patch32 -p1 -b .stacksmash
 %patch33 -p1 -b .stacksmash-dyn
-%patch34 -p1 -b .printffmt
 
-%patch40 -p1 -b .printftest
 %patch41 -p1 -b .teststdout
-%patch42 -p1 -b .strlen
-%patch43 -p1 -b .ulong
-%patch44 -p1 -b .strend
 
 
 %if %{without ssp}
@@ -111,7 +113,7 @@
 sed -i -e 's!strip !: !g' Makefile
 
 %global fixcflags	-fomit-frame-pointer -fno-exceptions -fno-asynchronous-unwind-tables %xtra_fixcflags -Os -g3
-%global basemakeflags	prefix=%_libdir/dietlibc BINDIR=%_bindir MAN1DIR=%_mandir/man1 COMMENT=: CFLAGS="$RPM_OPT_FLAGS %fixcflags $XTRA_CFLAGS" PDIET=%_libdir/dietlibc
+%global basemakeflags	prefix=%pkglibdir BINDIR=%_bindir MAN1DIR=%_mandir/man1 COMMENT=: CFLAGS="$RPM_OPT_FLAGS %fixcflags $XTRA_CFLAGS" PDIET=%pkglibdir
 %global makeflags	%basemakeflags
 
 for i in `find test -name 'runtests.sh'`; do
@@ -132,9 +134,9 @@
 install -d -m755 $RPM_BUILD_ROOT/etc
 make %makeflags DESTDIR=$RPM_BUILD_ROOT install
 
-ln -s lib-%_arch ${RPM_BUILD_ROOT}%_libdir/dietlibc/lib-%_arch-%_vendor
+ln -s lib-%_arch ${RPM_BUILD_ROOT}%pkglibdir/lib-%_arch-%_vendor
 
-chmod a-x $RPM_BUILD_ROOT%_libdir/dietlibc/lib-*/*.o
+chmod a-x $RPM_BUILD_ROOT%pkglibdir/lib-*/*.o
 rm -f $RPM_BUILD_ROOT%_bindir/dnsd
 
 
@@ -153,24 +155,38 @@
 
 %files
 %defattr(-,root,root,-)
-%{?with_dynamic:%exclude %_libdir/dietlibc/*/*.so}
 %doc AUTHOR BUGS CAVEAT CHANGES COPYING FAQ PORTING README*
 %doc SECURITY THANKS TODO
 %doc %_mandir/*/*
 %_bindir/*
-%_libdir/dietlibc
+
+
+%files devel
+%defattr(-,root,root,-)
+%pkglibdir
+%{?with_dynamic:%exclude %pkglibdir/*/*.so}
+
 
 %if %{with dynamic}
 %files lib
 %defattr(-,root,root,-)
 %config(noreplace) %_sysconfdir/*
-%dir %_libdir/dietlibc
-%dir %_libdir/dietlibc/lib-*
-%_libdir/dietlibc/lib-%target_cpu/*.so
+%dir %pkglibdir
+%dir %pkglibdir/lib-*
+%pkglibdir/lib-%target_cpu/*.so
 %endif
 
 
 %changelog
+* Fri Feb 22 2008 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.31-1.20080221
+- updated to CVS snapshot 20080221; removed most of the last patches
+  as they are now in upstream
+- moved files into platform neutral /usr/lib dir (not using %%_lib or
+  %%_libdir macro)
+- added -devel subpackage due to multiarch issues; main package contains
+  only the 'diet' binary plus some tools while -devel holds all the
+  header and object files.
+
 * Wed Feb 13 2008 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.31-1.20080212
 - updated to CVS snapshot 20080212
 - fixed printf regression for '%+04i' style formats