[packages/libical] Update to 2.0.0 (note: new soname)

megabajt megabajt at pld-linux.org
Thu Sep 28 20:53:13 CEST 2017 

commit 1eeb85cfa9fb913736cce85e0860765243664eed
Author: Marcin Banasiak <marcin.banasiak at gmail.com>
Date:   Thu Sep 28 20:49:40 2017 +0200

    Update to 2.0.0 (note: new soname)
    
    - removed outdated -cmake-cxx and -cxx patches
    - added -python.patch to fix build of python bindings and
    -funcnamefix.patch to fix a typo in header file

 libical-cmake-cxx.patch   | 63 -----------------------------------------------
 libical-cxx.patch         | 23 -----------------
 libical-funcnamefix.patch | 11 +++++++++
 libical-python.patch      | 11 +++++++++
 libical.spec              | 36 ++++++++++++++-------------
 5 files changed, 41 insertions(+), 103 deletions(-)
---
diff --git a/libical.spec b/libical.spec
index 4775512..67436cb 100644
--- a/libical.spec
+++ b/libical.spec
@@ -6,15 +6,15 @@
 Summary:	libical library
 Summary(pl.UTF-8):	Biblioteka libical
 Name:		libical
-Version:	1.0.1
-Release:	2
+Version:	2.0.0
+Release:	1
 License:	MPL v1.0 or LGPL v2.1
 Group:		Libraries
 Source0:	https://github.com/libical/libical/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	af91db06b22559f863869c5a382ad08a
-Patch0:		%{name}-cxx.patch
-Patch1:		%{name}-cmake-cxx.patch
-Patch2:		%{name}-cmake-python.patch
+# Source0-md5:	6bf8e5f5a3ba88baf390d0134e05d76e
+Patch0:		%{name}-cmake-python.patch
+Patch1:		%{name}-python.patch
+Patch2:		%{name}-funcnamefix.patch
 URL:		http://libical.github.io/libical/
 BuildRequires:	cmake >= 2.8.9
 BuildRequires:	gobject-introspection-devel >= 0.6.7
@@ -115,11 +115,11 @@ Wiązanie Pythona do biblioteki libical.
 
 %prep
 %setup -q
+%if %{with python}
 %patch0 -p1
 %patch1 -p1
-%if %{with python}
-%patch2 -p1
 %endif
+%patch2 -p1
 
 %build
 install -d build
@@ -156,11 +156,11 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ReadMe.txt ReleaseNotes.txt THANKS TODO
 %attr(755,root,root) %{_libdir}/libical.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libical.so.1
+%attr(755,root,root) %ghost %{_libdir}/libical.so.2
 %attr(755,root,root) %{_libdir}/libicalss.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libicalss.so.1
+%attr(755,root,root) %ghost %{_libdir}/libicalss.so.2
 %attr(755,root,root) %{_libdir}/libicalvcal.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libicalvcal.so.1
+%attr(755,root,root) %ghost %{_libdir}/libicalvcal.so.2
 
 %files devel
 %defattr(644,root,root,755)
@@ -169,7 +169,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libicalss.so
 %attr(755,root,root) %{_libdir}/libicalvcal.so
 %{_pkgconfigdir}/libical.pc
-%{_includedir}/ical.h
 %dir %{_includedir}/libical
 # libical
 %{_includedir}/libical/ical.h
@@ -196,6 +195,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libical/icaltypes.h
 %{_includedir}/libical/icaltz-util.h
 %{_includedir}/libical/icalvalue.h
+%{_includedir}/libical/libical_ical_export.h
 %{_includedir}/libical/pvl.h
 %{_includedir}/libical/sspm.h
 # libicalss
@@ -213,9 +213,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libical/icalspanlist.h
 %{_includedir}/libical/icalss.h
 %{_includedir}/libical/icalssyacc.h
+%{_includedir}/libical/libical_icalss_export.h
 # libicalvcal
 %{_includedir}/libical/icalvcal.h
-%{_includedir}/libical/port.h
+%{_includedir}/libical/libical_vcal_export.h
 %{_includedir}/libical/vcaltmp.h
 %{_includedir}/libical/vcc.h
 %{_includedir}/libical/vobject.h
@@ -230,9 +231,9 @@ rm -rf $RPM_BUILD_ROOT
 %files c++
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libical_cxx.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libical_cxx.so.1
+%attr(755,root,root) %ghost %{_libdir}/libical_cxx.so.2
 %attr(755,root,root) %{_libdir}/libicalss_cxx.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libicalss_cxx.so.1
+%attr(755,root,root) %ghost %{_libdir}/libicalss_cxx.so.2
 
 %files c++-devel
 %defattr(644,root,root,755)
@@ -241,8 +242,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libical/icalparameter_cxx.h
 %{_includedir}/libical/icalproperty_cxx.h
 %{_includedir}/libical/icalvalue_cxx.h
-%{_includedir}/libical/icptrholder.h
-%{_includedir}/libical/vcomponent.h
+%{_includedir}/libical/icalspanlist_cxx.h
+%{_includedir}/libical/icptrholder_cxx.h
+%{_includedir}/libical/vcomponent_cxx.h
 
 %files c++-static
 %defattr(644,root,root,755)
diff --git a/libical-cmake-cxx.patch b/libical-cmake-cxx.patch
deleted file mode 100644
index e1acfef..0000000
--- a/libical-cmake-cxx.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- libical-1.0.1/src/libical/CMakeLists.txt.orig	2014-10-09 17:07:05.000000000 +0200
-+++ libical-1.0.1/src/libical/CMakeLists.txt	2015-05-22 20:52:44.858996775 +0200
-@@ -336,3 +336,36 @@
-   DESTINATION
-   ${INCLUDE_INSTALL_DIR}/libical
- )
-+
-+set(icalcxx_LIB_SRCS ical
-+  icalparameter_cxx.cpp
-+  icalparameter_cxx.h
-+  icalproperty_cxx.cpp
-+  icalproperty_cxx.h
-+  icalvalue_cxx.cpp
-+  icalvalue_cxx.h
-+  icptrholder.h
-+  vcomponent.cpp
-+  vcomponent.h
-+)
-+add_library(ical_cxx ${LIBRARY_TYPE} ${icalcxx_LIB_SRCS})
-+target_link_libraries(ical_cxx ical)
-+add_dependencies(ical_cxx ical)
-+set_target_properties(ical_cxx PROPERTIES
-+  VERSION ${LIBICAL_LIB_VERSION_STRING}
-+  SOVERSION ${LIBICAL_LIB_MAJOR_VERSION}
-+)
-+install(TARGETS ical_cxx DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
-+if(NOT SHARED_ONLY)
-+  add_library(ical_cxx-static STATIC ${icalcxx_LIB_SRCS})
-+  set_target_properties(ical_cxx-static PROPERTIES OUTPUT_NAME "ical_cxx")
-+  install(TARGETS ical_cxx-static DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
-+endif()
-+install(FILES
-+  icalparameter_cxx.h
-+  icalproperty_cxx.h
-+  icalvalue_cxx.h
-+  icptrholder.h
-+  vcomponent.h
-+  DESTINATION ${INCLUDE_INSTALL_DIR}/libical
-+)
---- libical-1.0.1/src/libicalss/CMakeLists.txt.orig	2014-10-09 17:07:05.000000000 +0200
-+++ libical-1.0.1/src/libicalss/CMakeLists.txt	2015-05-22 20:59:42.102312598 +0200
-@@ -132,3 +132,21 @@
-   DESTINATION
-   ${INCLUDE_INSTALL_DIR}/libical
- )
-+
-+set(icalsscxx_LIB_SRCS
-+  icalbdbset_cxx.h
-+  icalspanlist_cxx.cpp
-+  icalspanlist_cxx.h
-+)
-+add_library(icalss_cxx ${LIBRARY_TYPE} ${icalsscxx_LIB_SRCS})
-+target_link_libraries(icalss_cxx icalss ical_cxx)
-+set_target_properties(icalss_cxx PROPERTIES
-+  VERSION ${LIBICAL_LIB_VERSION_STRING}
-+  SOVERSION ${LIBICAL_LIB_MAJOR_VERSION}
-+)
-+install(TARGETS icalss_cxx DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
-+if(NOT SHARED_ONLY)
-+  add_library(icalss_cxx-static STATIC ${icalss_LIB_SRCS})
-+  set_target_properties(icalss_cxx-static PROPERTIES OUTPUT_NAME "icalss_cxx")
-+  install(TARGETS icalss_cxx-static DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
-+endif()
diff --git a/libical-cxx.patch b/libical-cxx.patch
deleted file mode 100644
index e2d340f..0000000
--- a/libical-cxx.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- libical-0.46/src/libicalss/icalspanlist.h.orig	2010-08-30 22:05:08.000000000 +0200
-+++ libical-0.46/src/libicalss/icalspanlist.h	2010-09-05 09:42:08.695135135 +0200
-@@ -26,6 +26,9 @@
- #define ICALSPANLIST_H
- 
- #include <libical/ical.h>
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- #include "icalset.h"
- 
- /** @file icalspanlist.h
-@@ -71,6 +74,10 @@
- /** @brief Construct an icalspanlist from a VFREEBUSY component */
- icalspanlist *icalspanlist_from_vfreebusy(icalcomponent* c);
- 
-+#ifdef __cplusplus
-+}
-+#endif
-+
- #endif
- 				    
- 
diff --git a/libical-funcnamefix.patch b/libical-funcnamefix.patch
new file mode 100644
index 0000000..951ea50
--- /dev/null
+++ b/libical-funcnamefix.patch
@@ -0,0 +1,11 @@
+diff -up libical-2.0.0/src/libical/icallangbind.h.funcnamefix libical-2.0.0/src/libical/icallangbind.h
+--- libical-2.0.0/src/libical/icallangbind.h.funcnamefix	2016-01-18 17:38:21.642590895 +0100
++++ libical-2.0.0/src/libical/icallangbind.h	2016-01-18 17:38:32.424590438 +0100
+@@ -63,6 +63,6 @@ LIBICAL_ICAL_EXPORT int icallangbind_str
+ 
+ LIBICAL_ICAL_EXPORT const char *icallangbind_quote_as_ical(const char *str);
+ 
+-LIBICAL_ICAL_EXPORT char *callangbind_quote_as_ical_r(const char *str);
++LIBICAL_ICAL_EXPORT char *icallangbind_quote_as_ical_r(const char *str);
+ 
+ #endif
diff --git a/libical-python.patch b/libical-python.patch
new file mode 100644
index 0000000..bca3b83
--- /dev/null
+++ b/libical-python.patch
@@ -0,0 +1,11 @@
+--- libical-2.0.0/src/python/LibicalWrap.i.python	2017-09-26 21:25:34.525605103 +0200
++++ libical-2.0.0/src/python/LibicalWrap.i	2017-09-26 21:26:33.048928356 +0200
+@@ -24,6 +24,8 @@
+ 
+ %module LibicalWrap
+ 
++#define LIBICAL_ICAL_EXPORT
++#define LIBICAL_ICALSS_EXPORT
+ 
+ %{
+ #include "libical/ical.h"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libical.git/commitdiff/1eeb85cfa9fb913736cce85e0860765243664eed

More information about the pld-cvs-commit mailing list