rpms/paragui/devel gcc34-fix.patch, NONE, 1.1 newrpms-paragui-64bit.patch, NONE, 1.1 newrpms-paragui-makefile.patch, NONE, 1.1 paragui-aclocal.patch, NONE, 1.1 paragui-python.patch, NONE, 1.1 paragui.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Tue Mar 27 08:01:04 UTC 2007
Author: jwrdegoede
Update of /cvs/extras/rpms/paragui/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23297/devel
Modified Files:
.cvsignore sources
Added Files:
gcc34-fix.patch newrpms-paragui-64bit.patch
newrpms-paragui-makefile.patch paragui-aclocal.patch
paragui-python.patch paragui.spec
Log Message:
auto-import paragui-1.0.4-3.fc7 on branch devel from paragui-1.0.4-3.fc7.src.rpm
gcc34-fix.patch:
--- NEW FILE gcc34-fix.patch ---
diff -uNr paragui-1.0.4-orig/include/pglog.h paragui-1.0.4/include/pglog.h
--- paragui-1.0.4-orig/include/pglog.h 2003-03-30 18:30:57.000000000 +0200
+++ paragui-1.0.4/include/pglog.h 2004-12-20 23:19:48.968364440 +0100
@@ -84,7 +84,7 @@
DECLSPEC void SetConsoleKey(SDLKey key);
DECLSPEC SDLKey GetConsoleKey();
DECLSPEC void SetTitle(const char* title, int alignment = PG_TA_CENTER);
-};
+}
#endif
newrpms-paragui-64bit.patch:
--- NEW FILE newrpms-paragui-64bit.patch ---
--- paragui-1.0.4/include/pgtimerobject.h.old 2005-04-07 07:21:08.000000000 +0200
+++ paragui-1.0.4/include/pgtimerobject.h 2005-04-07 07:21:21.000000000 +0200
@@ -32,7 +32,7 @@
#include "paragui.h"
#include <map>
-typedef Uint32 PG_TimerID;
+typedef unsigned long PG_TimerID;
/**
@author Alexander Pipelka
--- paragui-1.0.4/src/core/pgmsgmap.cpp~ 2007-03-19 12:01:11.000000000 +0100
+++ paragui-1.0.4/src/core/pgmsgmap.cpp 2007-03-19 12:01:11.000000000 +0100
@@ -83,7 +83,7 @@
return;
for ( li = list->begin() ; li != list->end() ; li++ ) {
- PG_LogDBG(" - Message Object: %d Event Handler Data: %d", (int)(*li).first, (int)(*li).second);
+ PG_LogDBG(" - Message Object: %p Event Handler Data: %p", (*li).first, (*li).second);
}
}
newrpms-paragui-makefile.patch:
--- NEW FILE newrpms-paragui-makefile.patch ---
--- paragui-1.0.4/Makefile.am.old 2005-04-07 07:51:45.000000000 +0200
+++ paragui-1.0.4/Makefile.am 2005-04-07 07:52:06.000000000 +0200
@@ -24,7 +24,7 @@
m4datadir = $(datadir)/aclocal
m4data_DATA = paragui.m4
-pkgconfigdir = $(prefix)/lib/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = paragui.pc
$(PACKAGE)-$(VERSION).tar.gz: dist
--- paragui-1.0.4/Makefile.in~ 2007-03-24 08:17:49.000000000 +0100
+++ paragui-1.0.4/Makefile.in 2007-03-24 08:17:49.000000000 +0100
@@ -131,7 +131,7 @@
m4datadir = $(datadir)/aclocal
m4data_DATA = paragui.m4
-pkgconfigdir = $(prefix)/lib/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = paragui.pc
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--- paragui-1.0.4/src/Makefile.in~ 2007-03-24 08:25:27.000000000 +0100
+++ paragui-1.0.4/src/Makefile.in 2007-03-24 08:25:27.000000000 +0100
@@ -129,7 +129,7 @@
libparagui_la_LDFLAGS = -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-libparagui_la_LIBADD = $(SDL_LIBS) $(IMAGE_LIBS) $(EXPAT_LIB) $(PHYSFS_LIB) ./draw/libpgdraw.la ./font/libpgfont.la ./core/libpgcore.la ./widgets/libpgwidgets.la ./themes/libtheme.la $(LIBSTDCPP)
+libparagui_la_LIBADD = $(SDL_LIBS) $(IMAGE_LIBS) $(EXPAT_LIB) $(PHYSFS_LIB) ./draw/libpgdraw.la ./font/libpgfont.la ./core/libpgcore.la ./widgets/libpgwidgets.la ./themes/libtheme.la $(LIBSTDCPP) -lfreetype
INCLUDES = $(SDL_CFLAGS) -I$(top_srcdir)/include
--- paragui-1.0.4/src/Makefile.am~ 2007-03-24 08:24:59.000000000 +0100
+++ paragui-1.0.4/src/Makefile.am 2007-03-24 08:24:59.000000000 +0100
@@ -21,7 +21,8 @@
./core/libpgcore.la \
./widgets/libpgwidgets.la \
./themes/libtheme.la \
- $(LIBSTDCPP)
+ $(LIBSTDCPP) \
+ -lfreetype
INCLUDES = \
$(SDL_CFLAGS) \
paragui-aclocal.patch:
--- NEW FILE paragui-aclocal.patch ---
--- paragui-1.0.4/paragui.m4~ 2007-03-24 08:21:29.000000000 +0100
+++ paragui-1.0.4/paragui.m4 2007-03-24 08:21:29.000000000 +0100
@@ -9,7 +9,7 @@
dnl AM_PATH_PARAGUI([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for PARAGUI, and define PARAGUI_CFLAGS and PARAGUI_LIBS
dnl
-AC_DEFUN(AM_PATH_PARAGUI,
+AC_DEFUN([AM_PATH_PARAGUI],
[dnl
dnl Get the cflags and libraries from the paragui-config script
dnl
paragui-python.patch:
--- NEW FILE paragui-python.patch ---
--- paragui-1.0.4/configure.in~ 2007-03-24 08:36:03.000000000 +0100
+++ paragui-1.0.4/configure.in 2007-03-24 08:36:03.000000000 +0100
@@ -509,9 +509,9 @@
PYTHON_INCLUDE_DIR=""
PYTHON_LIB_DIR=""
have_python_include=no
- AC_CHECK_HEADER(python2.2/Python.h, [have_python_include=yes])
- PYTHON_INCLUDE_DIR=$prefix/include/python2.2
- PYTHON_LIB_DIR=$libdir/python2.2
+ AC_CHECK_HEADER(python2.5/Python.h, [have_python_include=yes])
+ PYTHON_INCLUDE_DIR=$prefix/include/python2.5
+ PYTHON_LIB_DIR=$libdir/python2.5
if test x$have_python_include = xno; then
AC_CHECK_HEADER(python2.1/Python.h, [have_python_include=yes])
PYTHON_INCLUDE_DIR=$prefix/include/python2.1
--- paragui-1.0.4/configure~ 2007-03-24 08:35:56.000000000 +0100
+++ paragui-1.0.4/configure 2007-03-24 08:35:56.000000000 +0100
@@ -7384,16 +7384,16 @@
PYTHON_INCLUDE_DIR=""
PYTHON_LIB_DIR=""
have_python_include=no
- ac_safe=`echo "python2.2/Python.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for python2.2/Python.h""... $ac_c" 1>&6
-echo "configure:7390: checking for python2.2/Python.h" >&5
+ ac_safe=`echo "python2.5/Python.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for python2.5/Python.h""... $ac_c" 1>&6
+echo "configure:7390: checking for python2.5/Python.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 7395 "configure"
#include "confdefs.h"
-#include <python2.2/Python.h>
+#include <python2.5/Python.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:7400: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -7417,8 +7417,8 @@
echo "$ac_t""no" 1>&6
fi
- PYTHON_INCLUDE_DIR=$prefix/include/python2.2
- PYTHON_LIB_DIR=$libdir/python2.2
+ PYTHON_INCLUDE_DIR=$prefix/include/python2.5
+ PYTHON_LIB_DIR=$libdir/python2.5
if test x$have_python_include = xno; then
ac_safe=`echo "python2.1/Python.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for python2.1/Python.h""... $ac_c" 1>&6
--- paragui-1.0.4/include/pgbutton.h~ 2007-03-24 09:21:30.000000000 +0100
+++ paragui-1.0.4/include/pgbutton.h 2007-03-24 09:21:30.000000000 +0100
@@ -200,7 +200,7 @@
bool SetIcon(SDL_Surface* icon_up, SDL_Surface* icon_down = NULL, SDL_Surface* icon_over = NULL);
// 1.0.1 versions (surface)
-#ifndef SWIG
+#if !defined SWIG && !defined SWIGPYTHON
bool SetIcon(SDL_Surface* icon_up, SDL_Surface* icon_down = NULL);
#endif
--- paragui-1.0.4/bindings/python/Makefile.in~ 2007-03-25 00:19:25.000000000 +0100
+++ paragui-1.0.4/bindings/python/Makefile.in 2007-03-25 00:19:25.000000000 +0100
@@ -123,7 +123,7 @@
PGHEADERS = $(shell ls $(top_srcdir)/include/*.h)
-LINK = $(COMPILE) -shared -L at prefix@/lib -lexpat -lz $(SDL_LIBS) $(IMAGE_LIBS) $(LIBSTDCPP) -lparagui -L$(top_srcdir)/src
+LINK = $(COMPILE) -shared -L at prefix@/lib -lexpat -lz $(SDL_LIBS) $(IMAGE_LIBS) $(LIBSTDCPP) -lparagui -L$(top_srcdir)/src/.libs
INCLUDES = $(SDL_CFLAGS) -I$(top_srcdir)/include -I$(PYTHON_INCLUDE_DIR) -I../../include
--- paragui-1.0.4/bindings/python/Makefile.am~ 2007-03-25 00:19:18.000000000 +0100
+++ paragui-1.0.4/bindings/python/Makefile.am 2007-03-25 00:19:18.000000000 +0100
@@ -11,7 +11,7 @@
$(SDL_LIBS) \
$(IMAGE_LIBS) \
$(LIBSTDCPP) \
- -lparagui -L$(top_srcdir)/src
+ -lparagui -L$(top_srcdir)/src/.libs
INCLUDES = \
$(SDL_CFLAGS) \
--- NEW FILE paragui.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: paragui
Version: 1.0.4
Release: 3%{?dist}
Summary: Graphical User Interface based on SDL
Group: System Environment/Libraries
License: LGPL
URL: http://www.bms-austria.com/projects/paragui/
Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.gz
Patch0: gcc34-fix.patch
Patch1: newrpms-paragui-64bit.patch
Patch2: newrpms-paragui-makefile.patch
Patch3: paragui-aclocal.patch
Patch4: paragui-python.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
BuildRequires: swig python-devel
%description
ParaGUI is a cross-platform high-level application framework and GUI
(graphical user interface) library. ParaGUI's cross-platform nature is
completely based on the Simple DirectMedia Layer (SDL).
%package devel
Summary: Headers for developing programs that will use paragui
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: expat-devel SDL_image-devel freetype-devel libstdc++-devel
Requires: pkgconfig automake
%description devel
This package contains the headers that programmers will need to develop
applications which will use paragui, a GUI on top of SDL.
%package python
Summary: Python bindings for paragui
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description python
Python bindings for ParaGUI, a cross-platform high-level application framework
and GUI (graphical user interface) library.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -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
%build
%configure --disable-static --enable-python
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
mkdir -p $RPM_BUILD_ROOT%{python_sitearch}
mv $RPM_BUILD_ROOT%{_libdir}/python2.5/%{name}* \
$RPM_BUILD_ROOT%{python_sitearch}
chmod +x $RPM_BUILD_ROOT%{python_sitearch}/paraguicmodule.so
rm $RPM_BUILD_ROOT%{_libdir}/lib%{name}.la
%clean
rm -rf $RPM_BUILD_ROOT
%post -n %{name} -p /sbin/ldconfig
%postun -n %{name} -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/lib%{name}-1.0.so.*
%{_datadir}/%{name}
%files devel
%defattr(-,root,root,-)
%{_bindir}/paragui-config
%{_includedir}/%{name}
%{_libdir}/lib%{name}.so
%{_libdir}/pkgconfig/%{name}.pc
%{_datadir}/aclocal/%{name}.m4
%files python
%defattr(-,root,root,-)
%{python_sitearch}/%{name}*
%changelog
* Sat Mar 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0.4-3
- Fix building of python bindings when paragui isn't installed already,
for example when building under mock (bz 233140)
* Sat Mar 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0.4-2
- Various specfile improvements (bz 233140)
* Sun Mar 18 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0.4-1
- Initial Fedora Extras package based on specfile by Che (newrpms)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/paragui/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 25 Mar 2007 17:42:21 -0000 1.1
+++ .cvsignore 27 Mar 2007 08:00:30 -0000 1.2
@@ -0,0 +1 @@
+paragui-1.0.4.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/paragui/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 25 Mar 2007 17:42:21 -0000 1.1
+++ sources 27 Mar 2007 08:00:30 -0000 1.2
@@ -0,0 +1 @@
+fc0cfcb31e28c2f7ff7e9900d3c5f651 paragui-1.0.4.tar.gz
More information about the scm-commits
mailing list