rpms/paragui/devel paragui-multilib.patch, NONE, 1.1 paragui.spec, 1.3, 1.4
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Sun Oct 21 18:46:51 UTC 2007
- Previous message (by thread): rpms/offlineimap/devel .cvsignore, 1.3, 1.4 offlineimap.spec, 1.9, 1.10 sources, 1.3, 1.4
- Next message (by thread): rpms/qt4-qsa/devel .cvsignore, 1.3, NONE Makefile, 1.1, NONE qsa-1.2.1-QT_INSTALL.patch, 1.1, NONE qt4-qsa-fhs.patch, 1.1, NONE qt4-qsa.spec, 1.15, NONE sources, 1.3, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jwrdegoede
Update of /cvs/extras/rpms/paragui/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28710
Modified Files:
paragui.spec
Added Files:
paragui-multilib.patch
Log Message:
* Sun Oct 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0.4-6
- Fix paragui-config multilib conflict (bz 342831)
paragui-multilib.patch:
--- NEW FILE paragui-multilib.patch ---
diff -up paragui-1.0.4/paragui-config.in~ paragui-1.0.4/paragui-config.in
--- paragui-1.0.4/paragui-config.in~ 2007-10-21 20:07:22.000000000 +0200
+++ paragui-1.0.4/paragui-config.in 2007-10-21 20:07:22.000000000 +0200
@@ -45,20 +45,10 @@ while test $# -gt 0; do
echo $includes -I at includedir@/paragui @PARAGUI_CFLAGS@
;;
--libs)
- if [ "`uname`" = "SunOS" ]; then
- libdirs="-L at libdir@ -R at libdir@"
- else
- libdirs="-L at libdir@"
- fi
- echo $libdirs @PARAGUI_LIBS@
+ echo @PARAGUI_LIBS@
;;
--static-libs)
- if [ "`uname`" = "SunOS" ]; then
- libdirs="-L at libdir@ -R at libdir@"
- else
- libdirs="-L at libdir@"
- fi
- echo $libdirs @PARAGUI_LIBS@ @SYSTEM_LIBS@
+ echo @PARAGUI_LIBS@ @SYSTEM_LIBS@
;;
*)
echo "${usage}" 1>&2
Index: paragui.spec
===================================================================
RCS file: /cvs/extras/rpms/paragui/devel/paragui.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- paragui.spec 28 Aug 2007 10:06:03 -0000 1.3
+++ paragui.spec 21 Oct 2007 18:46:18 -0000 1.4
@@ -2,7 +2,7 @@
Name: paragui
Version: 1.0.4
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Graphical User Interface based on SDL
Group: System Environment/Libraries
License: LGPLv2+
@@ -13,6 +13,7 @@
Patch2: newrpms-paragui-makefile.patch
Patch3: paragui-aclocal.patch
Patch4: paragui-python.patch
+Patch5: paragui-multilib.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel libpng-devel SDL_image-devel libtiff-devel
BuildRequires: freetype-devel expat-devel physfs-devel libjpeg-devel
@@ -53,11 +54,14 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
chmod -x include/paragui*.h
# fixup some timestamps to stop autoxxx from rerunning due to our patches
touch aclocal.m4
touch include/stamp-h.in configure `find -name Makefile.in`
touch paraconfig_gnu.h.in
+# sdl-config --libs' output includes -L/usr/lib[64] causing multilib pain
+sed -i 's|`$SDL_CONFIG $sdlconf_args --libs`|"-lSDL -lpthread"|' configure
%build
@@ -103,6 +107,9 @@
%changelog
+* Sun Oct 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0.4-6
+- Fix paragui-config multilib conflict (bz 342831)
+
* Tue Aug 28 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0.4-5
- Rebuild for new expat 2.0
- Previous message (by thread): rpms/offlineimap/devel .cvsignore, 1.3, 1.4 offlineimap.spec, 1.9, 1.10 sources, 1.3, 1.4
- Next message (by thread): rpms/qt4-qsa/devel .cvsignore, 1.3, NONE Makefile, 1.1, NONE qsa-1.2.1-QT_INSTALL.patch, 1.1, NONE qt4-qsa-fhs.patch, 1.1, NONE qt4-qsa.spec, 1.15, NONE sources, 1.3, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list