[packages/libical] - updated to 3.0.6 - updated cmake-python,gtkdocdir patches

qboosh qboosh at pld-linux.org
Tue Oct 15 05:48:10 CEST 2019


commit 602196c314ab97b46156eb7d521577949c678c57
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Oct 15 05:51:34 2019 +0200

    - updated to 3.0.6
    - updated cmake-python,gtkdocdir patches

 libical-cmake-python.patch | 10 ++++++----
 libical-gtkdocdir.patch    | 18 +++++++++---------
 libical.spec               |  8 ++++----
 3 files changed, 19 insertions(+), 17 deletions(-)
---
diff --git a/libical.spec b/libical.spec
index 566c9ea..c490ea5 100644
--- a/libical.spec
+++ b/libical.spec
@@ -6,13 +6,13 @@
 Summary:	libical library
 Summary(pl.UTF-8):	Biblioteka libical
 Name:		libical
-Version:	3.0.4
+Version:	3.0.6
 Release:	1
 License:	MPL v1.0 or LGPL v2.1
 Group:		Libraries
 #Source0Download: https://github.com/libical/libical/releases
 Source0:	https://github.com/libical/libical/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	bc4258748323dee3083e21280fa85f96
+# Source0-md5:	b4c441549fdaf054611c6244a5900bdc
 Patch0:		%{name}-cmake-python.patch
 Patch1:		%{name}-python.patch
 Patch2:		%{name}-gtkdocdir.patch
@@ -240,7 +240,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libicalss.so.3
 %attr(755,root,root) %{_libdir}/libicalvcal.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libicalvcal.so.3
-%{_libdir}/girepository-1.0/libical-%{version}.typelib
+%{_libdir}/girepository-1.0/ICal-3.0.typelib
 
 %files devel
 %defattr(644,root,root,755)
@@ -300,7 +300,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libical/vcaltmp.h
 %{_includedir}/libical/vcc.h
 %{_includedir}/libical/vobject.h
-%{_datadir}/gir-1.0/libical-%{version}.gir
+%{_datadir}/gir-1.0/ICal-3.0.gir
 %{_libdir}/cmake/LibIcal
 
 %files static
diff --git a/libical-cmake-python.patch b/libical-cmake-python.patch
index 5d277ad..e0ea044 100644
--- a/libical-cmake-python.patch
+++ b/libical-cmake-python.patch
@@ -34,11 +34,13 @@
  
  ########### install files ###############
  
---- libical-3.0.4/src/CMakeLists.txt.orig	2019-04-13 14:09:53.981161047 +0200
-+++ libical-3.0.4/src/CMakeLists.txt	2019-04-13 14:11:48.303875041 +0200
-@@ -4,4 +4,5 @@
+--- libical-3.0.6/src/CMakeLists.txt.orig	2019-10-15 05:33:01.947974507 +0200
++++ libical-3.0.6/src/CMakeLists.txt	2019-10-15 05:33:59.810994370 +0200
+@@ -4,6 +4,7 @@
  if(ICAL_GLIB)
    add_subdirectory(libical-glib)
  endif()
 +add_subdirectory(python)
- add_subdirectory(test)
+ if(LIBICAL_BUILD_TESTING)
+   add_subdirectory(test)
+ endif()
diff --git a/libical-gtkdocdir.patch b/libical-gtkdocdir.patch
index a289988..b802bac 100644
--- a/libical-gtkdocdir.patch
+++ b/libical-gtkdocdir.patch
@@ -1,11 +1,11 @@
---- libical-3.0.4/doc/reference/libical-glib/CMakeLists.txt.orig	2018-08-14 21:49:51.000000000 +0200
-+++ libical-3.0.4/doc/reference/libical-glib/CMakeLists.txt	2019-04-16 13:31:44.445790476 +0200
-@@ -28,7 +28,7 @@
-   @ONLY
- )
+--- libical-3.0.6/cmake/modules/GtkDoc.cmake.orig	2019-09-14 18:43:47.000000000 +0200
++++ libical-3.0.6/cmake/modules/GtkDoc.cmake	2019-10-15 05:35:40.930446559 +0200
+@@ -49,7 +49,7 @@
+     ${CMAKE_CURRENT_BINARY_DIR}/${_module}-docs.sgml
+     @ONLY)
  
--set(OUTPUT_DOCDIR ${SHARE_INSTALL_DIR}/gtk-doc/html/libical-glib)
-+set(OUTPUT_DOCDIR ${SHARE_INSTALL_DIR}/doc/gtk-doc/html/libical-glib)
+-  set(OUTPUT_DOCDIR ${SHARE_INSTALL_DIR}/gtk-doc/html/${_module})
++  set(OUTPUT_DOCDIR ${SHARE_INSTALL_DIR}/doc/gtk-doc/html/${_module})
  
- add_custom_command(OUTPUT xml/libical-glib-doc.bottom
-   COMMAND ${GTKDOC_SCAN} --module=libical-glib
+   set(_filedeps)
+   set(_srcdirs)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libical.git/commitdiff/602196c314ab97b46156eb7d521577949c678c57



More information about the pld-cvs-commit mailing list