[openCOLLADA/f14: 5/6] Merge branch 'master' into f14

Mon Nov 7 15:28:31 UTC 2011

commit 084f29e729be65155a8f9003657922420239c258
Merge: 14cb69f e5e7934
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Mon Nov 7 09:17:01 2011 -0600

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	openCOLLADA.spec
    	sources

 .gitignore                           |    4 +
 Changelog                            | 3440 ++++++++++++++++++++++++++++++++++
 openCOLLADA-cmake_dynamic_libs.patch |  167 --
 openCOLLADA-svn863-cmake.patch       |   23 +
 openCOLLADA-svn863-libs.patch        |  130 ++
 openCOLLADA.spec                     |   87 +
 sources                              |    4 +
 7 files changed, 3688 insertions(+), 167 deletions(-)
---
diff --cc .gitignore
index dba62f4,1a5adef..80e2141

--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,5 @@@
  /openCOLLADA-svn838.tar.xz
++<<<<<<< HEAD
++=======
+ /openCOLLADA-svn863.tar.xz
++>>>>>>> master
diff --cc openCOLLADA.spec
index 9d1c783,ca00fce..078a99e
--- a/openCOLLADA.spec
+++ b/openCOLLADA.spec
@@@ -1,24 -1,26 +1,46 @@@
  # These are needed to fake the library version.
++<<<<<<< HEAD
 +%define AGE 838
 +
 +Name:           openCOLLADA
 +Version:        0
 +Release:        5.svn%{AGE}%{?dist}
++=======
+ %define AGE 863
+ 
+ Name:           openCOLLADA
+ Version:        0
+ Release:        8.svn%{AGE}%{?dist}
++>>>>>>> master
  License:        MIT
  Summary:        Collada 3D import and export libraries
  Url:            http://www.opencollada.org/
  Group:          System Environment/Libraries
  
  # The source for this package was pulled from upstream's svn.  Use the
++<<<<<<< HEAD
 +# following commands to generate the tarball (revision 836 shown):
 +#   svn -r 836 export http://opencollada.googlecode.com/svn/trunk/ openCOLLADA-svn836
 +#   tar acf openCOLLADA-svn836.tar.xz openCOLLADA-svn836
 +Source0:        %{name}-svn%{AGE}.tar.xz
 +Source1:        CHANGES.txt
 +Patch0:         openCOLLADA-cmake_dynamic_libs.patch
 +
 +BuildRequires:  dos2unix
 +BuildRequires:  fftw3-devel
++=======
+ # following commands to generate the tarball (revision 863 shown):
+ #   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
+ 
+ Patch0:         openCOLLADA-svn863-cmake.patch
+ Patch1:         openCOLLADA-svn863-libs.patch
+ 
+ BuildRequires:  dos2unix
+ BuildRequires:  fftw-devel
++>>>>>>> master
  BuildRequires:  pcre-devel
  BuildRequires:  cmake
  BuildRequires:  zlib-devel
@@@ -38,10 -40,6 +60,13 @@@ COLLADAValidator          XML validato
                            the COLLADASaxFrameworkLoader
  GeneratedSaxParser        Library used to load xml files in the way
                            used by COLLADASaxFrameworkLoader
++<<<<<<< HEAD
 +Authors
 +-------
 +sebastian at opencollada.org
 +robert at opencollada.org
++=======
++>>>>>>> master
  
  %package        doc
  Summary:        Developer documentation for %{name}
@@@ -54,7 -52,7 +79,11 @@@ This package provides documentation fo
  %package        devel
  Summary:        Include files for openCOLLADA development
  Group:          Development/Libraries
++<<<<<<< HEAD
 +Requires:       %{name} = %{version}-%{release}
++=======
+ Requires:       %{name}%{?_isa} = %{version}-%{release}
++>>>>>>> master
  
  %description devel
  This package provides the include files necessary to build and
@@@ -63,14 -61,16 +92,26 @@@ develop with the %{name} export and imp
  %package        utils
  Summary:        XML validator for COLLADA files
  Group:          Development/Tools
++<<<<<<< HEAD
 +Requires:       %{name} = %{version}-%{release}
++=======
+ Requires:       %{name}%{?_isa} = %{version}-%{release}
++>>>>>>> master
  
  %description utils
  XML validator for COLLADA files, based on the COLLADASaxFrameworkLoader.
  
++<<<<<<< HEAD
 +%prep
 +%setup -q -n %{name}-svn%{AGE}
 +%patch0 -p1
++=======
+ 
+ %prep
+ %setup -q -n %{name}-svn%{AGE}
+ %patch0 -p1 -b .cmake
+ %patch1 -p1 -b .libs
++>>>>>>> master
  
  # Remove unused bundled libraries
  rm -rf Externals/{Cg,expat,lib3ds,LibXML,MayaDataModel,pcre,zlib,zziplib}
@@@ -91,9 -91,10 +132,16 @@@ dos2unix -f -k READM
  find htdocs/ -name *.php -exec dos2unix -f {} \;
  find htdocs/ -name *.css -exec dos2unix -f {} \;
  
++<<<<<<< HEAD
 +# copy CHANGES.txt
 +install -p -m 0644 %{S:1} ./
 +
++=======
+ # Install Changelog
+ install -p -m 0644 %{S:1} ./
+ 
+ 
++>>>>>>> master
  %build
  # Build openCOLLADA shared libraries.
  mkdir -p Build
@@@ -103,48 -104,44 +151,87 @@@ pushd Buil
  make
  popd
  
++<<<<<<< HEAD
 +%install
 +# Manual install linking and renaming of libraries is necessary.
 +mkdir -p %{buildroot}%{_libdir}
 +install -p -m 0755 lib/*.so.svn%{AGE} %{buildroot}%{_libdir}/
 +cp -a lib/*.so %{buildroot}%{_libdir}/
 +
 +# Manual install of include files is necessary.
 +mkdir -p %{buildroot}%{_prefix}
 +for dir in  COLLADABaseUtils COLLADAFramework COLLADASaxFrameworkLoader \
 +             COLLADAStreamWriter COLLADAValidator Externals/MathMLSolver \
 +             GeneratedSaxParser; do
 +    mkdir -p %{buildroot}%{_includedir}/$(basename $dir)
 +    cp -a $dir/include/* %{buildroot}%{_includedir}/$(basename $dir)
 +done
 +
 +# Manually install binaries
 +mkdir -p %{buildroot}%{_bindir}/
 +install -p -m 0755 bin/* %{buildroot}%{_bindir}/
 +
++=======
+ 
+ %install
+ pushd Build
+ make DESTDIR=%{buildroot} install
+ 
+ # Manually install binary
+ mkdir -p %{buildroot}%{_bindir}/
+ install -p -m 0755 bin/* %{buildroot}%{_bindir}/
+ 
+ 
++>>>>>>> master
  %post -p /sbin/ldconfig
  
  %postun -p /sbin/ldconfig
  
++<<<<<<< HEAD
 +%files
 +%defattr(-,root,root,-)
 +%doc README LICENSE README.COLLADAStreamWriter COLLADAStreamWriter/AUTHORS CHANGES.txt
 +%{_libdir}/lib*.so.svn%{AGE}
 +
 +%files doc
 +%defattr(-,root,root,-)
 +%doc htdocs/
 +
 +%files devel
 +%defattr(-,root,root,-)
++=======
+ 
+ %files
+ %doc README LICENSE README.COLLADAStreamWriter COLLADAStreamWriter/AUTHORS Changelog
+ %{_libdir}/lib*.so.svn%{AGE}
+ 
+ %files doc
+ %doc htdocs/
+ 
+ %files devel
++>>>>>>> master
  %{_libdir}/*.so
  %{_includedir}/*
  
  %files utils
++<<<<<<< HEAD
 +%defattr(-,root,root,-)
 +%{_bindir}/*
 +
 +%changelog
++=======
+ %{_bindir}/*
+ 
+ 
+ %changelog
+ * Wed Oct 26 2011 Richard Shaw <hobbes1069 at gmail.com> - 0-8
+ - Update to svn revision 863.
+ - Fix typo in spec file.
+ 
+ * Thu Oct 06 2011 Richard Shaw <hobbes1069 at gmail.com> - 0-6
+ - Update to svn revision 847.
+ 
++>>>>>>> master
  * Wed Apr 27 2011 Richard Shaw <hobbes1069 at gmail.com> - 0-5
  - Created -utils and -doc sub-packages.
  - Corrected installation location of -devel header files.
diff --cc sources
index bb4ed65,66cb249..05aff99
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +558c651ed25e9b3be3b47ebb5992391e  openCOLLADA-svn838.tar.xz
++=======
+ 546d4fc997d947955b7394a98ca57f54  openCOLLADA-svn863.tar.xz
++>>>>>>> master
