rpms/cppunit/devel cppunit-1.12.0-nolibdir.patch, NONE, 1.1 cppunit.spec, 1.8, 1.9

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/cppunit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11997

Modified Files:
	cppunit.spec 
Added Files:
	cppunit-1.12.0-nolibdir.patch 
Log Message:
* Mon Jan 29 2007 Patrice Dumas <pertusus at free.fr> 1.12.0-3
- remove libdir reference to cppunit-config, should fix multiarch conflict
  (#340951)
- fix encoding and remove windows related files in examples


cppunit-1.12.0-nolibdir.patch:

--- NEW FILE cppunit-1.12.0-nolibdir.patch ---
diff -up cppunit-1.12.0/cppunit-config.in.nolibdir cppunit-1.12.0/cppunit-config.in
--- cppunit-1.12.0/cppunit-config.in.nolibdir	2007-10-21 11:19:40.000000000 +0200
+++ cppunit-1.12.0/cppunit-config.in	2007-10-21 11:20:01.000000000 +0200
@@ -87,9 +87,6 @@ if test "$echo_cflags" = "yes"; then
 fi
 
 if test "$echo_libs" = "yes"; then
-      if test @libdir@ != /usr/lib ; then
-            my_linker_flags="-L at libdir@"
-      fi
       echo ${my_linker_flags} -lcppunit @LIBADD_DL@
 fi      
 


Index: cppunit.spec
===================================================================
RCS file: /cvs/extras/rpms/cppunit/devel/cppunit.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cppunit.spec	29 Jan 2007 10:55:26 -0000	1.8
+++ cppunit.spec	21 Oct 2007 10:13:31 -0000	1.9
@@ -3,10 +3,12 @@
 Release: 3%{?dist}
 
 Summary: C++ unit testing framework
-License: LGPL
+# no license in files
+License: LGPLv2+
 Group: Development/Libraries
 Url: http://cppunit.sourceforge.net/
 Source: http://download.sf.net/cppunit/cppunit-%{version}.tar.gz
+Patch0: cppunit-1.12.0-nolibdir.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: doxygen, graphviz
@@ -36,6 +38,14 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .nolibdir
+for file in THANKS ChangeLog NEWS; do
+   touch -r $file __timestamp_$file
+   iconv -f latin1 -t utf8 < $file > ${file}.utf8
+   mv ${file}.utf8 $file
+   touch -r __timestamp_$file $file
+   rm __timestamp_$file
+done
 
 %build
 %configure --enable-doxygen --disable-static
@@ -49,13 +59,14 @@
 rm -rf $RPM_BUILD_ROOT%{_datadir}/cppunit
 
 # clean up examples
-rm -rf dist-examples dist-examples-dir
-cp -a examples dist-examples
-make -C dist-examples distclean
+rm -rf __dist-examples __dist-examples-dir
+cp -a examples __dist-examples
+make -C __dist-examples distclean
 # Makefile.am files are left as documentation
-find dist-examples \( -name Makefile.in -o -name .cvsignore \) -exec rm {} \;
-mkdir dist-examples-dir
-mv dist-examples dist-examples-dir/examples
+find __dist-examples \( -name Makefile.in -o -name .cvsignore -o -name '*.dsw' -o -name '*.dsp' \) -exec rm {} \;
+chmod a-x __dist-examples/qt/run.bat
+mkdir __dist-examples-dir
+mv __dist-examples __dist-examples-dir/examples
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -81,11 +92,16 @@
 
 %files doc
 %defattr(-,root,root,-)
-%doc dist-examples-dir/examples/
+%doc __dist-examples-dir/examples/
 %doc doc/html/
 
 %changelog
 * Mon Jan 29 2007 Patrice Dumas <pertusus at free.fr> 1.12.0-3
+- remove libdir reference to cppunit-config, should fix multiarch conflict
+  (#340951)
+- fix encoding and remove windows related files in examples
+
+* Mon Jan 29 2007 Patrice Dumas <pertusus at free.fr> 1.12.0-3
 - add rightly files to -devel (#224106)
 - add necessary requires for -devel (#224106)
 - ship examples