[openCOLLADA/f14: 6/6] Update to svn revision 863. Fix typo in spec file.

Mon Nov 7 15:28:36 UTC 2011

commit 2a1f7a12af5556aa94a84dc22c87c6a3dd812463
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Mon Nov 7 09:28:24 2011 -0600

    Update to svn revision 863.
    Fix typo in spec file.

 .gitignore       |    3 -
 CHANGES.txt      |  179 ------------------------------------------------------
 openCOLLADA.spec |   90 ---------------------------
 sources          |    4 -
 4 files changed, 0 insertions(+), 276 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 80e2141..1a5adef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,2 @@
 /openCOLLADA-svn838.tar.xz
-<<<<<<< HEAD
-=======
 /openCOLLADA-svn863.tar.xz
->>>>>>> master
diff --git a/openCOLLADA.spec b/openCOLLADA.spec
index 078a99e..ca00fce 100644
--- a/openCOLLADA.spec
+++ b/openCOLLADA.spec
@@ -1,34 +1,15 @@
 # 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
@@ -40,7 +21,6 @@ Patch1:         openCOLLADA-svn863-libs.patch
 
 BuildRequires:  dos2unix
 BuildRequires:  fftw-devel
->>>>>>> master
 BuildRequires:  pcre-devel
 BuildRequires:  cmake
 BuildRequires:  zlib-devel
@@ -60,13 +40,6 @@ COLLADAValidator          XML validator for COLLADA files, based on
                           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}
@@ -79,11 +52,7 @@ This package provides documentation for %{name}.
 %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
@@ -92,26 +61,16 @@ develop with the %{name} export and import libraries.
 %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}
@@ -132,16 +91,10 @@ dos2unix -f -k README
 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
@@ -151,27 +104,6 @@ pushd Build
 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
@@ -182,24 +114,10 @@ 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
@@ -209,17 +127,10 @@ install -p -m 0755 bin/* %{buildroot}%{_bindir}/
 %doc htdocs/
 
 %files devel
->>>>>>> master
 %{_libdir}/*.so
 %{_includedir}/*
 
 %files utils
-<<<<<<< HEAD
-%defattr(-,root,root,-)
-%{_bindir}/*
-
-%changelog
-=======
 %{_bindir}/*
 
 
@@ -231,7 +142,6 @@ install -p -m 0755 bin/* %{buildroot}%{_bindir}/
 * 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 --git a/sources b/sources
index 05aff99..66cb249 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-558c651ed25e9b3be3b47ebb5992391e  openCOLLADA-svn838.tar.xz
-=======
 546d4fc997d947955b7394a98ca57f54  openCOLLADA-svn863.tar.xz
->>>>>>> master
