From 61b25992df5e515b7283cd66cee8cc62c062e933 Mon Sep 17 00:00:00 2001
From: Till Maas <opensource@till.name>
Date: Sep 28 2012 16:46:16 +0000
Subject: Build with rpm_opt_flags (fix RH #861445)


- cleanup %prep

---

diff --git a/apvlv-0.1.4-Source-rpm-opt-flags.patch b/apvlv-0.1.4-Source-rpm-opt-flags.patch
new file mode 100644
index 0000000..5d424b9
--- /dev/null
+++ b/apvlv-0.1.4-Source-rpm-opt-flags.patch
@@ -0,0 +1,19 @@
+diff -up apvlv-0.1.4-Source/src/CMakeLists.txt.rpm_opt_flags apvlv-0.1.4-Source/src/CMakeLists.txt
+--- apvlv-0.1.4-Source/src/CMakeLists.txt.rpm_opt_flags	2012-09-28 18:41:33.927984825 +0200
++++ apvlv-0.1.4-Source/src/CMakeLists.txt	2012-09-28 18:42:30.587589556 +0200
+@@ -1,15 +1,3 @@
+-IF (WIN32)
+-        ADD_DEFINITIONS (-D_CRT_SECURE_NO_WARNINGS)
+-ELSE (WIN32)
+-        SET (CMAKE_CXX_FLAGS "-Wall -fno-strict-aliasing")
+-
+-        OPTION (APVLV_ENABLE_DEBUG "If build binary with debug infomations." OFF)
+-        IF (APVLV_ENABLE_DEBUG)
+-                SET (CMAKE_CXX_FLAGS "-D_DEBUG -g ${CMAKE_CXX_FLAGS}")
+-        ELSE (APVLV_ENABLE_DEBUG)
+-                SET (CMAKE_CXX_FLAGS "-O2 ${CMAKE_CXX_FLAGS}")
+-        ENDIF (APVLV_ENABLE_DEBUG)
+-ENDIF (WIN32)
+ 
+ FIND_PACKAGE (PkgConfig)
+ 
diff --git a/apvlv.spec b/apvlv.spec
index c269138..5f86e88 100644
--- a/apvlv.spec
+++ b/apvlv.spec
@@ -1,6 +1,6 @@
 Name:           apvlv
 Version:        0.1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        PDF viewer which behaves like Vim
 
 Group:          Applications/Publishing
@@ -8,6 +8,8 @@ License:        GPLv2+
 URL:            http://naihe2010.github.com/apvlv/
 Source0:        https://github.com/downloads/naihe2010/apvlv/apvlv-%{version}-Source.tar.gz
 Source1:        %{name}.desktop
+# 2012-09-28: Not upstreamable, because it removes support for windows
+Patch0:         apvlv-0.1.4-Source-rpm-opt-flags.patch
 
 BuildRequires:  cmake
 BuildRequires:  gtk2-devel poppler-glib-devel
@@ -21,7 +23,7 @@ It can also browse through directories of such documents.
 
 %prep
 %setup -q -n apvlv-%{version}-Source/
-chmod -x src/*
+%patch0 -p1 -b .rpm-opt-flags
 
 %build
 # umd.h is missing to enable the following:
@@ -49,6 +51,10 @@ desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
 %config(noreplace)%{_sysconfdir}/apvlvrc
 
 %changelog
+* Fri Sep 28 2012 Till Maas <opensource@till.name> - 0.1.4-2
+- Build with rpm_opt_flags (fix RH #861445)
+- cleanup %%prep
+
 * Wed Sep 26 2012 Till Maas <opensource@till.name> - 0.1.4-1
 - Update to new release