rpms/dietlibc/devel dietlibc.spec,1.66,1.67

[ensc]

Author: ensc

Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10541

Modified Files:
	dietlibc.spec 
Log Message:
- added -static provides (#609606)
- use %%apply, not %%patch
- updated %%release_func macro



Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- dietlibc.spec	25 Jul 2009 14:52:48 -0000	1.66
+++ dietlibc.spec	9 Jul 2010 08:17:59 -0000	1.67
@@ -3,8 +3,11 @@
 ##                       on target architecture
 ## --with dynamic   ...  enable dynamic lib support
 
+## Fedora Extras specific customization below...
+%bcond_without		noarch
+##
 
-#global snapshot	20090228
+#global prerelease	20090228
 %global pkglibdir	%_prefix/lib/dietlibc
 
 %ifarch %ix86 x86_64
@@ -23,21 +26,24 @@
 %global target_cpu	%_target_cpu
 %endif
 
-%{!?release_func:%global release_func() %1%{?dist}}
+%{?with_noarch:%global noarch	BuildArch:	noarch}
+%{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}}
+%{!?apply:%global  apply(p:n:b:) %patch%%{-n:%%{-n*}} %%{-p:-p %%{-p*}} %%{-b:-b %%{-b*}} \
+%nil}
 
 Summary:	Small libc implementation
 Name:		dietlibc
 Version:	0.32
-Release:	%release_func 0%{?snapshot:.%snapshot}
+Release:	%release_func 1400
 License:	GPLv2
 Group:		Development/Libraries
 URL:		http://www.fefe.de/dietlibc/
-%if !0%{?snapshot:1}
+%if !0%{?prerelease:1}
 Source0:	http://www.kernel.org/pub/linux/libs/dietlibc/%name-%version.tar.bz2
 Source1:	http://www.fefe.de/dietlibc/%name-%version.tar.bz2.sig
 %else
 # generated by 'make cvs-sources [CVS_DATE=....]'
-Source0:	%name-%version.%snapshot.tar.bz2
+Source0:	%name-%version.%prerelease.tar.bz2
 %endif
 Source10:	runtests-X.sh
 Patch1:		dietlibc-0.28-setpriority.patch
@@ -70,6 +76,8 @@ Summary:	dietlibc development files
 Group:		Development/Libraries
 Requires:	%name = %version-%release
 Requires:	%name-header = %version-%release
+Provides:	%name-static = %version-%release
+Provides:	%name-static%{?_isa} = %version-%release
 
 %package header
 Summary:	dietlibc header files
@@ -77,7 +85,7 @@ Group:		Development/Libraries
 Requires:	%name = %version-%release
 Requires(pre):	%name-devel = %version-%release
 Requires:	%name-devel = %version-%release
-BuildArch:	noarch
+%{?noarch}
 
 %package lib
 Summary:	Dynamic libraries for dietlibc
@@ -113,29 +121,29 @@ This package contains the dynamic librar
 
 
 %prep
-%setup -q %{?snapshot:-n %name-%version.%snapshot}
-%patch1  -p1 -b .nice
-%patch51 -p1 -b .smp
-%patch53 -p1 -b .strip
-%patch50 -p1 -b .no-stack-protector
-
-%patch10 -p1 -b .scall
-%patch30 -p1 -b .longdouble
-%patch31 -p1 -b .defpath
-%patch32 -p1 -b .stacksmash
-%patch33 -p1 -b .stacksmash-dyn
-
-%patch41 -p1 -b .teststdout
-%patch43 -p1 -b .pagesize
-%patch44 -p1 -b .printFG
-%patch46 -p1 -b .testsuite
-%patch47 -p1 -b .lcctime
-%patch48 -p1 -b .implicitfunc
-%patch49 -p1 -b .noreturn
-%patch52 -p1 -b .stackgap
+%setup -q %{?prerelease:-n %name-%version.%prerelease}
+%apply -n1  -p1 -b .nice
+%apply -n51 -p1 -b .smp
+%apply -n53 -p1 -b .strip
+%apply -n50 -p1 -b .no-stack-protector
+
+%apply -n10 -p1 -b .scall
+%apply -n30 -p1 -b .longdouble
+%apply -n31 -p1 -b .defpath
+%apply -n32 -p1 -b .stacksmash
+%apply -n33 -p1 -b .stacksmash-dyn
+
+%apply -n41 -p1 -b .teststdout
+%apply -n43 -p1 -b .pagesize
+%apply -n44 -p1 -b .printFG
+%apply -n46 -p1 -b .testsuite
+%apply -n47 -p1 -b .lcctime
+%apply -n48 -p1 -b .implicitfunc
+%apply -n49 -p1 -b .noreturn
+%apply -n52 -p1 -b .stackgap
 
 %if %{without ssp}
-%patch20 -p1 -b .nostackprotector
+%apply -n20 -p1 -b .nostackprotector
 sed -i -e 's!^#define WANT_SSP$!// \0!g;
 	   s!.*\(#define WANT_STACKGAP\).*!\1!g' dietfeatures.h
 %global xtra_fixcflags	-fno-stack-protector
@@ -193,8 +201,6 @@ bash ./runtests-X.sh
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%changelog
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHOR BUGS CAVEAT CHANGES COPYING FAQ PORTING README*
@@ -226,6 +232,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+%changelog
+* Fri Jul  9 2010 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.32-1400
+- added -static provides (#609606)
+- use %%apply, not %%patch
+- updated %%release_func macro
+
 * Sat Jul 25 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.32-0
 - updated to 0.32
 - fixed stackgap/auxvec patch