rpms/guichan/devel guichan-0.6.1-soname.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 guichan.spec, 1.3, 1.4 sources, 1.3, 1.4

Michael Thomas (wart) fedora-extras-commits at redhat.com
Mon Apr 9 01:31:02 UTC 2007 

Author: wart

Update of /cvs/extras/rpms/guichan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11661

Modified Files:
	.cvsignore guichan.spec sources 
Added Files:
	guichan-0.6.1-soname.patch 
Log Message:
- Update to 0.6.1
- Use better sf download url
- Remove BR: glut-devel as upstream no longer uses it.
- Add patch to add soname to shared libraries



guichan-0.6.1-soname.patch:

--- NEW FILE guichan-0.6.1-soname.patch ---
--- src/widgets/Makefile.in.orig	2007-03-18 18:28:07.000000000 -0700
+++ src/widgets/Makefile.in	2007-03-18 18:28:29.000000000 -0700
@@ -191,6 +191,7 @@
 INCLUDES = -I$(top_srcdir)/include
 
 # The Gui-chan library sources
+libguichan_widgets_la_LDFLAGS = -release @PACKAGE_VERSION@
 libguichan_widgets_la_SOURCES = \
 	button.cpp		\
 	checkbox.cpp		\
--- src/widgets/Makefile.am.orig	2007-03-18 18:28:07.000000000 -0700
+++ src/widgets/Makefile.am	2007-03-18 18:28:20.000000000 -0700
@@ -3,6 +3,7 @@
 INCLUDES = -I$(top_srcdir)/include
 
 # The Gui-chan library sources
+libguichan_widgets_la_LDFLAGS = -release @PACKAGE_VERSION@
 libguichan_widgets_la_SOURCES = \
 	button.cpp		\
 	checkbox.cpp		\
--- src/sdl/Makefile.in.orig	2007-03-18 18:27:33.000000000 -0700
+++ src/sdl/Makefile.in	2007-03-18 18:27:53.000000000 -0700
@@ -198,6 +198,7 @@
 target_vendor = @target_vendor@
 lib_LTLIBRARIES = libguichan_sdl.la
 INCLUDES = -I$(top_srcdir)/include
+libguichan_sdl_la_LDFLAGS = -release @PACKAGE_VERSION@
 libguichan_sdl_la_SOURCES = \
 	sdl.cpp			\
 	sdlgraphics.cpp		\
--- src/sdl/Makefile.am.orig	2007-03-18 18:27:32.000000000 -0700
+++ src/sdl/Makefile.am	2007-03-18 18:27:45.000000000 -0700
@@ -4,6 +4,7 @@
 
 INCLUDES = -I$(top_srcdir)/include
 
+libguichan_sdl_la_LDFLAGS = -release @PACKAGE_VERSION@
 libguichan_sdl_la_SOURCES =	\
 	sdl.cpp			\
 	sdlgraphics.cpp		\
--- src/allegro/Makefile.in.orig	2007-03-18 18:24:24.000000000 -0700
+++ src/allegro/Makefile.in	2007-03-18 18:25:10.000000000 -0700
@@ -196,6 +196,7 @@
 target_vendor = @target_vendor@
 lib_LTLIBRARIES = libguichan_allegro.la
 INCLUDES = -I$(top_srcdir)/include
+libguichan_allegro_la_LDFLAGS = -release @PACKAGE_VERSION@
 libguichan_allegro_la_SOURCES = \
 		allegro.cpp		\
 		allegrographics.cpp	\
--- src/allegro/Makefile.am.orig	2007-03-18 18:24:19.000000000 -0700
+++ src/allegro/Makefile.am	2007-03-18 18:24:46.000000000 -0700
@@ -2,9 +2,10 @@
 
 INCLUDES = -I$(top_srcdir)/include
 
+libguichan_allegro_la_LDFLAGS = -release @PACKAGE_VERSION@
 libguichan_allegro_la_SOURCES =		\
 		allegro.cpp		\
 		allegrographics.cpp	\
 		allegroimage.cpp	\
 		allegroimageloader.cpp	\
-		allegroinput.cpp
\ No newline at end of file
+		allegroinput.cpp
--- src/opengl/Makefile.in.orig	2007-03-18 18:26:31.000000000 -0700
+++ src/opengl/Makefile.in	2007-03-18 18:27:00.000000000 -0700
@@ -196,6 +196,7 @@
 target_vendor = @target_vendor@
 lib_LTLIBRARIES = libguichan_opengl.la
 INCLUDES = -I$(top_srcdir)/include
+libguichan_opengl_la_LDFLAGS = -release @PACKAGE_VERSION@
 libguichan_opengl_la_SOURCES = \
 	opengl.cpp		\
 	openglimage.cpp		\
--- src/opengl/Makefile.am.orig	2007-03-18 18:26:27.000000000 -0700
+++ src/opengl/Makefile.am	2007-03-18 18:26:44.000000000 -0700
@@ -2,6 +2,7 @@
 
 INCLUDES = -I$(top_srcdir)/include
 
+libguichan_opengl_la_LDFLAGS = -release @PACKAGE_VERSION@
 libguichan_opengl_la_SOURCES =	\
 	opengl.cpp		\
 	openglimage.cpp		\
--- src/Makefile.in.orig	2007-03-18 17:49:41.000000000 -0700
+++ src/Makefile.in	2007-03-18 17:52:12.000000000 -0700
@@ -206,6 +206,7 @@
 INCLUDES = -I$(top_srcdir)/include
 lib_LTLIBRARIES = libguichan.la
 libguichan_la_LIBADD = widgets/libguichan_widgets.la
+libguichan_la_LDFLAGS = -release @PACKAGE_VERSION@
 libguichan_la_DEPENDENCIES = \
 	widgets/libguichan_widgets.la
 
--- src/Makefile.am.orig	2007-03-18 17:49:38.000000000 -0700
+++ src/Makefile.am	2007-03-18 17:50:21.000000000 -0700
@@ -5,6 +5,7 @@
 lib_LTLIBRARIES = libguichan.la
 
 libguichan_la_LIBADD = widgets/libguichan_widgets.la
+libguichan_la_LDFLAGS = -release @PACKAGE_VERSION@
 
 libguichan_la_DEPENDENCIES = \
 	widgets/libguichan_widgets.la


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/guichan/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Oct 2006 09:16:41 -0000	1.3
+++ .cvsignore	9 Apr 2007 01:30:28 -0000	1.4
@@ -1 +1 @@
-guichan-0.5.0-src.tar.gz
+guichan-0.6.1.tar.gz


Index: guichan.spec
===================================================================
RCS file: /cvs/extras/rpms/guichan/devel/guichan.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- guichan.spec	4 Oct 2006 09:16:41 -0000	1.3
+++ guichan.spec	9 Apr 2007 01:30:28 -0000	1.4
@@ -1,16 +1,16 @@
 Name:           guichan
-Version:        0.5.0
+Version:        0.6.1
 Release:        1%{?dist}
 Summary:        Portable C++ GUI library for games using Allegro, SDL and OpenGL
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://guichan.sourceforge.net
-Source0:        http://easynews.dl.sourceforge.net/sourceforge/guichan/%{name}-%{version}-src.tar.gz
+Source0:        http://downloads.sourceforge.net/guichan/%{name}-%{version}.tar.gz
+Patch0:         guichan-0.6.1-soname.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  allegro-devel, SDL-devel, SDL_image-devel, libGL-devel
-BuildRequires:  freeglut-devel
 
 %description
 Guichan is a small, efficient C++ GUI library designed for games. It comes
@@ -28,7 +28,14 @@
 package is needed to build programs written using guichan.
 
 %prep
-%setup -q -n %{name}-%{version}-src
+%setup -q -n %{name}-%{version}
+for i in src/Makefile.am src/*/Makefile.am ; do
+    touch -r $i $i.stamp
+done
+%patch0
+for i in src/Makefile.am src/*/Makefile.am ; do
+    touch -r $i.stamp $i
+done
 
 
 %build
@@ -40,8 +47,9 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# Removing Libtool archives
+# Removing Libtool archives and static libraries
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
 %post -p /sbin/ldconfig
 
@@ -56,30 +64,28 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{_libdir}/libguichan.so.*
-%{_libdir}/libguichan_allegro.so.*
-%{_libdir}/libguichan_glut.so.*
-%{_libdir}/libguichan_opengl.so.*
-%{_libdir}/libguichan_sdl.so.*
+%{_libdir}/libguichan-%{version}.so
+%{_libdir}/libguichan_allegro-%{version}.so
+%{_libdir}/libguichan_opengl-%{version}.so
+%{_libdir}/libguichan_sdl-%{version}.so
 
 %files devel
 %defattr(-,root,root,-)
-%doc docs/html
 %{_includedir}/guichan.hpp
 %{_includedir}/guichan/
-%{_libdir}/libguichan.a
 %{_libdir}/libguichan.so
-%{_libdir}/libguichan_allegro.a
 %{_libdir}/libguichan_allegro.so
-%{_libdir}/libguichan_glut.a
-%{_libdir}/libguichan_glut.so
-%{_libdir}/libguichan_opengl.a
 %{_libdir}/libguichan_opengl.so
-%{_libdir}/libguichan_sdl.a
 %{_libdir}/libguichan_sdl.so
 
 
 %changelog
+* Sat Apr  7 2007 Wart <wart at kobold.org> 0.6.1-1
+- Update to 0.6.1
+- Use better sf download url
+- Remove BR: glut-devel as upstream no longer uses it.
+- Add patch to add soname to shared libraries
+
 * Wed Oct  4 2006 Hugo Cisneiros <hugo at devin.com.br> 0.5.0-1
 - Upstream update
 - Add freeglut-devel BR for the new release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/guichan/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Oct 2006 09:16:41 -0000	1.3
+++ sources	9 Apr 2007 01:30:28 -0000	1.4
@@ -1 +1 @@
-c9fcbcb360105247da06afc5c643e664  guichan-0.5.0-src.tar.gz
+830145f71ad4ce4c91e09808fec68c8a  guichan-0.6.1.tar.gz

More information about the scm-commits mailing list