[dietlibc] Spec cleanup.
Jon Ciesla
limb at fedoraproject.org
Wed Mar 27 21:16:00 UTC 2013
commit c0f10d1aae4762598d937e4ff13d0d5fcb9eadce
Author: Jon Ciesla <limburgher at gmail.com>
Date: Wed Mar 27 16:11:45 2013 -0500
Spec cleanup.
dietlibc.spec | 97 ++++++++++++++++++++-------------------------------------
1 files changed, 34 insertions(+), 63 deletions(-)
---
diff --git a/dietlibc.spec b/dietlibc.spec
index 03a5135..bca637c 100644
--- a/dietlibc.spec
+++ b/dietlibc.spec
@@ -1,15 +1,10 @@
## This package understands the following switches:
## --with[out] ssp ... enable/disable SSP; default depends
## on target architecture
-## --with dynamic ... enable dynamic lib support
-
-## Fedora Extras specific customization below...
-%bcond_without noarch
-##
%global prerelease 20120825
%global githubref c3f1cf67fcc186bb859e64a085bf98aaa6182a82
-%global pkglibdir %_prefix/lib/dietlibc
+%global pkglibdir %{_prefix}/lib/dietlibc
%ifarch %ix86 x86_64
%bcond_without ssp
@@ -17,65 +12,51 @@
%bcond_with ssp
%endif
-%ifarch %ix86 x86_64 arm
-%bcond_with dynamic
-%endif
-
%ifarch %ix86
%global target_cpu i386
%else
%global target_cpu %_target_cpu
%endif
-%{?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.33
-Release: %release_func 1901
+Release: 0.1902.%prerelease%{?dist}
License: GPLv2
Group: Development/Libraries
URL: http://www.fefe.de/dietlibc/
%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
+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.%prerelease.tar.xz
+Source0: %{name}-%{version}.%prerelease.tar.xz
%endif
## CVS..master diff from https://github.com/ensc/dietlibc
Patch0: dietlibc-github-%githubref.patch.gz
-BuildRoot: %_tmppath/%name-%version-%release-buildroot
-%{?with_dynamic:Requires: dietlibc-lib = %version-%release}
-%{!?with_dynamic:Obsoletes: dietlibc-lib < %version-%release}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+#Requires: dietlibc-lib = %{version}-%{release}}
+Obsoletes: dietlibc-lib < %{version}-%{release}}
-Requires: %name-devel = %version-%release
+Requires: %{name}-devel = %{version}-%{release}
BuildRequires: gdb
%package devel
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
-Group: Development/Libraries
-Requires: %name = %version-%release
-Requires(pre): %name-devel = %version-%release
-Requires: %name-devel = %version-%release
-%{?noarch}
+Requires: %{name} = %{version}-%{release}
+Obsoletes: %{name}-header < %{version}-%{release}
+Provides: %{name}-header = %{version}-%{release}
+Provides: %{name}-static = %{version}-%{release}
+Provides: %{name}-static%{?_isa} = %{version}-%{release}
%package lib
Summary: Dynamic libraries for dietlibc
Group: System Environment/Libraries
-Conflicts: %name < %version-%release
-Conflicts: %name > %version-%release
+Requires: %{name} = %{version}-%{release}
%description
The diet libc is a libc that is optimized for small size. It can be
@@ -89,13 +70,6 @@ arm, hppa, ia64, i386, mips, s390, sparc, sparc64, ppc and x86_64.
This package contains the object files for dietlibc.
-%description header
-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 files for dietlibc.
-
%description lib
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,
@@ -105,7 +79,7 @@ This package contains the dynamic libraries for dietlibc.
%prep
-%setup -q %{?prerelease:-n %name-%version.%prerelease}
+%setup -q %{?prerelease:-n %{name}-%{version}.%prerelease}
%apply -n0 -p1
@@ -130,7 +104,7 @@ sed -i \
%endif
%global fixcflags -fomit-frame-pointer -fno-exceptions -fno-asynchronous-unwind-tables %xtra_fixcflags -Os -g3 -Werror-implicit-function-declaration -Wno-unused -Wno-switch
-%global basemakeflags prefix=%pkglibdir BINDIR=%_bindir MAN1DIR=%_mandir/man1 CFLAGS="$RPM_OPT_FLAGS %fixcflags $XTRA_CFLAGS" PDIET=%pkglibdir STRIP=:
+%global basemakeflags prefix=%pkglibdir BINDIR=%{_bindir} MAN1DIR=%{_mandir}/man1 CFLAGS="$RPM_OPT_FLAGS %fixcflags $XTRA_CFLAGS" PDIET=%pkglibdir STRIP=:
%global makeflags %basemakeflags
@@ -138,7 +112,7 @@ sed -i \
make %makeflags all %{?_smp_mflags}
# 'dyn' target is not SMP safe
-%{?with_dynamic:make %makeflags dyn}
+#make %makeflags dyn
%install
@@ -147,10 +121,10 @@ rm -rf $RPM_BUILD_ROOT
install -d -m755 $RPM_BUILD_ROOT/etc
make %makeflags DESTDIR=$RPM_BUILD_ROOT install
-ln -s lib-%_arch ${RPM_BUILD_ROOT}%pkglibdir/lib-%_arch-%_vendor
+ln -s lib-%{_arch} ${RPM_BUILD_ROOT}%pkglibdir/lib-%{_arch}-%{_vendor}
chmod a-x $RPM_BUILD_ROOT%pkglibdir/lib-*/*.o
-rm -f $RPM_BUILD_ROOT%_bindir/dnsd
+rm -f $RPM_BUILD_ROOT%{_bindir}/dnsd
%check
@@ -171,33 +145,30 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%doc AUTHOR BUGS CAVEAT CHANGES COPYING FAQ PORTING README*
%doc SECURITY THANKS TODO
-%doc %_mandir/*/*
-%_bindir/*
-
-
-%files header
-%defattr(-,root,root,-)
-%pkglibdir/include
+%doc %{_mandir}/*/*
+%{_bindir}/*
%files devel
%defattr(-,root,root,-)
%pkglibdir
-%exclude %pkglibdir/include
-%{?with_dynamic:%exclude %pkglibdir/*/*.so}
+%exclude %pkglibdir/*/*.so}
-%if %{with dynamic}
-%files lib
-%defattr(-,root,root,-)
-%config(noreplace) %_sysconfdir/*
-%dir %pkglibdir
-%dir %pkglibdir/lib-*
-%pkglibdir/lib-%target_cpu/*.so
-%endif
+#%files lib
+#%defattr(-,root,root,-)
+#%config(noreplace) %{_sysconfdir}/*
+#%dir %pkglibdir
+#%dir %pkglibdir/lib-*
+#%pkglibdir/lib-%target_cpu/*.so
%changelog
+* Wed Mar 20 2013 Jon Ciesla <limburgher at gmail.com> - 0.33-0.1902.20120825
+- Macro cleanup.
+- Merge header subpackage into devel.
+- Converted lib <> Conflicts to Requires =.
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.33-0.1901.20120825
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list