[meego-commits] 6430: Changes to Trunk:Testing/libical
Fathi Boudra
fathi.boudra at nokia.com
Wed Aug 11 17:20:31 UTC 2010
Hi,
I have made the following changes to libical in project Trunk:Testing. Please review and accept ASAP.
Thank You,
Fathi Boudra
[This message was auto-generated]
---
Request #6430:
submit: home:boudra:branches:Trunk:Testing/libical(r7)(cleanup) -> Trunk:Testing/libical
Message:
* Fri Jul 23 2010 Fathi Boudra <fathi.boudra at nokia.com> - 0.44
- Update to libical 0.44
- Sanitize the spec file
- Switch to cmake build system
- Add 01_fix_headers.patch
- Remove deprecated patches:
implicit-pointer-conversion.patch
makefile.patch
pkgconfig.patch
- Improve description and summary
- Fix license tag
State: new 2010-08-11T05:11:56 boudra
Comment: None
changes files:
--------------
--- libical.changes
+++ libical.changes
@@ -0,0 +1,12 @@
+* Fri Jul 23 2010 Fathi Boudra <fathi.boudra at nokia.com> - 0.44
+- Update to libical 0.44
+- Sanitize the spec file
+- Switch to cmake build system
+- Add 01_fix_headers.patch
+- Remove deprecated patches:
+ implicit-pointer-conversion.patch
+ makefile.patch
+ pkgconfig.patch
+- Improve description and summary
+- Fix license tag
+
old:
----
libical-0.43-implicit-pointer-conversion.patch
libical-0.43-makefile.patch
libical-0.43-pkgconfig.patch
libical-0.43.tar.gz
new:
----
01_fix_headers.patch
libical-0.44.tar.gz
spec files:
-----------
--- libical.spec
+++ libical.spec
@@ -1,94 +1,85 @@
#
-# Do not Edit! Generated by:
-# spectacle version 0.13
+# Do NOT Edit the Auto-generated Part!
+# Generated by: spectacle version 0.18
#
# >> macros
# << macros
Name: libical
-Summary: Reference implementation of the iCalendar data type and serialization format
-Version: 0.43
-Release: 3
+Summary: iCalendar library implementation in C (runtime)
+Version: 0.44
+Release: 1
Group: System/Libraries
-License: LGPLv2 or MPLv1.1
-URL: http://freeassociation.sourceforge.net/
+License: LGPLv2.1 or MPLv1.0
Source0: http://downloads.sourceforge.net/freeassociation/%{name}-%{version}.tar.gz
Source100: libical.yaml
-Patch0: %{name}-%{version}-implicit-pointer-conversion.patch
-Patch1: %{name}-%{version}-makefile.patch
-Patch2: %{name}-%{version}-pkgconfig.patch
+Patch0: 01_fix_headers.patch
Requires: tzdata
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
-BuildRequires: bison
-BuildRequires: byacc
-BuildRequires: flex
+BuildRequires: cmake
+BuildRequires: tzdata
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
-Reference implementation of the iCalendar data type and serialization format
-used in dozens of calendaring and scheduling products.
+libical is an open source implementation of the IETF's iCalendar calendaring
+and scheduling protocols (RFC 2445, 2446, and 2447). It parses iCal components
+and provides a C API for manipulating the component properties, parameters,
+and subcomponents.
-Implementacja formatu iCalendar, używana w wielu kalendarzach i
-planerach/planistach.
+This package contains the files necessary for running applications that use
+the libical library.
%package devel
-Summary: Development files for libical
+Summary: iCalendar library implementation in C (development)
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
-The libical-devel package contains libraries and header files for developing
-applications that use libical.
+libical is an open source implementation of the IETF's iCalendar calendaring
+and scheduling protocols (RFC 2445, 2446, and 2447). It parses iCal components
+and provides a C API for manipulating the component properties, parameters,
+and subcomponents.
-libical-devel zawiera biblioteki i pliki niezbędne do tworzenia aplikacji
-korzystających z libical.
+This package contains the files necessary for developing applications that use
+the libical library.
%prep
%setup -q -n %{name}-%{version}
-# %{name}-%{version}-implicit-pointer-conversion.patch
+# 01_fix_headers.patch
%patch0 -p1
-# %{name}-%{version}-makefile.patch
-%patch1 -p1
-# %{name}-%{version}-pkgconfig.patch
-%patch2 -p1
# >> setup
# << setup
%build
# >> build pre
+mkdir %{_target_platform}
+cd %{_target_platform} && cmake .. \
+-DCMAKE_INSTALL_PREFIX="%{_prefix}" \
+-DCMAKE_VERBOSE_MAKEFILE=ON
+make %{?_smp_mflags}
# << build pre
-%configure --disable-static \
- --enable-reentrant \
- --with-backtrace
-# Call make instruction with smp support
-make %{?jobs:-j%jobs}
# >> build post
-%check
-# make check
-# Fails on x86_64 and ppc64.
# << build post
%install
rm -rf %{buildroot}
# >> install pre
# << install pre
-%make_install
# >> install post
+make -C %{_target_platform} install DESTDIR=%{buildroot}
+# Remove unpackaged files - static libraries
+rm -f %{buildroot}%{_libdir}/libical*.a
# << install post
-%clean
-rm -rf %{buildroot}
-
%post -p /sbin/ldconfig
@@ -97,14 +88,15 @@
+
+
%files
%defattr(-,root,root,-)
# >> files
-%doc COPYING
-%doc LICENSE
+%doc NEWS
%doc README
-%doc THANKS
-%{_libdir}/%{name}.so.*
+%doc TODO
+%{_libdir}/libical.so.*
%{_libdir}/libicalss.so.*
%{_libdir}/libicalvcal.so.*
# << files
@@ -113,22 +105,11 @@
%files devel
%defattr(-,root,root,-)
# >> files devel
-%doc doc/UsingLibical.txt
-%doc ChangeLog
-%doc NEWS
-%doc TODO
%{_includedir}/ical.h
-%{_libdir}/%{name}.so
+%{_includedir}/libical/*.h
+%{_libdir}/libical.so
%{_libdir}/libicalss.so
%{_libdir}/libicalvcal.so
%{_libdir}/pkgconfig/libical.pc
-%dir %{_includedir}/%{name}
-%{_includedir}/%{name}/ical*.h
-%{_includedir}/%{name}/pvl.h
-%{_includedir}/%{name}/sspm.h
-%{_includedir}/%{name}/port.h
-%{_includedir}/%{name}/vcaltmp.h
-%{_includedir}/%{name}/vcc.h
-%{_includedir}/%{name}/vobject.h
# << files devel
other changes:
--------------
++++++ 01_fix_headers.patch (new)
--- 01_fix_headers.patch
+++ 01_fix_headers.patch
+Description: Fix headers includes
+Author: Fathi Boudra <fathi.boudra at nokia.com>
+
+--- a/src/libicalcap/icalcap.h
++++ b/src/libicalcap/icalcap.h
+@@ -1,7 +1,7 @@
+ #ifndef __ICALCAP_H__
+ #define __ICALCAP_H__
+
+-#include <ical.h>
++#include <libical/ical.h>
+
+ /*
+ * Opaque objects
+--- a/src/libicalcap/icalcap_message_impl.h
++++ b/src/libicalcap/icalcap_message_impl.h
+@@ -3,7 +3,7 @@
+
+ #ifdef WITH_RR
+
+-#include <ical.h>
++#include <libical/ical.h>
+ #include <librr/rr.h>
+
+ #define ICALCAP_MESSAGE_CMD 1
+--- a/src/libicalss/icalcalendar.h
++++ b/src/libicalss/icalcalendar.h
+@@ -30,7 +30,7 @@
+ #define ICALCALENDAR_H
+
+ #include <libical/ical.h>
+-#include <icalset.h>
++#include "icalset.h"
+
+ /* icalcalendar
+ * Routines for storing calendar data in a file system. The calendar
+--- a/src/libicalss/icalclassify.h
++++ b/src/libicalss/icalclassify.h
+@@ -28,8 +28,8 @@
+ #define ICALCLASSIFY_H
+
+ #include <libical/ical.h>
+-#include <icalset.h>
+-#include <icalcomponent.h>
++#include "icalset.h"
++#include "icalcomponent.h"
+
+ icalproperty_xlicclass icalclassify(icalcomponent* c,icalcomponent* match,
+ const char* user);
+--- a/src/libicalss/icalcluster.h
++++ b/src/libicalss/icalcluster.h
+@@ -30,7 +30,7 @@
+ #define ICALCLUSTER_H
+
+ #include <libical/ical.h>
+-#include <icalset.h>
++#include "icalset.h"
+
+ typedef struct icalcluster_impl icalcluster;
+
+--- a/src/libicalss/icaldirset.h
++++ b/src/libicalss/icaldirset.h
+@@ -30,9 +30,9 @@
+ #define ICALDIRSET_H
+
+ #include <libical/ical.h>
+-#include <icalset.h>
+-#include <icalcluster.h>
+-#include <icalgauge.h>
++#include "icalset.h"
++#include "icalcluster.h"
++#include "icalgauge.h"
+
+ /* icaldirset Routines for storing, fetching, and searching for ical
+ * objects in a database */
+--- a/src/libicalss/icalfileset.h
++++ b/src/libicalss/icalfileset.h
+@@ -30,9 +30,9 @@
+ #define ICALFILESET_H
+
+ #include <libical/ical.h>
+-#include <icalset.h>
+-#include <icalcluster.h>
+-#include <icalgauge.h>
++#include "icalset.h"
++#include "icalcluster.h"
++#include "icalgauge.h"
+ #include <sys/types.h> /* For open() flags and mode */
+ #include <sys/stat.h> /* For open() flags and mode */
+ #include <fcntl.h> /* For open() flags and mode */
+--- a/src/libicalss/icalgauge.h
++++ b/src/libicalss/icalgauge.h
+@@ -29,7 +29,7 @@
+ #ifndef ICALGAUGE_H
+ #define ICALGAUGE_H
+
+-#include <icalcomponent.h>
++#include "icalcomponent.h"
+
+ /** @file icalgauge.h
+ * @brief Routines implementing a filter for ical components
+--- a/src/libicalss/icalset.h
++++ b/src/libicalss/icalset.h
+@@ -41,7 +41,7 @@
+
+ #include <limits.h> /* For PATH_MAX */
+ #include <libical/ical.h>
+-#include <icalgauge.h>
++#include "icalgauge.h"
+
+ #ifdef PATH_MAX
+ #define ICAL_PATH_MAX PATH_MAX
+--- a/src/libicalss/icalspanlist.h
++++ b/src/libicalss/icalspanlist.h
+@@ -26,7 +26,7 @@
+ #define ICALSPANLIST_H
+
+ #include <libical/ical.h>
+-#include <icalset.h>
++#include "icalset.h"
+
+ /** @file icalspanlist.h
+ * @brief Code that supports collections of free/busy spans of time
++++++ Makefile
--- Makefile
+++ Makefile
@@ -2,5 +2,5 @@
SPECFILE = $(addsuffix .spec, $(PKG_NAME))
YAMLFILE = $(addsuffix .yaml, $(PKG_NAME))
-include /usr/share/packaging-tools/Makefile.common
+include /usr/share/meego-packaging-tools/Makefile.common
++++++ libical-0.43.tar.gz -> libical-0.44.tar.gz
20495 lines of diff (skipped)
++++++ libical.yaml
--- libical.yaml
+++ libical.yaml
@@ -1,41 +1,38 @@
Name: libical
-Summary: Reference implementation of the iCalendar data type and serialization format
-Version: 0.43
-Release: 3
+Summary: iCalendar library implementation in C (runtime)
+Version: 0.44
+Release: 1
Group: System/Libraries
-License: LGPLv2 or MPLv1.1
-URL: http://freeassociation.sourceforge.net/
+License: LGPLv2.1 or MPLv1.0
Sources:
- http://downloads.sourceforge.net/freeassociation/%{name}-%{version}.tar.gz
Patches:
- - "%{name}-%{version}-implicit-pointer-conversion.patch"
- - "%{name}-%{version}-makefile.patch"
- - "%{name}-%{version}-pkgconfig.patch"
+ - 01_fix_headers.patch
Description: |
- Reference implementation of the iCalendar data type and serialization format
- used in dozens of calendaring and scheduling products.
-
- Implementacja formatu iCalendar, używana w wielu kalendarzach i
- planerach/planistach.
+ libical is an open source implementation of the IETF's iCalendar calendaring
+ and scheduling protocols (RFC 2445, 2446, and 2447). It parses iCal components
+ and provides a C API for manipulating the component properties, parameters,
+ and subcomponents.
+
+ This package contains the files necessary for running applications that use
+ the libical library.
Requires:
- tzdata
PkgBR:
- - bison
- - byacc
- - flex
-Configure: configure
-ConfigOptions:
- - --enable-reentrant
- - --with-backtrace
-Builder: make
+ - cmake
+ - tzdata
+Configure: none
+Builder: none
SubPackages:
- Name: devel
- Summary: Development files for libical
+ Summary: iCalendar library implementation in C (development)
Group: Development/Libraries
Description: |
- The libical-devel package contains libraries and header files for developing
- applications that use libical.
-
- libical-devel zawiera biblioteki i pliki niezbędne do tworzenia aplikacji
- korzystających z libical.
+ libical is an open source implementation of the IETF's iCalendar calendaring
+ and scheduling protocols (RFC 2445, 2446, and 2447). It parses iCal components
+ and provides a C API for manipulating the component properties, parameters,
+ and subcomponents.
+
+ This package contains the files necessary for developing applications that use
+ the libical library.
++++++ deleted files:
--- libical-0.43-implicit-pointer-conversion.patch
--- libical-0.43-makefile.patch
--- libical-0.43-pkgconfig.patch
More information about the MeeGo-commits
mailing list