packages: wv2/wv2.spec, wv2/wv2-link.patch - cleanup - added link patch (li...

[qboosh]

Author: qboosh                       Date: Sat Apr 30 15:26:10 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- cleanup
- added link patch (link with libgobject too, as it is referenced directly)

---- Files affected:
packages/wv2:
   wv2.spec (1.30 -> 1.31) , wv2-link.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/wv2/wv2.spec
diff -u packages/wv2/wv2.spec:1.30 packages/wv2/wv2.spec:1.31
--- packages/wv2/wv2.spec:1.30	Sun Feb  6 17:50:42 2011
+++ packages/wv2/wv2.spec	Sat Apr 30 17:26:05 2011
@@ -7,10 +7,11 @@
 Name:		wv2
 Version:	0.4.2
 Release:	1
-License:	LGPL
+License:	LGPL v2
 Group:		Libraries
-Source0:	http://dl.sourceforge.net/wvware/%{name}-%{version}.tar.bz2
+Source0:	http://downloads.sourceforge.net/wvware/%{name}-%{version}.tar.bz2
 # Source0-md5:	850ed8e44a84e7bf0610747827018cbc
+Patch0:		%{name}-link.patch
 URL:		http://wvware.sourceforge.net/
 BuildRequires:	cmake >= 2.6.1-2
 BuildRequires:	libgsf-devel >= 1.7.2
@@ -42,9 +43,7 @@
 
 %prep
 %setup -q
-
-# it caused stupid ac error message
-rm -rf autom4te.cache
+%patch0 -p1
 
 %build
 install -d build
@@ -74,7 +73,7 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog THANKS TODO
 %attr(755,root,root) %{_libdir}/libwv2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwv2.so.?
+%attr(755,root,root) %ghost %{_libdir}/libwv2.so.4
 
 %files devel
 %defattr(644,root,root,755)
@@ -91,6 +90,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2011/04/30 15:26:05  qboosh
+- cleanup
+- added link patch (link with libgobject too, as it is referenced directly)
+
 Revision 1.30  2011/02/06 16:50:42  sparky
 - unified %clean section
 

================================================================
Index: packages/wv2/wv2-link.patch
diff -u /dev/null packages/wv2/wv2-link.patch:1.3
--- /dev/null	Sat Apr 30 17:26:10 2011
+++ packages/wv2/wv2-link.patch	Sat Apr 30 17:26:05 2011
@@ -0,0 +1,30 @@
+--- wv2-0.4.2/CMakeLists.txt.orig	2009-10-31 19:22:43.000000000 +0100
++++ wv2-0.4.2/CMakeLists.txt	2011-04-30 17:17:11.478499119 +0200
+@@ -19,7 +19,8 @@
+ 
+ SET( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${wvWare_SOURCE_DIR}/cmake )
+ 
+-FIND_PACKAGE( GLIB2 REQUIRED )
++include(FindPkgConfig)
++pkg_check_modules(GLIB2 REQUIRED glib-2.0 gobject-2.0)
+ 
+ FIND_PACKAGE( LIBGSF REQUIRED )
+ 
+@@ -34,7 +35,7 @@
+   FIND_PACKAGE( ZLIB REQUIRED )
+ ENDIF( WITH_ZLIB )
+ 
+-INCLUDE_DIRECTORIES( ${GLIB2_INCLUDE_DIR} ${LIBGSF_INCLUDE_DIR} ${ICONV_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
++INCLUDE_DIRECTORIES( ${GLIB2_INCLUDE_DIRS} ${LIBGSF_INCLUDE_DIR} ${ICONV_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
+ 
+ #
+ # Iconv checks
+@@ -154,7 +155,7 @@
+ 
+ IF( GLIB2_FOUND )
+   SET( _WV2_LDFLAGS ${_WV2_LDFLAGS} ${GLIB2_LIBRARIES} )
+-  SET( _WV2_CFLAGS ${_WV2_CFLAGS} ${GLIB2_INCLUDE_DIR} )
++  SET( _WV2_CFLAGS ${_WV2_CFLAGS} ${GLIB2_INCLUDE_DIRS} )
+ ENDIF( GLIB2_FOUND )
+ 
+ #
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wv2/wv2.spec?r1=1.30&r2=1.31&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wv2/wv2-link.patch?r1=1.2&r2=1.3&f=u