OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Jun-2006 13:58:21
Branch: HEAD Handle: 2006060612582000
Added files:
openpkg-src/libsigcxx libsigcxx.patch
Modified files:
openpkg-src/libsigcxx libsigcxx.spec
Log:
requires GNU make; cleanup packaging
Summary:
Revision Changes Path
1.1 +44 -0 openpkg-src/libsigcxx/libsigcxx.patch
1.12 +4 -4 openpkg-src/libsigcxx/libsigcxx.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/libsigcxx/libsigcxx.patch
============================================================================
$ cvs diff -u -r0 -r1.1 libsigcxx.patch
--- /dev/null 2006-06-06 13:56:25 +0200
+++ libsigcxx.patch 2006-06-06 13:58:21 +0200
@@ -0,0 +1,44 @@
+Index: sigc++-2.0.pc.in
+--- sigc++-2.0.pc.in.orig 2004-04-12 23:53:37 +0200
++++ sigc++-2.0.pc.in 2006-06-06 13:49:27 +0200
+@@ -6,5 +6,5 @@
+ Name: libsigc++ 2
+ Description: Typesafe signal and callback system for C++
+ Version: @VERSION@
+-Libs: -L${libdir} -lsigc-2.0
+-Cflags: -I${includedir}/sigc++-2.0 -I${libdir}/sigc++-2.0/include
++Libs: -L${libdir} -lsigc
++Cflags: -I${includedir}/sigc++
+Index: sigc++/Makefile.in
+--- sigc++/Makefile.in.orig 2005-12-20 09:42:07 +0100
++++ sigc++/Makefile.in 2006-06-06 13:52:33 +0200
+@@ -261,7 +261,7 @@
+ @[EMAIL PROTECTED] = -no-undefined -Wl,--export-all-symbols
+
+ # build the library
+-lib_LTLIBRARIES = libsigc-2.0.la
++lib_LTLIBRARIES = libsigc.la
+ libsigc_2_0_la_SOURCES = signal.cc signal_base.cc trackable.cc
connection.cc \
+ functors/slot.cc functors/slot_base.cc \
+ adaptors/lambda/lambda.cc
+@@ -339,7 +339,7 @@
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libsigc-2.0.la: $(libsigc_2_0_la_OBJECTS) $(libsigc_2_0_la_DEPENDENCIES)
++libsigc.la: $(libsigc_2_0_la_OBJECTS) $(libsigc_2_0_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(libdir) $(libsigc_2_0_la_LDFLAGS)
$(libsigc_2_0_la_OBJECTS) $(libsigc_2_0_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+Index: Makefile.in
+--- Makefile.in.orig 2005-12-20 09:42:07 +0100
++++ Makefile.in 2006-06-06 13:54:30 +0200
+@@ -205,7 +205,7 @@
+ # other stuff here
+ EXTRA_DIST = autogen.sh sigc++config.h.in libsigc++-2.0.spec.in
+ # ACLOCAL_FLAGS = -I scripts
+-SUBDIRS = sigc++ tests docs examples scripts MSVC_Net2003
++SUBDIRS = sigc++
+ DIST_SUBDIRS = $(SUBDIRS)
+ sigc_configdir = $(libdir)/sigc++-2.0/include
+ sigc_config_DATA = sigc++config.h
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libsigcxx/libsigcxx.spec
============================================================================
$ cvs diff -u -r1.11 -r1.12 libsigcxx.spec
--- openpkg-src/libsigcxx/libsigcxx.spec 1 Jan 2006 13:15:59 -0000
1.11
+++ openpkg-src/libsigcxx/libsigcxx.spec 6 Jun 2006 11:58:20 -0000
1.12
@@ -22,8 +22,6 @@
## SUCH DAMAGE.
##
-# FIXME MSvB: Still needs renaming of versioned libs
-
# package version
%define V_libsigcxx 2.0.17
%define V_libsigcxx_major 2.0
@@ -39,15 +37,16 @@
Group: Development
License: LGPL
Version: %{V_libsigcxx}
-Release: 20051220
+Release: 20060606
# list of sources
Source0:
ftp://ftp.gnome.org/pub/GNOME/sources/libsigc++/%{V_libsigcxx_major}/libsigc++-%{version}.tar.bz2
+Patch0: libsigcxx.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, gcc
+BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make
PreReq: OpenPKG, openpkg >= 20040130
AutoReq: no
AutoReqProv: no
@@ -69,6 +68,7 @@
%prep
%setup -q -n libsigc++-%{version}
+ %patch -p0
%build
CC="%{l_cc}" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
