[collada-dom] Change Source URL following https://fedoraproject.org/wiki/Packaging:SourceURL?rd=Packaging/SourceUR
Till Hofmann
thofmann at fedoraproject.org
Tue Mar 11 15:39:35 UTC 2014
commit 84649c4729856df67bdc2508dc2942463c1b7a20
Author: Till Hofmann <hofmann at kbsg.rwth-aachen.de>
Date: Tue Mar 11 16:40:37 2014 +0100
Change Source URL following https://fedoraproject.org/wiki/Packaging:SourceURL?rd=Packaging/SourceURL#Github
.gitignore | 1 +
collada-dom.spec | 31 +++++++++++++++++--------------
sources | 2 +-
3 files changed, 19 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 978671f..29e4fc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/x86_64
/collada_dom-2.3.1-src.tgz
/collada-dom-2.4.0-libsrc.tgz
+/collada-dom-bd08446badc55890f59217064207c552a0634f31.tar.gz
diff --git a/collada-dom.spec b/collada-dom.spec
index ee5cf10..e8e41a7 100644
--- a/collada-dom.spec
+++ b/collada-dom.spec
@@ -1,13 +1,15 @@
Name: collada-dom
-Version: 2.4.0
+Version: 2.4.2
Release: 2%{?dist}
Summary: COLLADA Document Object Model Library
Group: System Environment/Libraries
License: MIT
URL: http://www.collada.org
-Source0: http://sourceforge.net/projects/collada-dom/files/Collada%20DOM/Collada%20DOM%202.4/collada-dom-2.4.0-libsrc.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%global commit bd08446badc55890f59217064207c552a0634f31
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+Source0: https://github.com/rdiankov/collada-dom/archive/%{commit}/collada-dom-%{commit}.tar.gz
BuildRequires: cmake, gcc-c++, dos2unix
BuildRequires: minizip-devel, zlib-devel, boost-devel, libxml2-devel, pcre-devel
@@ -31,12 +33,11 @@ developing applications that use %{name}.
%prep
-%setup -q -n %{name}-%{version}-libsrc
+%setup -q -n %{name}-%{commit}
rm -rf dom/external-libs
-dos2unix Readme.txt
-dos2unix dom/license.txt
-dos2unix License_Folder/license_e.txt
-dos2unix dom/readme.txt
+dos2unix README.rst
+dos2unix licenses/dom_license_e.txt
+dos2unix licenses/license_e.txt
%build
@@ -46,19 +47,15 @@ cd build
-DCMAKE_SKIP_RPATH:BOOL=ON \
..
-make
+make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
cd build
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
mv $RPM_BUILD_ROOT%{_libdir}/cmake/collada_dom-* $RPM_BUILD_ROOT%{_libdir}/cmake/collada_dom
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%post -p /sbin/ldconfig
@@ -67,7 +64,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc Readme.txt dom/license.txt License_Folder/license_e.txt dom/readme.txt
+%doc README.rst licenses/dom_license_e.txt licenses/license_e.txt
%{_libdir}/*.so.*
%files devel
@@ -79,6 +76,12 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Mar 11 2014 Till Hofmann <hofmann at kbsg.rwth-aachen.de> - 2.4.2-2
+- Change Source URL following https://fedoraproject.org/wiki/Packaging:SourceURL?rd=Packaging/SourceURL#Github
+
+* Tue Mar 11 2014 Till Hofmann <hofmann at kbsg.rwth-aachen.de> - 2.4.2-1
+- Update to 2.4.2 release
+
* Sun Jan 19 2014 Tim Niemueller <tim at niemueller.de> - 2.4.0-2
- Fix hardcoded path
diff --git a/sources b/sources
index 392c2ce..32c3779 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e48284a9de6ad9911c2832ed812bbc2d collada-dom-2.4.0-libsrc.tgz
+1bf9ace02372ffe5d4af068c43defb74 collada-dom-bd08446badc55890f59217064207c552a0634f31.tar.gz
More information about the scm-commits
mailing list