rpms/orage/devel orage-4.6.1-dsofix.patch, NONE, 1.1 orage.spec, 1.19, 1.20

[Kevin Fenzi]

Author: kevin

Update of /cvs/extras/rpms/orage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31509

Modified Files:
	orage.spec 
Added Files:
	orage-4.6.1-dsofix.patch 
Log Message:
Add patch to fix DSO linking. Fixes bug 564740


orage-4.6.1-dsofix.patch:
 globaltime/Makefile.in   |    2 +-
 panel-plugin/Makefile.in |    2 +-
 src/Makefile.in          |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE orage-4.6.1-dsofix.patch ---
diff -Nur orage-4.6.1.orig/globaltime/Makefile.in orage-4.6.1/globaltime/Makefile.in
--- orage-4.6.1.orig/globaltime/Makefile.in	2009-04-14 16:59:40.000000000 -0600
+++ orage-4.6.1/globaltime/Makefile.in	2010-02-14 00:39:38.000000000 -0700
@@ -145,7 +145,7 @@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 LD = @LD@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -lX11
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
diff -Nur orage-4.6.1.orig/panel-plugin/Makefile.in orage-4.6.1/panel-plugin/Makefile.in
--- orage-4.6.1.orig/panel-plugin/Makefile.in	2009-04-14 16:59:44.000000000 -0600
+++ orage-4.6.1/panel-plugin/Makefile.in	2010-02-14 00:18:49.000000000 -0700
@@ -154,7 +154,7 @@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 LD = @LD@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -lX11
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
diff -Nur orage-4.6.1.orig/src/Makefile.in orage-4.6.1/src/Makefile.in
--- orage-4.6.1.orig/src/Makefile.in	2009-04-14 16:59:45.000000000 -0600
+++ orage-4.6.1/src/Makefile.in	2010-02-13 23:57:08.000000000 -0700
@@ -186,7 +186,7 @@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 LD = @LD@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -lX11 -lm
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@


Index: orage.spec
===================================================================
RCS file: /cvs/extras/rpms/orage/devel/orage.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- orage.spec	10 Sep 2009 04:51:50 -0000	1.19
+++ orage.spec	14 Feb 2010 08:04:34 -0000	1.20
@@ -1,10 +1,12 @@
 Summary: Time-managing application for Xfce4
 Name: orage
 Version: 4.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/orage-%{version}.tar.bz2
+# Upstream bug: http://bugzilla.xfce.org/show_bug.cgi?id=6234
+Patch1: orage-4.6.1-dsofix.patch
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libxfce4util-devel >= %{version}
@@ -30,6 +32,8 @@ using the Orage Clock plugin for the pan
 %prep
 %setup -q
 
+%patch1 -p1 
+
 %build
 %configure --disable-static
 
@@ -76,6 +80,9 @@ touch --no-create %{_datadir}/icons/hico
 %{_mandir}/man1/orage.1.gz
 
 %changelog
+* Sat Feb 13 2010 Kevin Fenzi <kevin at tummy.com> - 4.6.1-2
+- Add patch to fix DSO linking. Fixes bug 564740
+
 * Thu Sep 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-1
 - Update to 4.6.1
 - Update package deskription