rpms/pinot/devel fixes_082_01.patch,NONE,1.1 pinot.spec,1.24,1.25

[Adel Gadllah (drago01)]

Author: drago01

Update of /cvs/pkgs/rpms/pinot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9814

Modified Files:
	pinot.spec 
Added Files:
	fixes_082_01.patch 
Log Message:
add upstream bugfix

fixes_082_01.patch:

--- NEW FILE fixes_082_01.patch ---
--- Collect/Makefile.in	2008-01-26 12:35:07.000000000 +0800
+++ Collect/Makefile.in	2008-02-17 11:37:07.000000000 +0800
@@ -257,6 +257,7 @@
 	MboxCollector.cpp
 
 libCollect_la_CXXFLAGS = \
+	-fPIC \
 	-I$(top_srcdir)/Utils \
 	-I$(top_srcdir)/Tokenize \
 	-I$(top_srcdir)/Tokenize/filters \
--- Monitor/Makefile.in	2008-01-26 12:35:08.000000000 +0800
+++ Monitor/Makefile.in	2008-02-17 11:37:12.000000000 +0800
@@ -256,7 +256,7 @@
 noinst_LTLIBRARIES = libMonitor.la
 libMonitor_la_SOURCES = MonitorEvent.cpp MonitorFactory.cpp \
 	MonitorHandler.cpp $(am__append_1)
-libMonitor_la_CXXFLAGS = -I$(top_srcdir)/Utils \
+libMonitor_la_CXXFLAGS = -fPIC -I$(top_srcdir)/Utils \
 	-I$(top_srcdir)/Tokenize -I$(top_srcdir)/Tokenize/filters \
 	-I$(top_srcdir)/SQL -I$(top_srcdir)/Collect \
 	-I$(top_srcdir)/Index -I$(top_srcdir)/Search @HTTP_CFLAGS@ \
--- IndexSearch/Google/Makefile.in	2008-01-26 12:35:07.000000000 +0800
+++ IndexSearch/Google/Makefile.in	2008-02-17 11:37:08.000000000 +0800
@@ -261,6 +261,7 @@
 @HAVE_SOAP_TRUE@	GoogleAPIEngine.cpp
 
 @HAVE_SOAP_TRUE at libSearchGoogle_la_CXXFLAGS = \
+ at HAVE_SOAP_TRUE@	-fPIC \
 @HAVE_SOAP_TRUE@	-I$(top_srcdir)/Utils \
 @HAVE_SOAP_TRUE@	-I$(top_srcdir)/Tokenize \
 @HAVE_SOAP_TRUE@	-I$(top_srcdir)/Tokenize/filters \
@@ -561,7 +562,7 @@
 @HAVE_SOAP_TRUE@	wsdl2h -n gapi -o GoogleSearch.h googleapi/GoogleSearch.wsdl
 
 @HAVE_SOAP_TRUE at GAPIClientLib.cpp : GoogleSearch.h
- at HAVE_SOAP_TRUE@	soapcpp2 -n -pGAPI -I /usr/include/gsoap/import GoogleSearch.h
+ at HAVE_SOAP_TRUE@	soapcpp2 -n -pGAPI -I/usr/include/gsoap/import -I/usr/share/gsoap/import GoogleSearch.h
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
--- IndexSearch/Makefile.in	2008-01-26 12:35:07.000000000 +0800
+++ IndexSearch/Makefile.in	2008-02-17 11:37:10.000000000 +0800
@@ -348,7 +348,7 @@
 
 @HAVE_SOAP_FALSE at pinot_search_DEPENDENCIES = libIndexSearch.la
 @HAVE_SOAP_TRUE at pinot_search_DEPENDENCIES = libIndexSearch.la libSearchSOAP.la
-AM_CXXFLAGS = -I$(top_srcdir)/Utils -I$(top_srcdir)/Tokenize \
+AM_CXXFLAGS = -fPIC -I$(top_srcdir)/Utils -I$(top_srcdir)/Tokenize \
 	-I$(top_srcdir)/Tokenize/filters -I$(top_srcdir)/Collect \
 	-I$(top_srcdir)/IndexSearch/Google \
 	-I$(top_srcdir)/IndexSearch/xesam @HTTP_CFLAGS@ @XML_CFLAGS@ \
--- SQL/Makefile.in	2008-01-26 12:35:08.000000000 +0800
+++ SQL/Makefile.in	2008-02-17 11:40:21.000000000 +0800
@@ -254,7 +254,10 @@
 	SQLiteBase.cpp \
 	ViewHistory.cpp
 
-libSQL_la_CXXFLAGS = -I$(top_srcdir)/Utils
+libSQL_la_CXXFLAGS = \
+	-fPIC \
+	-I$(top_srcdir)/Utils
+
 all: all-am
 
 .SUFFIXES:
--- UI/GTK2/src/Makefile.in	2008-01-26 12:35:08.000000000 +0800
+++ UI/GTK2/src/Makefile.in	2008-02-17 11:37:14.000000000 +0800
@@ -325,6 +325,7 @@
 	WorkerThreads.cpp
 
 AM_CXXFLAGS = \
+	-fPIC \
 	-I$(top_srcdir)/Utils \
 	-I$(top_srcdir)/Tokenize \
 	-I$(top_srcdir)/Tokenize/filters \
--- Makefile.in	2008-01-26 12:35:08.000000000 +0800
+++ Makefile.in	2008-01-28 20:33:29.000000000 +0800
@@ -783,8 +783,8 @@
 	@rm $(DESTDIR)$(libdir)/lib*filter.a $(DESTDIR)$(libdir)/lib*filter.la
 	@mv $(DESTDIR)$(libdir)/lib*filter* $(DESTDIR)$(libdir)/pinot/filters/
 	@mkdir -p $(DESTDIR)$(libdir)/pinot/backends
-	@rm $(DESTDIR)$(libdir)/lib*.a $(DESTDIR)$(libdir)/lib*.la
-	@mv $(DESTDIR)$(libdir)/lib* $(DESTDIR)$(libdir)/pinot/backends/
+	@rm $(DESTDIR)$(libdir)/libxapianbackend.a $(DESTDIR)$(libdir)/libxapianbackend.la
+	@mv $(DESTDIR)$(libdir)/libxapianbackend* $(DESTDIR)$(libdir)/pinot/backends/
 	@mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/
 	$(INSTALL_DATA) $(srcdir)/UI/icons/48x48/pinot.png $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/pinot.png
 	@mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/


Index: pinot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pinot/devel/pinot.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- pinot.spec	9 Feb 2008 11:14:59 -0000	1.24
+++ pinot.spec	23 Feb 2008 12:41:16 -0000	1.25
@@ -1,6 +1,6 @@
 Name:  pinot
 Version: 0.82        
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Personal search and metasearch for the Desktop      
 
 Group: User Interface/Desktops        
@@ -9,6 +9,7 @@
 Source0: http://download2.berlios.de/pinot/%{name}-%{version}.tar.gz  
 Patch0: fix_lang_detect.patch
 Patch1: pinot-0.82-gcc43-buildfix.patch
+Patch2: fixes_082_01.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: sqlite-devel >= 3.3.1
@@ -54,6 +55,7 @@
 %setup -q 
 %patch0 -p1 -b .lang_detect
 %patch1 -p1 -b .gcc43
+%patch1 -p0 -b .fixes
 
 %build
 %configure
@@ -118,6 +120,9 @@
 
 
 %changelog
+* Sat Feb 23 2008 Adel Gadllah <adel.gadllah at gmail.com> 0.82-4
+- Add hotfix as requested by upstream
+
 * Sat Feb 09 2008 Adel Gadllah <adel.gadllah at gmail.com> 0.82-3
 - Fix build with gcc-4.3