melmorabity pushed to cppmyth (f22). "Update to 1.1.10"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 8 13:52:13 UTC 2015
>From 055cbf4f243fce1d683aa91fa13f4a2b92fbc004 Mon Sep 17 00:00:00 2001
From: Mohamed El Morabity <melmorabity at fedoraproject.org>
Date: Wed, 8 Apr 2015 15:33:25 +0200
Subject: Update to 1.1.10
diff --git a/.gitignore b/.gitignore
index 9103286..eb1d3d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/cppmyth-1.1.0.2.tar.gz
+/cppmyth-1.1.10.tar.gz
diff --git a/cppmyth-1.1.0-flags.patch b/cppmyth-1.1.0-flags.patch
deleted file mode 100644
index ae1fa7b..0000000
--- a/cppmyth-1.1.0-flags.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -up ./cppmyth/CMakeLists.txt.orig ./cppmyth/CMakeLists.txt
---- ./cppmyth/CMakeLists.txt.orig 2014-12-10 19:20:51.000000000 +0100
-+++ ./cppmyth/CMakeLists.txt 2014-12-24 21:30:47.899428637 +0100
-@@ -29,8 +29,8 @@ if (MSVC)
- endif ()
-
- if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-- set (CMAKE_C_FLAGS "-fPIC")
-- set (CMAKE_CXX_FLAGS "-fPIC")
-+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
-+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
- endif ()
-
- ###############################################################################
-diff -up ./demo/CMakeLists.txt.orig ./demo/CMakeLists.txt
---- ./demo/CMakeLists.txt.orig 2014-12-10 19:20:51.000000000 +0100
-+++ ./demo/CMakeLists.txt 2014-12-24 21:31:16.025634705 +0100
-@@ -22,8 +22,8 @@ if (MSVC)
- endif (MSVC)
-
- if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-- set(CMAKE_C_FLAGS "-fPIC")
-- set(CMAKE_CXX_FLAGS "-fPIC")
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
- endif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-
- ###############################################################################
-diff -up ./test/CMakeLists.txt.orig ./test/CMakeLists.txt
---- ./test/CMakeLists.txt.orig 2014-12-10 19:20:51.000000000 +0100
-+++ ./test/CMakeLists.txt 2014-12-24 21:31:04.106971140 +0100
-@@ -22,8 +22,8 @@ if (MSVC)
- endif (MSVC)
-
- if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-- set(CMAKE_C_FLAGS "-fPIC")
-- set(CMAKE_CXX_FLAGS "-fPIC")
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
- endif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-
- ###############################################################################
diff --git a/cppmyth-1.1.0-use_external_jansson.patch b/cppmyth-1.1.0-use_external_jansson.patch
deleted file mode 100644
index e2c0175..0000000
--- a/cppmyth-1.1.0-use_external_jansson.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -up ./CMakeLists.txt.orig ./CMakeLists.txt
---- ./CMakeLists.txt.orig 2014-12-10 19:20:51.000000000 +0100
-+++ ./CMakeLists.txt 2014-12-24 21:14:34.988887636 +0100
-@@ -1,10 +1,16 @@
- cmake_minimum_required (VERSION 2.6 FATAL_ERROR)
- cmake_policy (VERSION 2.6)
-+
-+find_package(PkgConfig REQUIRED)
-+pkg_search_module(JANSSON REQUIRED jansson)
-+include_directories(${JANSSON_INCLUDE_DIRS})
-+add_definitions(${JANSSON_CFLAGS_OTHER})
-+link_directories(${JANSSON_LIBRARY_DIRS})
-+
- #
- # Every module has a CMakeLists.txt in it's root. As we saw, those files
- # provide the necessary directions to build each module.
- set (MODULES
-- ${CMAKE_SOURCE_DIR}/jansson
- ${CMAKE_SOURCE_DIR}/cppmyth
- ${CMAKE_SOURCE_DIR}/test
- ${CMAKE_SOURCE_DIR}/demo)
-diff -up ./cppmyth/CMakeLists.txt.orig ./cppmyth/CMakeLists.txt
---- ./cppmyth/CMakeLists.txt.orig 2014-12-10 19:20:51.000000000 +0100
-+++ ./cppmyth/CMakeLists.txt 2014-12-24 21:15:56.459591761 +0100
-@@ -147,7 +147,7 @@ set (CPPMYTH_SOURCES
- # add targets
- if (BUILD_SHARED_LIBS)
- add_library (cppmyth SHARED ${CPPMYTH_SOURCES})
-- target_link_libraries (cppmyth pthread jansson)
-+ target_link_libraries (cppmyth pthread ${JANSSON_LIBRARIES})
- set_target_properties (cppmyth PROPERTIES
- VERSION "${CPPMYTH_LIB_VERSION}"
- SOVERSION "${CPPMYTH_LIB_SOVERSION}")
-diff -up ./demo/CMakeLists.txt.orig ./demo/CMakeLists.txt
---- ./demo/CMakeLists.txt.orig 2014-12-10 19:20:51.000000000 +0100
-+++ ./demo/CMakeLists.txt 2014-12-24 21:16:52.850000000 +0100
-@@ -42,15 +42,15 @@ set(livetvdemo_SOURCES
- ###############################################################################
- # add targets
- add_executable(livetvdemo ${livetvdemo_SOURCES})
--add_dependencies(livetvdemo cppmyth jansson)
-+add_dependencies(livetvdemo cppmyth)
- if(MSVC)
- target_link_libraries(livetvdemo cppmyth jansson ws2_32.lib)
- else(MSVC)
- find_library(LIBRT rt)
- if(LIBRT)
-- target_link_libraries(livetvdemo cppmyth jansson rt pthread)
-+ target_link_libraries(livetvdemo cppmyth ${JANSSON_LIBRARIES} rt pthread)
- else(LIBRT)
-- target_link_libraries(livetvdemo cppmyth jansson pthread)
-+ target_link_libraries(livetvdemo cppmyth ${JANSSON_LIBRARIES} pthread)
- endif(LIBRT)
- endif(MSVC)
-
-diff -up ./test/CMakeLists.txt.orig ./test/CMakeLists.txt
---- ./test/CMakeLists.txt.orig 2014-12-10 19:20:51.000000000 +0100
-+++ ./test/CMakeLists.txt 2014-12-24 21:16:31.218610600 +0100
-@@ -42,15 +42,15 @@ set(CPPMYTHTEST_SOURCES
- ###############################################################################
- # add targets
- add_executable(cppmythtest ${CPPMYTHTEST_SOURCES})
--add_dependencies(cppmythtest cppmyth jansson)
-+add_dependencies(cppmythtest cppmyth)
- if(MSVC)
- target_link_libraries(cppmythtest cppmyth jansson ws2_32.lib)
- else(MSVC)
- find_library(LIBRT rt)
- if(LIBRT)
-- target_link_libraries(cppmythtest cppmyth jansson rt pthread)
-+ target_link_libraries(cppmythtest cppmyth ${JANSSON_LIBRARIES} rt pthread)
- else(LIBRT)
-- target_link_libraries(cppmythtest cppmyth jansson pthread)
-+ target_link_libraries(cppmythtest cppmyth ${JANSSON_LIBRARIES} pthread)
- endif(LIBRT)
- endif(MSVC)
-
diff --git a/cppmyth.spec b/cppmyth.spec
index 55993d6..240b17b 100644
--- a/cppmyth.spec
+++ b/cppmyth.spec
@@ -1,19 +1,14 @@
Name: cppmyth
-Version: 1.1.0.2
-Release: 2%{?dist}
+Version: 1.1.10
+Release: 1%{?dist}
Summary: Client interface for the MythTV backend
Group: System Environment/Libraries
License: GPLv2+
URL: https://github.com/janbar/cppmyth/
Source0: https://github.com/janbar/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
-# Use system jansson library
-Patch0: %{name}-1.1.0-use_external_jansson.patch
-# Fix compilation flags
-Patch1: %{name}-1.1.0-flags.patch
BuildRequires: cmake
-BuildRequires: pkgconfig(jansson)
%description
This project is intended to create a easy client interface for the MythTV
@@ -33,11 +28,6 @@ applications that use %{name}.
%prep
%setup -q
-%patch0 -p0 -b .use_external_jansson
-%patch1 -p0 -b .flags
-
-# Delete bundled library jansson
-rm -r jansson/
%build
@@ -67,6 +57,9 @@ make %{?_smp_mflags}
%changelog
+* Wed Apr 08 2015 Mohamed El Morabity <melmorabity at fedoraproject.org> - 1.1.10-1
+- Update to 1.1.10
+
* Tue Dec 30 2014 Mohamed El Morabity <melmorabity at fedoraproject.org> - 1.1.0.2-2
- Fix License tag
- Fix misspelling in Description
diff --git a/sources b/sources
index 0187939..a7975d5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a511645b07fb029052ae99e3b9a7a6d cppmyth-1.1.0.2.tar.gz
+cd831e433aacee64489146eb49d047f7 cppmyth-1.1.10.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/cppmyth.git/commit/?h=f22&id=055cbf4f243fce1d683aa91fa13f4a2b92fbc004
More information about the scm-commits
mailing list