orion pushed to cube (master). "Update to 4.3.1"

notifications at fedoraproject.org notifications at fedoraproject.org
Tue May 5 15:45:11 UTC 2015


>From 4b6dc6da5bed4373726e781777d20ab64cedd677 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion at cora.nwra.com>
Date: Tue, 3 Mar 2015 10:15:56 -0700
Subject: Update to 4.3.1


diff --git a/.gitignore b/.gitignore
index abc7444..6893d40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /cube-4.2.2.tar.gz
 /cube-4.2.3.tar.gz
+/cube-4.3.tar.gz
+/cube-4.3.1.tar.gz
diff --git a/cube-link.patch b/cube-link.patch
deleted file mode 100644
index eb6418e..0000000
--- a/cube-link.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up cube-4.2/build-backend/Makefile.in.link cube-4.2/build-backend/Makefile.in
---- cube-4.2/build-backend/Makefile.in.link	2013-08-02 05:20:37.000000000 -0600
-+++ cube-4.2/build-backend/Makefile.in	2013-09-27 11:36:20.372970338 -0600
-@@ -927,7 +927,7 @@ am__installdirs = "$(DESTDIR)$(libdir)"
- 	"$(DESTDIR)$(jardir)" "$(DESTDIR)$(cube_headersdir)" \
- 	"$(DESTDIR)$(cubew_headersdir)" "$(DESTDIR)$(includedir)"
- LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
--libcube4_la_LIBADD =
-+libcube4_la_LIBADD = -lz
- am__libcube4_la_SOURCES_DIST =  \
- 	$(SRC_ROOT)src/cube/src/service/CubeServices.cpp \
- 	$(SRC_ROOT)src/cube/src/Cube.cpp \
diff --git a/cube.spec b/cube.spec
index a3bd7ae..8d26dab 100644
--- a/cube.spec
+++ b/cube.spec
@@ -1,13 +1,11 @@
 Name:           cube
-Version:        4.2.3
-Release:        5%{?dist}
+Version:        4.3.1
+Release:        1%{?dist}
 Summary:        CUBE Uniform Behavioral Encoding generic presentation component
 
 License:        BSD
 URL:            http://www.scalasca.org/software/cube-4.x/download.html
-Source0:        http://apps.fz-juelich.de/scalasca/releases/cube/4.2/dist/cube-%{version}.tar.gz
-# Lnk libcube4 against -lz
-Patch0:         cube-link.patch
+Source0:        http://apps.fz-juelich.de/scalasca/releases/cube/4.3/dist/cube-%{version}.tar.gz
 
 BuildRequires:  dbus-devel
 BuildRequires:  qt4-devel
@@ -59,7 +57,6 @@ The %{name}-java package contains a CUBE reader written in Java.
 
 %prep
 %setup -q
-%patch0 -p1 -b .link
 sed -i -e 's/"//g' CUBE.desktop.in
 
 
@@ -140,7 +137,7 @@ performance data for parallel programs</summary>
 EOF
 
 # Strip rpath
-chrpath -d -k %{buildroot}%{_bindir}/* || :
+chrpath -d -k %{buildroot}%{_bindir}/* %{buildroot}%{_libdir}/{,cube-plugins/}*.so  || :
 
 # Install desktop file
 desktop-file-install --dir=%{buildroot}%{_datadir}/applications CUBE.desktop
@@ -183,8 +180,8 @@ fi
 %{_bindir}/cube_canonize
 %{_bindir}/cube_clean
 %{_bindir}/cube_cmp
+%{_bindir}/cube_commoncalltree
 %{_bindir}/cube_cut
-%{_bindir}/cube_derive
 %{_bindir}/cube_diff
 %{_bindir}/cube_dump
 %{_bindir}/cube_exclusify
@@ -204,10 +201,12 @@ fi
 %{_bindir}/cube_test
 %{_bindir}/cube_topoassist
 %{_bindir}/tau2cube
-%{_libdir}/lib%{name}*.so.4*
+%{_libdir}/lib%{name}*.so.7*
+%{_libdir}/libgraphwidgetcommon-plugin.so.7*
+%{_libdir}/cube-plugins/
 %{_datadir}/appdata/*.appdata.xml
 %{_datadir}/applications/CUBE.desktop
-%{_datadir}/icons/Cube.xpm
+%{_datadir}/icons/*
 %{_datadir}/%{name}/
 
 %files devel
@@ -215,7 +214,10 @@ fi
 %{_bindir}/cube-config-backend
 %{_bindir}/cube-config-frontend
 %{_includedir}/%{name}*/
+%{_includedir}/cubegui/
 %{_libdir}/lib%{name}*.so
+%{_libdir}/libgraphwidgetcommon-plugin.so
+%{_defaultdocdir}/cube/example/
 
 %files doc
 %{_defaultdocdir}/cube/
@@ -225,6 +227,9 @@ fi
 
 
 %changelog
+* Tue May 5 2015 Orion Poplawski <orion at cora.nwra.com> - 4.3.1-1
+- Update to 4.3.1
+
 * Sat May 02 2015 Kalev Lember <kalevlember at gmail.com> - 4.2.3-5
 - Rebuilt for GCC 5 C++11 ABI change
 
diff --git a/sources b/sources
index fd5a518..d798538 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8f95b9531f5a8f8134f279c2767c9b20  cube-4.2.3.tar.gz
+c440bdf007db3104396c420a27480086  cube-4.3.1.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/cube.git/commit/?h=master&id=4b6dc6da5bed4373726e781777d20ab64cedd677


More information about the scm-commits mailing list