rpms/loki-lib/devel loki-lib.spec,1.6,1.7

[Sergio Pascual]

Author: sergiopr

Update of /cvs/pkgs/rpms/loki-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2337

Modified Files:
	loki-lib.spec 
Log Message:
* Mon Jul 27 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.1.7-1
- New upstream version



Index: loki-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/loki-lib/devel/loki-lib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- loki-lib.spec	25 Jul 2009 11:16:32 -0000	1.6
+++ loki-lib.spec	4 Aug 2009 16:52:42 -0000	1.7
@@ -1,18 +1,14 @@
 %define upname loki
 %define majorversion 0
 Name: %{upname}-lib
-Version: 0.1.6
-Release: 8%{?dist}
+Version: 0.1.7
+Release: 1%{?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
-Patch3: loki-gcc43.patch
+Source0: http://prdownloads.sourceforge.net/loki-lib/%{upname}-%{version}.tar.bz2
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires(post): /sbin/ldconfig
@@ -33,35 +29,32 @@ Headers and shared object symlinks for t
 %package doc
 Summary: The Loki C++ html docs
 Group: Documentation
+BuildArch: noarch
 %description doc
 HTML documentation files for the Loki C++ Library
 
 %prep
 %setup -n %{upname}-%{version} -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%{__chmod} -x doc/html/*
-%{__rm} doc/html/installdox
+chmod -x doc/html/*
+rm doc/html/installdox
+iconv -f ISO88591 -t utf8 CHANGES -o CHANGES
 
 %build
-%{__make} %{?_smp_mflags} CXXFLAGS="%{optflags}" LDLIBS="-lstdc++ -lc" build-shared
+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
+rm -rf %{buildroot}
+make %{?_smp_mflags} -C include prefix=%{buildroot}%{_usr} install
+mkdir -p %{buildroot}%{_libdir}
+cp -a lib/lib%{upname}.* %{buildroot}%{_libdir}
+
+%check
+make %{?_smp_mflags} CXXFLAGS="%{optflags}" -C test
 
 %clean
-%{__rm} -fr %{buildroot}
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -83,6 +76,9 @@ HTML documentation files for the Loki C+
 %doc doc/html doc/flex doc/yasli
 
 %changelog
+* Mon Jul 27 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.1.7-1
+- New upstream version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.6-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild