[openCOLLADA] Rebuild for GCC 4.7.0.
Richard Shaw
hobbes1069 at fedoraproject.org
Thu Jan 5 18:26:45 UTC 2012
commit 302df31f10d4936877641c6cd33331e0229fb363
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date: Thu Jan 5 12:26:42 2012 -0600
Rebuild for GCC 4.7.0.
.gitignore | 1 +
Changelog => ChangeLog | 91 ------------------------------------------------
openCOLLADA.spec | 24 +++++++++---
sources | 2 +-
4 files changed, 20 insertions(+), 98 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1a5adef..59dd1f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/openCOLLADA-svn838.tar.xz
/openCOLLADA-svn863.tar.xz
+/openCOLLADA-svn864.tar.xz
diff --git a/Changelog b/ChangeLog
similarity index 97%
rename from Changelog
rename to ChangeLog
index d08dec2..1b0e232 100644
--- a/Changelog
+++ b/ChangeLog
@@ -1,95 +1,4 @@
------------------------------------------------------------------------
-r863 | ideasman42 at gmail.com | 2011-10-13 19:46:23 -0500 (Thu, 13 Oct 2011) | 4 lines
-
-configure cmake to add warning flags if supported -Wextra too, but spress some of the more noisy warnings.
-
-also quiet some more harmless warnings.
-
-------------------------------------------------------------------------
-r862 | ideasman42 at gmail.com | 2011-10-13 19:38:47 -0500 (Thu, 13 Oct 2011) | 2 lines
-
-comment/ifdef unused vars (quiet some compiler warnings)
-
-------------------------------------------------------------------------
-r861 | ideasman42 at gmail.com | 2011-10-13 19:07:57 -0500 (Thu, 13 Oct 2011) | 2 lines
-
-cmake: build 'Release' by default.
-
-------------------------------------------------------------------------
-r860 | ideasman42 at gmail.com | 2011-10-13 19:02:26 -0500 (Thu, 13 Oct 2011) | 2 lines
-
-apply some changes suggested by Alexey.Z, issue 172.
-
-------------------------------------------------------------------------
-r859 | ideasman42 at gmail.com | 2011-10-13 18:54:06 -0500 (Thu, 13 Oct 2011) | 4 lines
-
-added script to double check cmake files (copied from blender where I maintain it),
-this helps ensure all source files are either explicitly ignored or accounted for by cmake.
-very nice for generating project files.
-
-------------------------------------------------------------------------
-r858 | ideasman42 at gmail.com | 2011-10-13 18:26:23 -0500 (Thu, 13 Oct 2011) | 2 lines
-
-move header installs into each libs cmake file and make the headers apart of the source so generated project files will include.
-
-------------------------------------------------------------------------
-r857 | ideasman42 at gmail.com | 2011-10-13 08:47:26 -0500 (Thu, 13 Oct 2011) | 2 lines
-
-remove redundant source file prefix and fix for previously committed wrong header install location
-
-------------------------------------------------------------------------
-r856 | ideasman42 at gmail.com | 2011-10-13 08:26:37 -0500 (Thu, 13 Oct 2011) | 2 lines
-
-greately simplify library definitions using a generic macro: opencollada_add_lib(...)
-
-------------------------------------------------------------------------
-r855 | ideasman42 at gmail.com | 2011-10-13 07:54:08 -0500 (Thu, 13 Oct 2011) | 2 lines
-
-CMake: make install target now works, use debian package as a reference to where files should go.
-
-------------------------------------------------------------------------
-r854 | ideasman42 at gmail.com | 2011-10-13 06:31:43 -0500 (Thu, 13 Oct 2011) | 2 lines
-
-fix for cmake creating libs in the source dir
-
-------------------------------------------------------------------------
-r853 | ideasman42 at gmail.com | 2011-10-13 05:34:29 -0500 (Thu, 13 Oct 2011) | 2 lines
-
-remove source dirs variables, list files directly
-
-------------------------------------------------------------------------
-r852 | ideasman42 at gmail.com | 2011-10-13 05:27:45 -0500 (Thu, 13 Oct 2011) | 2 lines
-
-missed these last commit.
-
-------------------------------------------------------------------------
-r851 | ideasman42 at gmail.com | 2011-10-13 05:20:47 -0500 (Thu, 13 Oct 2011) | 2 lines
-
-pedantic formatting / style edits
-
-------------------------------------------------------------------------
-r850 | ideasman42 at gmail.com | 2011-10-13 04:49:59 -0500 (Thu, 13 Oct 2011) | 8 lines
-
-use explicit file paths for CMake rather then globing, This is recommended by cmake devs.
-
-globbing vs explicit is discussed here. http://www.cmake.org/pipermail/cmake/2008-December/025694.html
-
-Practical implications are:
-- developers need to keep CMakeLists.txt files up to date.
-- Users wont get strange linking errors if they build after a file is added, since CMake detects CMakeLists.txt is modified and automatically reconfigure.
-
-------------------------------------------------------------------------
-r849 | ideasman42 at gmail.com | 2011-10-13 03:55:07 -0500 (Thu, 13 Oct 2011) | 3 lines
-
-fix for building on linux with gcc4.6.1
-note: FWriteBufferFlusher::FWriteBufferFlusher is disabled on non windows systems for now because _wfopen* is windows only.
-
-------------------------------------------------------------------------
-r848 | ideasman42 at gmail.com | 2011-10-13 03:08:55 -0500 (Thu, 13 Oct 2011) | 2 lines
-
-initial test commit
-
-------------------------------------------------------------------------
r847 | opencollada2 at gmail.com | 2011-09-13 07:16:16 -0500 (Tue, 13 Sep 2011) | 1 line
*COLLADABUMathUtils: added epsilonEquals(..) + getMatrixTransposed(..)
diff --git a/openCOLLADA.spec b/openCOLLADA.spec
index ca00fce..54e2aa9 100644
--- a/openCOLLADA.spec
+++ b/openCOLLADA.spec
@@ -1,9 +1,14 @@
# These are needed to fake the library version.
-%define AGE 863
+%global AGE 864
+# Upstream does not maintain a soversion so we define one here.
+# abi-compliance-checker will be used to determin if an abi breakage occurs
+# and the soversion will be incremented.
+%global sover 0.1
+
Name: openCOLLADA
Version: 0
-Release: 8.svn%{AGE}%{?dist}
+Release: 10.svn%{AGE}%{?dist}
License: MIT
Summary: Collada 3D import and export libraries
Url: http://www.opencollada.org/
@@ -14,7 +19,7 @@ Group: System Environment/Libraries
# svn -r 863 export http://opencollada.googlecode.com/svn/trunk/ openCOLLADA-svn863
# tar acf openCOLLADA-svn836.tar.xz openCOLLADA-svn863
Source0: %{name}-svn%{AGE}.tar.xz
-Source1: Changelog
+Source1: ChangeLog
Patch0: openCOLLADA-svn863-cmake.patch
Patch1: openCOLLADA-svn863-libs.patch
@@ -44,6 +49,7 @@ GeneratedSaxParser Library used to load xml files in the way
%package doc
Summary: Developer documentation for %{name}
Group: Documentation
+BuildArch: noarch
Requires: %{name} = %{version}-%{release}
%description doc
@@ -99,7 +105,7 @@ install -p -m 0644 %{S:1} ./
# Build openCOLLADA shared libraries.
mkdir -p Build
pushd Build
-%cmake ../ -DUSE_STATIC=OFF -DUSE_SHARED=ON -Dsoversion=svn%{AGE} -DCMAKE_SKIP_RPATH=ON
+%cmake ../ -DUSE_STATIC=OFF -DUSE_SHARED=ON -Dsoversion=%{sover} -DCMAKE_SKIP_RPATH=ON
# Note building with _smp_mflags does not work for some reason...
make
popd
@@ -120,8 +126,8 @@ install -p -m 0755 bin/* %{buildroot}%{_bindir}/
%files
-%doc README LICENSE README.COLLADAStreamWriter COLLADAStreamWriter/AUTHORS Changelog
-%{_libdir}/lib*.so.svn%{AGE}
+%doc README LICENSE README.COLLADAStreamWriter COLLADAStreamWriter/AUTHORS ChangeLog
+%{_libdir}/lib*.so.%{sover}
%files doc
%doc htdocs/
@@ -135,6 +141,12 @@ install -p -m 0755 bin/* %{buildroot}%{_bindir}/
%changelog
+* Thu Jan 05 2012 Richard Shaw <hobbes1069 at gmail.com? - 0-10
+- Rebuild for GCC 4.7.0.
+
+* Wed Oct 26 2011 Richard Shaw <hobbes1069 at gmail.com> - 0-9
+- Update to svn revision 864.
+
* Wed Oct 26 2011 Richard Shaw <hobbes1069 at gmail.com> - 0-8
- Update to svn revision 863.
- Fix typo in spec file.
diff --git a/sources b/sources
index 66cb249..aec9743 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-546d4fc997d947955b7394a98ca57f54 openCOLLADA-svn863.tar.xz
+3525cb1acfcaacefd938084f2aaba07f openCOLLADA-svn864.tar.xz
More information about the scm-commits
mailing list