Attachment 843207 Details for Bug 1047199 – Build with $RPM_OPT_FLAGS.

[patch] Build with $RPM_OPT_FLAGS.

Build-with-RPMOPTFLAGS.patch (text/plain), 5.27 KB, created by Ville Skyttä on 2013-12-29 22:36:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2013-12-29 22:36:04 UTC

Size: 5.27 KB

patch

obsolete

>From cca886d9f4d06784005c160bd7d37b107e3ad197 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Mon, 30 Dec 2013 00:35:17 +0200
>Subject: [PATCH] Build with $RPM_OPT_FLAGS.
>
>- Add Requires neon as noted by Manuel Faux
>- Add backported patch created by Klass Freitag backported by Manuel Faux
>- Add BuildRequires neon-devel
>- Update to version 1.4.2
>- Update to version 1.4.1
>- Add qtwebkit-devel dependency
>- Update to version 1.4.0
>- Update URL
>- Update to testing version 1.4.0beta2
>- Update to version 1.3.0
>- Update to testing version 1.3.0beta1
>- Update to upstream version 1.2.5
>- Update to uptream version 1.2.4
>- remove plasma client files as is not officially merged uptream
>- Update to 1.2.3 uptream version
>- plasma client files fix
>- add new Plasma client package
>- moved libowncloudsync.so* to common as it is now used by mirall and owncloud-client
>- re-added mirall .desktop launcher
>- Update to 1.2.1
>- Update to 1.2.0
>- update to 1.2.0beta2
>- Update to 1.2.0beta1
>- Update to 1.1.4
>- Update to 1.1.3
>- Update to 1.1.1
>- fix mirall-common dependency problem
>- Version Upgrade to 1.1.0
>- Removed the need to look for occsync now mirall looks for ocsync the new name of owncloud-csync
>- removed unesesary cmake flags
>- added icon scriplets for owncloud-client icons
>- moved %doc to mirall-common
>- Added cmake  dcSYNC_INCLUDE_PATH:PATH=_includedir}/occsync and dc SYNC_LIBRARY:PATH=_libdir}/liboccsync.so to have mirall look for occsync instead of csync
>- Removed uneeded dep
>- Changelog corrections and clean up
>- Divided mirall into mirall-common, mirall and owncloud-client
>- Added dcMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed
>- moved exclude.lst back to /etc/, the apps look for it there
>- fixed icons descriptions
>- added refresh icon cache
>- updated csync dep to owncloud-csync
>- Update to 1.0.5
>- drop defattr
>- remove not-needed dependencies
>- changelog cleanup
>- moved exclude.lst to /etc/mirall/
>- fixed source01 and source 02 (icons)
>- added mirall icon and smp flags plus code cleanup
>- Initial try
>
>https://bugzilla.redhat.com/show_bug.cgi?id=1047199
>---
> 1c9a4784c7bce40b7ef37c60b708bf90bae7eb20.patch | 33 ++++++++++++++++++++++++++
> mirall.spec                                    |  6 ++++-
> 2 files changed, 38 insertions(+), 1 deletion(-)
> create mode 100644 1c9a4784c7bce40b7ef37c60b708bf90bae7eb20.patch
>
>diff --git a/1c9a4784c7bce40b7ef37c60b708bf90bae7eb20.patch b/1c9a4784c7bce40b7ef37c60b708bf90bae7eb20.patch
>new file mode 100644
>index 0000000..12539d2
>--- /dev/null
>+++ b/1c9a4784c7bce40b7ef37c60b708bf90bae7eb20.patch
>@@ -0,0 +1,33 @@
>+From 1c9a4784c7bce40b7ef37c60b708bf90bae7eb20 Mon Sep 17 00:00:00 2001
>+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>+Date: Mon, 30 Dec 2013 00:30:48 +0200
>+Subject: [PATCH] Don't discard user CXXFLAGS, append to them instead.
>+
>+---
>+ cmake/modules/Warnings.cmake | 6 +++---
>+ 1 file changed, 3 insertions(+), 3 deletions(-)
>+
>+diff --git a/cmake/modules/Warnings.cmake b/cmake/modules/Warnings.cmake
>+index 88adec1..0e1b173 100644
>+--- a/cmake/modules/Warnings.cmake
>++++ b/cmake/modules/Warnings.cmake
>+@@ -2,13 +2,13 @@ if(CMAKE_COMPILER_IS_GNUCXX)
>+     execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
>+                     OUTPUT_VARIABLE GCC_VERSION)
>+     if(GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)
>+-        set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wpedantic -Wno-long-long")
>++        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -Wno-long-long")
>+     else(GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)
>+-        set(CMAKE_CXX_FLAGS "-Wall -Wextra -pedantic -Wno-long-long")
>++        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wno-long-long")
>+     endif(GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)
>+ endif(CMAKE_COMPILER_IS_GNUCXX)
>+ if(CMAKE_CXX_COMPILER MATCHES "clang")
>+-    set(CMAKE_CXX_FLAGS "-Wall -Wextra -pedantic -Wno-long-long")
>++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wno-long-long")
>+ endif(CMAKE_CXX_COMPILER MATCHES "clang")
>+ # TODO: handle msvc compilers warnings?
>+ 
>+-- 
>+1.8.5.1
>+
>diff --git a/mirall.spec b/mirall.spec
>index eb5653b..f258db3 100644
>--- a/mirall.spec
>+++ b/mirall.spec
>@@ -1,12 +1,13 @@
> Name:           mirall
> Version:        1.4.2
>-Release:        3%{?dist}
>+Release:        4%{?dist}
> License:        GPLv2+
> Summary:        The ownCloud Client
> Url:            http://owncloud.org/sync-clients/
> Source0:        http://download.owncloud.com/download/mirall-%{version}.tar.bz2
> 
> Patch0:         14081a197b3f048bc18a68d408f13ecce61638b9.patch
>+Patch1:         https://github.com/scop/mirall/commit/1c9a4784c7bce40b7ef37c60b708bf90bae7eb20.patch
> 
> BuildRequires:  cmake
> BuildRequires:  owncloud-csync-devel >= 0.90.4
>@@ -47,6 +48,7 @@ The ownCloud desktop client, lets you sync directly to your ownCloud server.
> %setup -q %{name}-%{version}
> 
> %patch0 -p1
>+%patch1 -p1
> 
> %build
> mkdir build
>@@ -93,6 +95,8 @@ fi
> %config  %{_sysconfdir}/ownCloud/sync-exclude.lst
> 
> %changelog
>+* Sun Dec 29 2013 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 1.4.2-4
>+- Build with $RPM_OPT_FLAGS.
> * Thu Nov 14 2013 <jmarrero@fedoraproject.org> 1.4.2-3
> - Add Requires neon as noted by Manuel Faux
> - Add backported patch created by Klass Freitag backported by Manuel Faux 
>-- 
>1.8.3.1

Actions: View | Diff

Attachments on bug 1047199: 843207