[Loki-lib-cvs] loki loki.spec,1.2,1.3

[Peter K. <syn...@us...>]

Update of /cvsroot/loki-lib/loki
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26721

Modified Files:
	loki.spec 
Log Message:
update loki.spec, thx to Regis Desgroppes and Andreas Scherer

Index: loki.spec
===================================================================
RCS file: /cvsroot/loki-lib/loki/loki.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- loki.spec	8 Mar 2006 22:49:41 -0000	1.2
+++ loki.spec	21 Mar 2006 20:48:22 -0000	1.3
@@ -1,47 +1,77 @@
-Name: loki
+%define source_name loki
+Name: %{source_name}-lib
 Summary: Loki C++ Library
 Version: 0.1.4
-Release: 1
+Release: 2
 License: MIT License
 Group: Productivity/Development
-URL: http://prdownloads.sourceforge.net/loki-lib/loki-0.1.4.tar.gz
+URL: http://sourceforge.net/projects/loki-lib
 Distribution: SuSE 10.0 (i586)
-Source0: %{name}-%{version}.tar.gz
+Source0: http://prdownloads.sourceforge.net/loki-lib/%{source_name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: i586
 
+%package devel
+Summary: The Loki C++ headers and development libraries
+Group: System Environment/Libraries
+
+%package doc
+Summary: The Loki C++ html docs
+Group: System Environment/Libraries
+
 %description
 A C++ library of designs, containing flexible implementations of common design
 patterns and idioms.
 
+%description devel
+Headers, static libraries, and shared object symlinks for the Loki C++ Library
+
+%description doc
+HTML documentation files for the Loki C++ Library
+
 %prep
-%setup -q
+%setup -n %{source_name}-%{version} -q
 
 %build
-make
+make build-static build-shared
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/usr/include
-cp -a include/loki $RPM_BUILD_ROOT/usr/include
+cp -a include/%{source_name} $RPM_BUILD_ROOT/usr/include
 mkdir -p $RPM_BUILD_ROOT/usr/lib
-cp lib/libloki.a $RPM_BUILD_ROOT/usr/lib/libloki.a
-mkdir -p $RPM_BUILD_ROOT/usr/share/doc/loki-%{version}
-cp -a doc/{flex,html,yasli} $RPM_BUILD_ROOT/usr/share/doc/loki-%{version}
+cp -a lib/lib%{source_name}.* $RPM_BUILD_ROOT/usr/lib
+(cd $RPM_BUILD_ROOT/usr/lib && ln -s lib%{source_name}.so.%{version} lib%{source_name}.so)
+mkdir -p $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}
+cp -a doc/{flex,html,yasli} $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
+%defattr(755,root,root)
+/usr/lib/lib%{source_name}.so
+/usr/lib/lib%{source_name}.so.%{version}
+
+%files devel
 %defattr(644,root,root,755)
-/usr/include/loki
-/usr/lib/libloki.a
-/usr/share/doc/loki-%{version}
+/usr/include/%{source_name}
+/usr/lib/lib%{source_name}.a
 
-%post
+%files doc
+%defattr(644,root,root)
+%doc /usr/share/doc/%{name}-%{version}
 
-%postun
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
 %changelog
+* Thu Mar 16 2006 Regis Desgroppes <rde...@be...>
+- Renamed package to loki-lib (SourceForge project name) as there is another package named loki (Biology)
+- Created devel and doc subpackages
+- Also building shared library
+- Removed LF chars so that rpmbuild generated scriptlets work
+
 * Mon Jan 06 2006 Andreas Scherer <and...@fr...>
 - Initial build