[rocs] drop upstreamed patches

Radek Novacek rnovacek at fedoraproject.org
Thu Dec 22 10:11:54 UTC 2011


commit ce8febb4f9898f24724ef485c1fb65024fcffe53
Author: Radek Novacek <rnovacek at redhat.com>
Date:   Thu Dec 22 11:11:48 2011 +0100

    drop upstreamed patches

 .gitignore                 |    1 +
 rocs-4.7.80-export.patch   |   60 --------------------------------------------
 rocs-4.7.80-optflags.patch |   27 -------------------
 rocs.spec                  |   13 +++------
 sources                    |    2 +-
 5 files changed, 7 insertions(+), 96 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 924b932..55c0f8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /rocs-4.7.3.tar.bz2
 /rocs-4.7.80.tar.bz2
 /rocs-4.7.90.tar.bz2
+/rocs-4.7.95.tar.bz2
diff --git a/rocs.spec b/rocs.spec
index d474490..3b25990 100644
--- a/rocs.spec
+++ b/rocs.spec
@@ -1,7 +1,7 @@
 
 Name:    rocs 
 Summary: Graph Theory IDE 
-Version: 4.7.90
+Version: 4.7.95
 Release: 1%{?dist}
 
 License: GPLv3+
@@ -9,11 +9,6 @@ URL:     https://projects.kde.org/projects/kde/kdeedu/%{name}
 Source0: http://download.kde.org/unstable/%{version}/src/%{name}-%{version}.tar.bz2
 
 # upstream patches
-# CMakeLists.txt: Don't trash CMAKE_CXX_FLAGS (#759593)
-Patch100: rocs-4.7.80-optflags.patch
-# ValueModifier and Topology must be exported because they are used elsewhere.
-# Fixes the compilation with the above patch.
-Patch101: rocs-4.7.80-export.patch
 
 BuildRequires: boost-devel
 BuildRequires: desktop-file-utils
@@ -46,8 +41,6 @@ Requires: kdelibs4-devel
 
 %prep
 %setup -q
-%patch100 -p1 -b .optflags
-%patch101 -p1 -b .export
 
 
 %build
@@ -104,6 +97,10 @@ fi
 
 
 %changelog
+* Thu Dec 22 2011 Radek Novacek <rnovacek at redhat.com> - 4.7.95-1
+- 4.7.95
+- drop upstreamed patches
+
 * Sun Dec 04 2011 Rex Dieter <rdieter at fedoraproject.org> - 4.7.90-1
 - 4.7.90
 
diff --git a/sources b/sources
index 7a603fd..15ae580 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9070f8654fadce4c336f1bdcdd4efff8  rocs-4.7.90.tar.bz2
+168da28c130537b2f1be4b574f78882a  rocs-4.7.95.tar.bz2


More information about the scm-commits mailing list