[cal3d] SPEC Cleanup.

Christopher Meng cicku at fedoraproject.org
Tue Dec 10 11:59:28 UTC 2013


commit 548433d5e2129587a746e6eb7587fcf49ea97055
Author: Christopher Meng <i at cicku.me>
Date:   Tue Dec 10 19:59:06 2013 +0800

    SPEC Cleanup.

 cal3d.spec |   44 ++++++++------------------------------------
 1 files changed, 8 insertions(+), 36 deletions(-)
---
diff --git a/cal3d.spec b/cal3d.spec
index 37e78c1..92a5585 100644
--- a/cal3d.spec
+++ b/cal3d.spec
@@ -2,32 +2,20 @@ Name:           cal3d
 Version:        0.11.0
 Release:        15%{?dist}
 Summary:        Skeletal based 3-D character animation library
-
 License:        LGPLv2+
 URL:            http://gna.org/projects/cal3d
 Source0:        http://download.gna.org/%{name}/sources/%{name}-%{version}.tar.gz
 Patch0:         %{name}-0.11.0-gcc43.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:  doxygen libtool
-
-%if 0%{?suse_version}
-Group:          System/Libraries
-BuildRequires:  docbook-toys gcc-c++
-%else
-Group:          Development/Libraries
 BuildRequires:  docbook-utils
-%endif
 
 %description
 Cal3D is a skeletal based 3-D character animation library written in C++
 in a platform-/graphic API-independent way.
 
-%package devel
+%package        devel
 Summary:        Header files, libraries and development documentation for Cal3D
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       pkgconfig
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 This package contains the header files, libraries and documentation
@@ -35,67 +23,51 @@ for Cal3D.
 
 %package doc
 Summary:        Documentation files for Cal3D
-Group:          Documentation
-Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
 
 %description doc
 This package contains modeling documentation and a users guide for Cal3D.
 
-
 %prep
 %setup -q
 %patch0 -p0 -b .gcc43
 
-
 %build
 LIBTOOL=libtool %configure
 make LIBTOOL=libtool %{?_smp_mflags}
 ( cd docs && make doc-guide && make doc-api )
 
-
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
 # remove libtool archives and static libraries
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
-
+rm -f %{buildroot}%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/*.a
 
 %check
 # https://gna.org/bugs/index.php?8416
 #make check
 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/cal3d_converter
-%{_mandir}/man1/cal3d_converter.1.gz
+%{_mandir}/man1/cal3d_converter.1*
 %{_libdir}/*.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %doc docs/api/html/*
 %{_includedir}/%{name}
 %{_libdir}/pkgconfig/%{name}.pc
 %{_libdir}/*.so
 
 %files doc
-%defattr(-,root,root,-)
 %doc docs/guide
 # upstream forgot this for 0.11.0: docs/modeling
 
-
 %changelog
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.0-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
@@ -137,7 +109,7 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Jan 31 2007 Christopher Stone <chris.stone at gmail.com> 0.11.0-3
 - Disable make check (https://gna.org/bugs/index.php?8416)
 - Remove system call macros
-- Use $RPM_BUILD_ROOT instead of %%{buildroot}
+- Use %{buildroot} instead of %%{buildroot}
 - Some whitespace cleanup
 - Use rm instead of %%exclude on static libs and libtool archives
 


More information about the scm-commits mailing list