rpms/dillo/devel dillo-i18n-dso.patch,NONE,1.1 dillo.spec,1.23,1.24

[Andreas Bierfert]

Author: awjb

Update of /cvs/pkgs/rpms/dillo/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28425/devel

Modified Files:
	dillo.spec 
Added Files:
	dillo-i18n-dso.patch 
Log Message:
- dso fixes from Bruno Wolff


dillo-i18n-dso.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE dillo-i18n-dso.patch ---
--- src/Makefile.in.orig	2010-04-11 03:36:48.000000000 -0500
+++ src/Makefile.in		2010-04-11 03:38:18.000000000 -0500
@@ -167,7 +167,7 @@ 
 
 bin_PROGRAMS = dillo
 
-dillo_LDADD = ../dpip/libDpip.a IO/libDio.a @LIBJPEG_LIBS@ @LIBPNG_LIBS@ @GTK_LIBS@ @LIBZ_LIBS@ @LIBPTHREAD_LIBS@
+dillo_LDADD = ../dpip/libDpip.a IO/libDio.a @LIBJPEG_LIBS@ @LIBPNG_LIBS@ @GTK_LIBS@ @LIBZ_LIBS@ @LIBPTHREAD_LIBS@ @LIBSSL_LIBS@
 dillo_LDFLAGS = @LIBJPEG_LDFLAGS@ @LIBPTHREAD_LDFLAGS@
 
 dillo_SOURCES = \


Index: dillo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dillo/devel/dillo.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- dillo.spec	21 Aug 2009 13:03:58 -0000	1.23
+++ dillo.spec	11 Apr 2010 18:09:17 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           dillo
 Version:        0.8.6
-Release:        11%{?dist}
+Release:        12%{?dist}
 
 Summary:        Very small and fast GUI web browser
 
@@ -14,6 +14,7 @@ Source3:        %{name}-i18n.desktop
 Patch0:         dillo-0.8.0-nodebug.patch
 #http://teki.jpn.ph/pc/software/index-e.shtml#dillo-i18n
 Patch1:         dillo-0.8.6-i18n-misc-20060524.diff.bz2
+Patch2:		dillo-i18n-dso.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk+-devel
@@ -37,6 +38,8 @@ Currently: no frames,https,javascript.
 %setup -q
 %patch0
 %patch1 -p1
+%patch2
+rm -rf ../%{name}-%{version}-i18n
 mv ../%{name}-%{version} ../%{name}-%{version}-i18n
 
 # normal version
@@ -106,6 +109,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}
 
 %changelog
+* Sun Apr 11 2010 Bruno Wolff III <bruno at wolff.to> - 0.8.6-12
+- Fix DSO linking bug 564723
+- Cleanup i18n area before trying to mv source there
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.6-11
 - rebuilt with new openssl
 
@@ -202,4 +209,3 @@ rm -rf $RPM_BUILD_ROOT
 
 * Sat Aug 23 2003 Nils O. Selåsdal <NOS at Utel.no> - 0:0.7.3-0.fdr.1
 - Initial RPM release for fedora
-