[shiny: 6/7] update to latest master

Igor Gnatenko ignatenkobrain at fedoraproject.org
Fri May 16 18:26:16 UTC 2014


commit 799bcec4a7873de259a8578a4cf9efbabd04c4c2
Author: Igor Gnatenko <i.gnatenko.brain at gmail.com>
Date:   Thu May 15 18:25:57 2014 +0400

    update to latest master
    
    Signed-off-by: Igor Gnatenko <i.gnatenko.brain at gmail.com>

 0001-build-shared-libraries.patch |   35 -----------------------------------
 shiny.spec                        |   28 ++++++----------------------
 2 files changed, 6 insertions(+), 57 deletions(-)
---
diff --git a/shiny.spec b/shiny.spec
index cad91d7..4c18c40 100644
--- a/shiny.spec
+++ b/shiny.spec
@@ -1,20 +1,14 @@
-%global commit f41178f82765828ac09f9f1da5bd28038c94311d
+%global commit dc533642089d3b564021c48d25702648f1910b2d
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
-# Manually set soversion. Each new release needs to be tested for ABI breakage
-# and the soversion incremented if breakage occurs.
-%global soversion 0
-
 Name:           shiny
-Version:        0.2
-Release:        3.git%{shortcommit}%{?dist}
+Version:        0.3
+Release:        1.git%{shortcommit}%{?dist}
 Summary:        Shader and material management library for OGRE
 
 License:        MIT
 URL:            https://github.com/scrawl/shiny/
 Source0:        https://github.com/scrawl/shiny/archive/%{commit}/%{name}-%{version}-%{shortcommit}.zip
-Patch0:         0001-build-shared-libraries.patch
-Patch1:         shiny-cmake_fixes.patch
 
 BuildRequires:  cmake
 BuildRequires:  boost-devel
@@ -34,14 +28,8 @@ Development files for shader and material management library for OGRE.
 
 %prep
 %setup -q -n %{name}-%{commit}
-%patch0 -p1 -b .shared
-%patch1 -p1 -b .cmake
 mkdir build
 
-# Make soversion substitution in cmake config.
-sed -i "s/@SOVERSION@/%{soversion}/" CMakeLists.txt
-
-
 %build
 LDFLAGS="$LDFLAGS -Wl,--as-needed"; export LDFLAGS
 pushd build
@@ -52,12 +40,6 @@ popd
 %install
 pushd build
   %make_install
-  mkdir -p %{buildroot}%{_includedir}/shiny/
-  for i in $(find ../ -type f -name *\.hpp -or -name *\.h); do
-    dir=$(echo $(dirname $i) | cut -c4-)
-    install -D -p -m 0755 -d %{buildroot}%{_includedir}/shiny/$dir/
-    install -D -p -m 0644 $i %{buildroot}%{_includedir}/shiny/$dir/
-  done
 popd
 
 %post -p /sbin/ldconfig
@@ -73,8 +55,10 @@ popd
 %{_includedir}/shiny/
 %{_libdir}/lib%{name}.so
 
-
 %changelog
+* Thu May 15 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> - 0.3-1.gitdc53364
+- Update to latest master
+
 * Wed May 14 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> - 0.2-3.gitf41178f
 - don't ignore old LDFLAGS
 


More information about the scm-commits mailing list