[packages/libical] - new URLs, updated to 1.0.1 (note: new sonames) - removed outdated as_needed,ac patches - added cma
qboosh
qboosh at pld-linux.org
Sat May 23 12:26:57 CEST 2015
commit 67c18d221678b2ac1bcf7d1e28552184b3cc5690
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat May 23 12:28:51 2015 +0200
- new URLs, updated to 1.0.1 (note: new sonames)
- removed outdated as_needed,ac patches
- added cmake-cxx,cmake-python patches to restore bindings lost on migration to cmake
libical-ac.patch | 12 ---------
libical-as_needed.patch | 28 ---------------------
libical-cmake-cxx.patch | 63 ++++++++++++++++++++++++++++++++++++++++++++++
libical-cmake-python.patch | 46 +++++++++++++++++++++++++++++++++
libical.spec | 63 ++++++++++++++++++++++------------------------
5 files changed, 139 insertions(+), 73 deletions(-)
---
diff --git a/libical.spec b/libical.spec
index 3396240..53c1b9d 100644
--- a/libical.spec
+++ b/libical.spec
@@ -6,20 +6,19 @@
Summary: libical library
Summary(pl.UTF-8): Biblioteka libical
Name: libical
-Version: 1.0
-Release: 2
-License: MPL 1.1 or LGPL v2.1
+Version: 1.0.1
+Release: 1
+License: MPL v1.0 or LGPL v2.1
Group: Libraries
-Source0: http://downloads.sourceforge.net/freeassociation/%{name}-%{version}.tar.gz
-# Source0-md5: 4438c31d00ec434f02867a267a92f8a1
-Patch0: %{name}-as_needed.patch
-Patch1: %{name}-cxx.patch
-Patch2: %{name}-ac.patch
-URL: http://freeassociation.sourceforge.net/
-BuildRequires: autoconf >= 2.52
-BuildRequires: automake
+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
+URL: http://libical.github.io/libical/
+BuildRequires: cmake >= 2.8.9
+BuildRequires: gobject-introspection-devel >= 0.6.7
BuildRequires: libstdc++-devel
-BuildRequires: libtool >= 2:1.5
BuildRequires: perl-base
%if %{with python}
BuildRequires: python-devel >= 1:2.3
@@ -118,27 +117,29 @@ Wiązanie Pythona do biblioteki libical.
%setup -q
%patch0 -p1
%patch1 -p1
+%if %{with python}
%patch2 -p1
+%endif
%build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
- --enable-cxx \
- %{?with_python:--enable-python}
+install -d build
+cd build
+%cmake .. \
+ -DGOBJECT_INSTROSPECTION=ON \
+ -DPYTHON_EXECUTABLE=%{__python} \
+ -DPY_SITEDIR=%{py_sitedir}
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
+%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
%if %{with python}
-%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/_LibicalWrap.{la,a}
+# not installed by cmake build system
+install -d $RPM_BUILD_ROOT%{py_sitescriptdir}/libical
+cp -p src/python/*.py build/src/python/*.py $RPM_BUILD_ROOT%{py_sitescriptdir}/libical
%py_postclean
%endif
@@ -153,13 +154,13 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
+%doc AUTHORS COPYING ReadMe.txt ReleaseNotes.txt THANKS TODO
%attr(755,root,root) %{_libdir}/libical.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libical.so.0
+%attr(755,root,root) %ghost %{_libdir}/libical.so.1
%attr(755,root,root) %{_libdir}/libicalss.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libicalss.so.0
+%attr(755,root,root) %ghost %{_libdir}/libicalss.so.1
%attr(755,root,root) %{_libdir}/libicalvcal.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libicalvcal.so.0
+%attr(755,root,root) %ghost %{_libdir}/libicalvcal.so.1
%files devel
%defattr(644,root,root,755)
@@ -167,9 +168,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libical.so
%attr(755,root,root) %{_libdir}/libicalss.so
%attr(755,root,root) %{_libdir}/libicalvcal.so
-%{_libdir}/libical.la
-%{_libdir}/libicalss.la
-%{_libdir}/libicalvcal.la
%{_pkgconfigdir}/libical.pc
%{_includedir}/ical.h
%dir %{_includedir}/libical
@@ -221,6 +219,7 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/libical/vcaltmp.h
%{_includedir}/libical/vcc.h
%{_includedir}/libical/vobject.h
+%{_libdir}/cmake/LibIcal
%files static
%defattr(644,root,root,755)
@@ -231,16 +230,14 @@ 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.0
+%attr(755,root,root) %ghost %{_libdir}/libical_cxx.so.1
%attr(755,root,root) %{_libdir}/libicalss_cxx.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libicalss_cxx.so.0
+%attr(755,root,root) %ghost %{_libdir}/libicalss_cxx.so.1
%files c++-devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libical_cxx.so
%attr(755,root,root) %{_libdir}/libicalss_cxx.so
-%{_libdir}/libical_cxx.la
-%{_libdir}/libicalss_cxx.la
%{_includedir}/libical/icalparameter_cxx.h
%{_includedir}/libical/icalproperty_cxx.h
%{_includedir}/libical/icalvalue_cxx.h
diff --git a/libical-ac.patch b/libical-ac.patch
deleted file mode 100644
index 63fc124..0000000
--- a/libical-ac.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN libical-1.0.org/configure.in libical-1.0/configure.in
---- libical-1.0.org/configure.in 2013-05-04 23:25:08.000000000 +0200
-+++ libical-1.0/configure.in 2013-05-28 07:08:46.340909345 +0200
-@@ -5,7 +5,7 @@
- AC_CANONICAL_SYSTEM
- AM_INIT_AUTOMAKE
-
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
-
- dnl Initialize maintainer mode
- AM_MAINTAINER_MODE
diff --git a/libical-as_needed.patch b/libical-as_needed.patch
deleted file mode 100644
index 24c79c5..0000000
--- a/libical-as_needed.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urN libical-0.43/src/libical/Makefile.am libical-0.43.new/src/libical/Makefile.am
---- libical-0.43/src/libical/Makefile.am 2009-01-08 17:50:22.000000000 +0100
-+++ libical-0.43.new/src/libical/Makefile.am 2009-03-07 13:26:57.000000000 +0100
-@@ -119,6 +119,8 @@
- icalvalue_cxx.h \
- icalvalue_cxx.cpp \
- icptrholder.h
-+
-+libical_cxx_la_LIBADD = $(PTHREAD_LIBS)
- endif
-
- libical_includedir = $(includedir)/libical
-diff -urN libical-0.43/src/libicalss/Makefile.am libical-0.43.new/src/libicalss/Makefile.am
---- libical-0.43/src/libicalss/Makefile.am 2009-01-08 17:50:22.000000000 +0100
-+++ libical-0.43.new/src/libicalss/Makefile.am 2009-03-07 14:55:23.000000000 +0100
-@@ -115,10 +115,11 @@
-
- if WITH_CXX_BINDINGS
- libicalss_cxx_la_SOURCES = \
-- $(libicalss_evolution_la_SOURCES) \
-+ $(libicalss_la_SOURCES) \
- icalspanlist_cxx.h \
- icalspanlist_cxx.cpp
-
-+libicalss_cxx_la_LIBADD = $(top_builddir)/src/libical/libical_cxx.la
- endif
-
- icalss.h: $(COMBINEDHEADERS)
diff --git a/libical-cmake-cxx.patch b/libical-cmake-cxx.patch
new file mode 100644
index 0000000..e1acfef
--- /dev/null
+++ b/libical-cmake-cxx.patch
@@ -0,0 +1,63 @@
+--- 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-cmake-python.patch b/libical-cmake-python.patch
new file mode 100644
index 0000000..60c3b8f
--- /dev/null
+++ b/libical-cmake-python.patch
@@ -0,0 +1,46 @@
+--- libical-1.0.1/src/python/CMakeLists.txt.orig 2014-10-09 17:07:05.000000000 +0200
++++ libical-1.0.1/src/python/CMakeLists.txt 2015-05-22 23:09:19.135319563 +0200
+@@ -6,19 +6,28 @@
+
+ ########### next target ###############
+
++find_package(PythonInterp REQUIRED)
++find_package(PythonLibs REQUIRED)
++include_directories(${PYTHON_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR})
++add_custom_command(
++ OUTPUT
++ ${CMAKE_BINARY_DIR}/src/python/LibicalWrap.c
++ COMMAND
++ swig -python -Wall -I${CMAKE_SOURCE_DIR}/src -I${CMAKE_BINARY_DIR}/src -o ${CMAKE_BINARY_DIR}/src/python/LibicalWrap.c ${CMAKE_SOURCE_DIR}/src/python/LibicalWrap.i
++ DEPENDS ${CMAKE_SOURCE_DIR}/src/python/LibicalWrap.i
++)
+ set(LibicalWrap_LIB_SRCS
+- LibicalWrap.c
++ ${CMAKE_BINARY_DIR}/src/python/LibicalWrap.c
+ )
+
+ add_library(LibicalWrap ${LIBRARY_TYPE} ${LibicalWrap_LIB_SRCS})
+
+ target_link_libraries(LibicalWrap)
+
+ set_target_properties(LibicalWrap PROPERTIES
+- VERSION ${LIBICAL_LIB_VERSION_STRING}
+- SOVERSION ${LIBICAL_LIB_MAJOR_VERSION}
+-)
+-install(TARGETS LibicalWrap DESTINATION lib)
++ OUTPUT_NAME "_LibicalWrap" PREFIX "")
++set(PY_SITEDIR lib${LIB_SUFFIX}/python CACHE STRING "Python module dir")
++install(TARGETS LibicalWrap DESTINATION ${PY_SITEDIR})
+
+ ########### install files ###############
+
+--- libical-1.0.1/src/CMakeLists.txt.orig 2015-05-22 23:09:54.765318068 +0200
++++ libical-1.0.1/src/CMakeLists.txt 2015-05-22 23:09:58.838651230 +0200
+@@ -1,6 +1,7 @@
+ add_subdirectory(libical)
+ add_subdirectory(libicalss)
+ add_subdirectory(libicalvcal)
++add_subdirectory(python)
+ add_subdirectory(test)
+
+ if(MSVC)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libical.git/commitdiff/67c18d221678b2ac1bcf7d1e28552184b3cc5690
More information about the pld-cvs-commit
mailing list