From 36d8816e9f2c77fa6b71e83936098c693e3ea6b2 Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Apr 15 2005 05:51:49 +0000 Subject: fix plugins on lib64 (#113188 Ville Skytta) --- diff --git a/xchat-2.4.3-lib64.patch b/xchat-2.4.3-lib64.patch new file mode 100644 index 0000000..a246595 --- /dev/null +++ b/xchat-2.4.3-lib64.patch @@ -0,0 +1,31 @@ +diff -Naru xchat-2.4.3.orig/configure xchat-2.4.3/configure +--- xchat-2.4.3.orig/configure 2005-03-29 08:47:31.000000000 +0300 ++++ xchat-2.4.3/configure 2005-04-14 23:20:09.000000000 +0300 +@@ -30054,11 +30054,11 @@ + _ACEOF + + cat >>confdefs.h <<_ACEOF +-#define XCHATLIBDIR "${prefix}/lib/xchat" ++#define XCHATLIBDIR "${libdir}/xchat" + _ACEOF + + cat >>confdefs.h <<_ACEOF +-#define XCHATSHAREDIR "${prefix}/share/xchat" ++#define XCHATSHAREDIR "${datadir}/xchat" + _ACEOF + + fi +diff -Naru xchat-2.4.3.orig/configure.in xchat-2.4.3/configure.in +--- xchat-2.4.3.orig/configure.in 2005-03-29 08:45:59.000000000 +0300 ++++ xchat-2.4.3/configure.in 2005-04-14 23:20:47.000000000 +0300 +@@ -641,8 +641,8 @@ + AC_DEFINE_UNQUOTED(XCHATSHAREDIR, "${ac_default_prefix}/share/xchat") + else + AC_DEFINE_UNQUOTED(PREFIX, "${prefix}") +- AC_DEFINE_UNQUOTED(XCHATLIBDIR, "${prefix}/lib/xchat") +- AC_DEFINE_UNQUOTED(XCHATSHAREDIR, "${prefix}/share/xchat") ++ AC_DEFINE_UNQUOTED(XCHATLIBDIR, "${libdir}/xchat") ++ AC_DEFINE_UNQUOTED(XCHATSHAREDIR, "${datadir}/xchat") + fi + + dnl for plugins/xxx/Makefile.am diff --git a/xchat.spec b/xchat.spec index 8e7c41d..eb08a57 100644 --- a/xchat.spec +++ b/xchat.spec @@ -8,7 +8,7 @@ Summary: A popular and easy to use graphical IRC (chat) client Name: xchat Version: 2.4.3 -Release: 1 +Release: 2 Epoch: 1 Group: Applications/Internet License: GPL @@ -24,6 +24,7 @@ Patch22: xchat-2.0.9-simplify-to-use-gnome-open-for-default-webbrowser.patch Patch23: xchat-2.0.9-simplify-to-use-htmlview-for-default-webbrowser.patch Patch30: xchat-2.4.2-multiline-messages.patch Patch31: xchat-2.4.2-nickmenu-away-msg.patch +Patch32: xchat-2.4.3-lib64.patch BuildRequires: perl python-devel openssl-devel pkgconfig # Added for bugzilla bug #91676 - ./configure indicates these versions or @@ -50,6 +51,7 @@ System. %endif %patch30 -p1 -b .multiline-messages %patch31 -p0 -b .nickmenu-away-msg +%patch32 -p1 -b .lib64 %build # Remove CVS files from source dirs so they're not installed into doc dirs. @@ -111,6 +113,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -rf $RPM_BUILD_ROOT %changelog +* Thu Apr 14 2005 Warren Togami 1:2.4.3-2 +- fix plugins on lib64 (#113188 Ville Skytta) + * Sun Apr 03 2005 Warren Togami 1:2.4.3-1 - 2.4.3, use perl MODULE_COMPAT