rpms/loki-lib/FC-6 loki-lib.spec, NONE, 1.1 loki-makefile-test-parallel.patch, NONE, 1.1 loki-makefile-test.patch, NONE, 1.1 loki-makefile.patch, NONE, 1.1 sources, 1.1, 1.2

[Sergio Pascual (sergiopr)]

Author: sergiopr

Update of /cvs/pkgs/rpms/loki-lib/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11450

Modified Files:
	sources 
Added Files:
	loki-lib.spec loki-makefile-test-parallel.patch 
	loki-makefile-test.patch loki-makefile.patch 
Log Message:
Importing into branch



--- NEW FILE loki-lib.spec ---
%define upname loki
%define majorversion 0
Name: %{upname}-lib
Version: 0.1.6
Release: 4%{?dist}
Summary: Loki C++ Library of design patterns and idioms

Group: Development/Libraries
License: MIT
URL: http://sourceforge.net/projects/loki-lib
Source0: http://prdownloads.sourceforge.net/loki-lib/%{upname}-%{version}.tar.gz
Patch0: loki-makefile.patch
Patch1: loki-makefile-test.patch
Patch2: loki-makefile-test-parallel.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description
A C++ library of designs, containing flexible implementations of common design
patterns and idioms.

%package devel
Summary: The Loki C++ headers and development libraries
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: glibc-headers
%description devel
Headers and shared object symlinks for the Loki C++ Library

%package doc
Summary: The Loki C++ html docs
Group: Documentation
%description doc
HTML documentation files for the Loki C++ Library

%prep
%setup -n %{upname}-%{version} -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%{__chmod} -x doc/html/*
%{__rm} doc/html/installdox

%build
%{__make} %{?_smp_mflags} CXXFLAGS="%{optflags}" LDLIBS="-lstdc++ -lc" build-shared
(cd lib && ln -s lib%{upname}.so.%{version} lib%{upname}.so)
(cd lib && ln -s lib%{upname}.so.%{version} lib%{upname}.so.%{majorversion})

%install
%{__rm} -fr %{buildroot}
%{__make} %{?_smp_mflags} -C include prefix=%{buildroot}%{_usr} install
%{__mkdir_p} %{buildroot}%{_libdir}
%{__cp} -a lib/lib%{upname}.* %{buildroot}%{_libdir}

# The testsuite does not work in x86_64
#%check
#%{__make} %{?_smp_mflags} CXXFLAGS="%{optflags}" -C test

%clean
%{__rm} -fr %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root)
%doc README
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root)
%doc CHANGES
%{_includedir}/*
%{_libdir}/*.so

%files doc
%defattr(-,root,root,-)
%doc doc/html doc/flex doc/yasli

%changelog
* Thu Jul 05 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 0.1.6-4
- Installing libraries in _libdir instead of prefix/lib
* Tue Jul 03 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 0.1.6-3
- Header files in directory loki
* Sun Jul 01 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 0.1.6-2
- Disabled test suite, does not work in x86_64
- Added requires for -devel package
* Tue Jun 26 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 0.1.6-1
- fixed installation of .h files
- fixed version number
* Tue Jun 11 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 0.1.6-0.3
- Removed the unused dependency to libm in the dynamic library
* Mon Jun 11 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 0.1.6-0.2
- Removed the unused dependency to libpthread in the dynamic library
* Thu Jun 07 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 0.1.6-0.1
- Initial fedora rpm release

loki-makefile-test-parallel.patch:

--- NEW FILE loki-makefile-test-parallel.patch ---
diff -ur loki-0.1.6/test/SingletonDll/Makefile loki-0.1.6.new/test/SingletonDll/Makefile
--- loki-0.1.6/test/SingletonDll/Makefile	2006-11-05 14:09:00.000000000 +0100
+++ loki-0.1.6.new/test/SingletonDll/Makefile	2007-07-01 21:25:19.000000000 +0200
@@ -37,7 +37,7 @@
 $(LIB1): $(OBJ2)
 	$(CXX) $(SHARED_LIB_FLAG) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
-$(LIB2): $(OBJ3)
+$(LIB2): $(OBJ3) $(LIB1)
 	$(CXX) $(SHARED_LIB_FLAG) $(LDFLAGS) -L. -o $@ $^ -lfoo $(LDLIBS)
 
 clean: cleandeps

loki-makefile-test.patch:

--- NEW FILE loki-makefile-test.patch ---
diff -ur loki-0.1.6.old/test/Makefile.common loki-0.1.6/test/Makefile.common
--- loki-0.1.6.old/test/Makefile.common	2007-06-26 21:39:01.000000000 +0200
+++ loki-0.1.6/test/Makefile.common	2007-06-26 21:36:47.000000000 +0200
@@ -1,7 +1,7 @@
 include ../../Makefile.common
 
 override CPPFLAGS += -I../../include -DNDEBUG
-LDLIBS := ../../lib/libloki.a
+LDLIBS := ../../lib/libloki.so
 
 ifeq ($(OS),Windows)
 BIN_SUFFIX := .exe

loki-makefile.patch:

--- NEW FILE loki-makefile.patch ---
diff -ur loki-0.1.6.old/src/Makefile loki-0.1.6/src/Makefile
--- loki-0.1.6.old/src/Makefile	2006-10-17 22:02:15.000000000 +0200
+++ loki-0.1.6/src/Makefile	2007-07-05 08:28:35.000000000 +0200
@@ -18,7 +18,7 @@
 ifeq ($(OS), Linux)
   SHARED_LIB_BASE := libloki.so
   SHARED_LIB_VERSIONED := libloki.so.$(VERSION)
-  override LDFLAGS += --shared -Wl,-soname=$(SHARED_LIB_VERSIONED) -fPIC
+  override LDFLAGS += --shared -nodefaultlibs -Wl,-soname=$(SHARED_LIB_VERSIONED) -fPIC
   LDLIBS := -lpthread
   RESULT_DIR := ../lib/
 else


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/loki-lib/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Jul 2007 17:59:31 -0000	1.1
+++ sources	6 Jul 2007 19:40:39 -0000	1.2
@@ -0,0 +1 @@
+319ca3012a4290dcc27db621cf365f71  loki-0.1.6.tar.gz