dist-git conversion

repacked tarball
sync
2010-07-28 09:47:52 +00:00 · 2010-07-09 16:59:11 +00:00 · 2010-07-08 20:06:10 +00:00 · 2010-05-08 01:42:41 +00:00 · 2009-11-26 01:27:08 +00:00
5 changed files with 27 additions and 23 deletions
--- a/.gitignore
+++ b/.gitignore
--- a/21
+++ b/21
@ -1,21 +0,0 @@
-# Makefile for source rpm: amanith
-# $Id$
-NAME := amanith
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
--- a/amanith-0.3-fix-DSO.patch
+++ b/amanith-0.3-fix-DSO.patch
@ -0,0 +1,17 @@
+diff -up amanith/examples/opengl/testshaders/testshaders.pro.DSO amanith/examples/opengl/testshaders/testshaders.pro
+--- amanith/examples/opengl/testshaders/testshaders.pro.DSO	2010-02-10 11:39:49.917762524 -0500
+++ amanith/examples/opengl/testshaders/testshaders.pro	2010-02-10 11:40:23.487766249 -0500
+@@ -9,9 +9,11 @@ CONFIG        += qt warn_on opengl
+ SOURCES        = main.cpp \
+                  testshaders.cpp
+ 
+LIBS          += -lGLEW
+
+ win32: RC_FILE = example.rc
+ 
+ # Qt4 support
+ contains(DEFINES, USE_QT4) {
+     QT += opengl
+-}
+\ No newline at end of file
+}
--- a/amanith.spec
+++ b/amanith.spec
@ -1,6 +1,6 @@
 Name:          amanith
 Version:       0.3
-Release:       13%{?dist}
+Release:       14%{?dist}.1
 Summary:       Crossplatform framework for 2d/3d vector graphics
 Group:         Development/Libraries
 License:       QPL
@ -21,6 +21,7 @@ Patch6:        amanith-0.3-freetype-fix.patch
 Patch7:        amanith-0.3-system-freetype.patch
 Patch8:        amanith-0.3-gcc43.patch
 Patch9:        amanith-0.3-gcc44.patch
+Patch10:       amanith-0.3-fix-DSO.patch

 %description
 Amanith is an OpenSource C++ CrossPlatform framework designed for 2d & 3d 
@ -47,6 +48,7 @@ Development libraries and headers for developing programs that use amanith.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1 -b .DSO
 # Boo. Hiss. SGI Free B and GLX files.
 rm -rf include/GL/
 # Don't need the 3rdpart stuff either.
@ -103,6 +105,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/amanith/

 %changelog
+* Fri Jul  9 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 0.3-14.1
+- repacked tarball (old one wouldn't open on EL-6 for some reason)
+
+* Wed Feb 10 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 0.3-14
+- fix implicit DSO linking
+
 * Wed Aug 19 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 0.3-13
 - note that upstream is gone, drop URL from Source0

--- a/2
+++ b/2
@ -1 +1 @@
-392e79d36cc2d57921c7fefacbc4d4a3  amanith_03.tar.gz
+9c7e4607a3260fd4acbad66d22dc3eb0  amanith_03.tar.gz
Author	SHA1	Message	Date
Fedora Release Engineering	6356d4e4c7	dist-git conversion	2010-07-28 09:47:52 +00:00
Tom Callaway	cb241344b5	repacked tarball	2010-07-09 16:59:11 +00:00
Tom Callaway	6629313ad6	sync	2010-07-08 20:06:10 +00:00
Dennis Gilmore	c3346786f1	Initialize branch EL-6 for amanith	2010-05-08 01:42:41 +00:00
Bill Nottingham	25cd0e8224	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:27:08 +00:00