diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..fcfe065 --- /dev/null +++ b/.cvsignore @@ -0,0 +1 @@ +animorph-0.3.tar.gz diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..164848b --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: animorph +# $Id$ +NAME := animorph +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) diff --git a/animorph-0.2-pkgconfig.patch b/animorph-0.2-pkgconfig.patch new file mode 100644 index 0000000..8b082d6 --- /dev/null +++ b/animorph-0.2-pkgconfig.patch @@ -0,0 +1,12 @@ +--- animorph-0.2/animorph.pc.in.pkgconfig 2007-07-20 19:53:00.000000000 +0200 ++++ animorph-0.2/animorph.pc.in 2007-07-20 19:53:50.000000000 +0200 +@@ -1,7 +1,7 @@ + prefix=@prefix@ + exec_prefix=@prefix@ +-libdir=@exec_prefix@/lib +-includedir=@prefix@/include ++libdir=@libdir@ ++includedir=@includedir@/animorph + + Name: @PACKAGE@ + Description: 3D Animation and Morph Library diff --git a/animorph-0.3-gcc43.patch b/animorph-0.3-gcc43.patch new file mode 100644 index 0000000..4c2200e --- /dev/null +++ b/animorph-0.3-gcc43.patch @@ -0,0 +1,44 @@ +diff -up animorph-0.3/include/animorph/Hotspot.h.gcc43 animorph-0.3/include/animorph/Hotspot.h +--- animorph-0.3/include/animorph/Hotspot.h.gcc43 2007-11-25 10:34:57.000000000 +0100 ++++ animorph-0.3/include/animorph/Hotspot.h 2008-01-04 17:40:58.000000000 +0100 +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + #include "FileReader.h" + + namespace Animorph { +diff -up animorph-0.3/include/animorph/BodySettings.h.gcc43 animorph-0.3/include/animorph/BodySettings.h +--- animorph-0.3/include/animorph/BodySettings.h.gcc43 2007-12-02 23:30:40.000000000 +0100 ++++ animorph-0.3/include/animorph/BodySettings.h 2008-01-04 17:40:58.000000000 +0100 +@@ -34,6 +34,7 @@ + + #include + #include ++#include + #include + #include + #include "FileReader.h" +diff -up animorph-0.3/include/animorph/FaceGroup.h.gcc43 animorph-0.3/include/animorph/FaceGroup.h +--- animorph-0.3/include/animorph/FaceGroup.h.gcc43 2007-12-02 23:30:40.000000000 +0100 ++++ animorph-0.3/include/animorph/FaceGroup.h 2008-01-04 17:40:58.000000000 +0100 +@@ -29,6 +29,7 @@ + + #include + #include ++#include + #include "Face.h" + #include "FaceVector.h" + #include "FileWriter.h" +diff -up animorph-0.3/include/animorph/util.h.gcc43 animorph-0.3/include/animorph/util.h +--- animorph-0.3/include/animorph/util.h.gcc43 2007-11-25 10:34:57.000000000 +0100 ++++ animorph-0.3/include/animorph/util.h 2008-01-04 17:40:58.000000000 +0100 +@@ -37,6 +37,7 @@ + #include + #include + #include ++#include + #include "Vector3.h" + #include "Vertex.h" + #include "VertexVector.h" diff --git a/animorph-0.3-gcc44.patch b/animorph-0.3-gcc44.patch new file mode 100644 index 0000000..716e689 --- /dev/null +++ b/animorph-0.3-gcc44.patch @@ -0,0 +1,11 @@ +diff -up animorph-0.3/src/OgreXMLExporter.cpp.gcc44 animorph-0.3/src/OgreXMLExporter.cpp +--- animorph-0.3/src/OgreXMLExporter.cpp.gcc44 2007-11-25 10:34:58.000000000 +0100 ++++ animorph-0.3/src/OgreXMLExporter.cpp 2009-03-04 17:37:33.000000000 +0100 +@@ -1,5 +1,7 @@ + #include "../include/animorph/OgreXMLExporter.h" + #include "../include/animorph/xmlParser.h" ++#include ++ + using namespace std; + using namespace Animorph; + diff --git a/animorph.spec b/animorph.spec new file mode 100644 index 0000000..a1bcb09 --- /dev/null +++ b/animorph.spec @@ -0,0 +1,107 @@ +Name: animorph +Version: 0.3 +Release: 5%{?dist} +Summary: 3D Animation and Morph Library + +Group: System Environment/Libraries +License: GPLv3+ +URL: http://www.makehuman.org +Source0: http://downloads.sourceforge.net/makehuman/%{name}-%{version}.tar.gz +Patch0: animorph-0.2-pkgconfig.patch +Patch1: animorph-0.3-gcc43.patch +Patch2: animorph-0.3-gcc44.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + + + +%description +3D Animation and Morph Library + + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + + +%prep +%setup -q +# We need to fix CRLF first +for f in animorph*.in AUTHORS COPYING TODO; do + sed -i 's/\r//' $f + touch -r README $f +done +%patch0 -p1 -b .pkgconfig +%patch1 -p1 -b .gcc43 +%patch2 -p1 -b .gcc44 + +# prevent timestramps changes from patch1 +pushd include/animorph +for f in util.h BodySettings.h FaceGroup.h Hotspot.h;do +touch -r $f.gcc43 $f +done +popd + +%build +export CXXFLAGS="$RPM_OPT_FLAGS -std=c++0x" +%configure --disable-static +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c" +find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' + +# Removes doc +rm -rf $RPM_BUILD_ROOT%{_prefix}/doc + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + + +%files +%defattr(-,root,root,-) +%doc AUTHORS TODO +%{_libdir}/*.so.* + +%files devel +%defattr(-,root,root,-) +%{_includedir}/%{name}/ +%{_libdir}/*.so +%{_libdir}/pkgconfig/%{name}.pc + + +%changelog +* Wed Mar 4 2009 kwizart < kwizart at gmail.com > - 0.3-5 +- Fix for gcc44 + +* Mon Feb 23 2009 Fedora Release Engineering - 0.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Feb 9 2008 kwizart < kwizart at gmail.com > - 0.3-3 +- Rebuild for gcc43 + +* Fri Jan 4 2008 kwizart < kwizart at gmail.com > - 0.3-2 +- Fix for gcc43 + +* Thu Jan 3 2008 kwizart < kwizart at gmail.com > - 0.3-1 +- Update to 0.3 +- License is now GPLv3+ + +* Wed Sep 12 2007 kwizart < kwizart at gmail.com > - 0.2-2 +- Change license to GPLv2+ as said in the source code +- Remove BR glibc-headers +- Change summary (taken from animorph.pc) + +* Fri Jul 20 2007 kwizart < kwizart at gmail.com > - 0.2-1 +- Initial spec file for Fedora diff --git a/dead.package b/dead.package deleted file mode 100644 index 5784d07..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -2014-06-04 - This package was already retired in pkgdb/blocked in koji, but no dead.package file existed. The original retirement reason is unclear. diff --git a/sources b/sources new file mode 100644 index 0000000..e20023a --- /dev/null +++ b/sources @@ -0,0 +1 @@ +e75fd295d95bcf4b1d95b86db7866c18 animorph-0.3.tar.gz