[libsigc++20] Misc spec cleanup and whitespace fixes
Kalev Lember
kalev at fedoraproject.org
Tue Mar 1 20:02:18 UTC 2011
commit f4eec76380a378dc495f046e7f3c945de4ba69ce
Author: Kalev Lember <kalev at smartlink.ee>
Date: Tue Mar 1 21:31:37 2011 +0200
Misc spec cleanup and whitespace fixes
libsigc++20.spec | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 deletions(-)
---
diff --git a/libsigc++20.spec b/libsigc++20.spec
index 4f24f70..941c8a4 100644
--- a/libsigc++20.spec
+++ b/libsigc++20.spec
@@ -1,15 +1,14 @@
Name: libsigc++20
Version: 2.2.8
-Release: 3%{?dist}.3
-
+Release: 4%{?dist}
Summary: Typesafe signal framework for C++
Group: System Environment/Libraries
License: LGPLv2+
URL: http://libsigc.sourceforge.net/
-Source0: http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.0/libsigc++-%version.tar.bz2
+Source0: http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.0/libsigc++-%{version}.tar.bz2
# fix compilation with GCC 4.6 (upstream ticket: GNOME BZ #641471)
-Patch0: %{name}-gcc46.patch
+Patch0: %{name}-gcc46.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: m4
@@ -17,30 +16,27 @@ BuildRequires: m4
%description
This library implements a full callback system for use in widget libraries,
abstract interfaces, and general programming. Originally part of the Gtk--
-widget set, %name is now a separate library to provide for more general
+widget set, libsigc++20 is now a separate library to provide for more general
use. It is the most complete library of its kind with the ability to connect
an abstract callback to a class method, function, or function object. It
contains adaptor classes for connection of dissimilar callbacks and has an
ease of use unmatched by other C++ callback libraries.
Package GTK-- (gtkmm), which is a C++ binding to the GTK+ library,
-starting with version 1.1.2, uses %name.
+starting with version 1.1.2, uses libsigc++20.
+
%package devel
Summary: Development tools for the typesafe signal framework for C++
Group: Development/Libraries
-Requires: %name = %{version}-%{release}
Requires: pkgconfig
+Requires: %{name} = %{version}-%{release}
%description devel
-The %name-devel package contains the static libraries and header files
-needed for development with %name.
+The %{name}-devel package contains the static libraries and header files
+needed for development with %{name}.
-%prep
-%setup -q -n libsigc++-%{version}
-%patch0 -p1
-
%package doc
Summary: Documentation for %{name}, includes full API docs
Group: Documentation
@@ -51,6 +47,11 @@ BuildRequires: doxygen graphviz
This package contains the full API documentation for %{name}.
+%prep
+%setup -q -n libsigc++-%{version}
+%patch0 -p1 -b .gcc46
+
+
%build
%configure %{!?_with_static: --disable-static}
make %{?_smp_mflags}
@@ -58,7 +59,7 @@ make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-make DESTDIR=${RPM_BUILD_ROOT} install
+make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
@@ -68,7 +69,6 @@ rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
-
%postun -p /sbin/ldconfig
@@ -77,24 +77,26 @@ rm -rf $RPM_BUILD_ROOT
%doc AUTHORS COPYING README NEWS ChangeLog TODO
%{_libdir}/*.so.*
-
%files devel
%defattr(-,root,root,-)
%{_includedir}/*
-%{_libdir}/sigc++-2.0
+%{_libdir}/sigc++-2.0/
%{_libdir}/pkgconfig/*.pc
%{?_with_static: %{_libdir}/*.a}
%{_libdir}/*.so
-
%files doc
-%defattr(-, root, root, -)
+%defattr(-,root,root,-)
%doc %{_datadir}/doc/libsigc++-2.0/*
# according guidelines, we can co-own this, since devhelp is not required
# for accessing documentation
%{_datadir}/devhelp/
+
%changelog
+* Tue Mar 01 2011 Kalev Lember <kalev at smartlink.ee> - 2.2.8-4
+- Spec cleanup
+
* Mon Feb 21 2011 Haïkel Guémar <hguemar at fedoraproject.org> - 2.2.8-3
- fix documentation location (RHBZ #678981)
- co-own /usr/share/devhelp
@@ -199,7 +201,7 @@ rm -rf $RPM_BUILD_ROOT
- adjusted spec file to get tests.Makefile and examples.Makefile from scripts/
* Fri Oct 22 1999 Dmitry V. Levin <ldv at fandra.org>
-- split into three packages: %name, %name-devel and %name-examples
+- split into three packages: libsigc++, libsigc++-devel and libsigc++-examples
* Thu Aug 12 1999 Karl Nelson <kenelson at ece.ucdavis.edu>
- updated source field and merged conflicts between revisions.
More information about the scm-commits
mailing list