diff --git a/baselibs.conf b/baselibs.conf index da8ab65..2de530b 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ -libical0 +libical1 obsoletes "libical- <= " provides "libical- = " diff --git a/libical-0.48.tar.bz2 b/libical-0.48.tar.bz2 deleted file mode 100644 index 4bd7d7a..0000000 --- a/libical-0.48.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dfbc62a723feb735aa1b812a5431e72f4197d91dca702b6d77917b0e8e942c85 -size 819404 diff --git a/libical-1.0.tar.gz b/libical-1.0.tar.gz new file mode 100644 index 0000000..f348980 --- /dev/null +++ b/libical-1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c39b3448e4927a2de2775d853f52b3aaeb42400970a3db0b01a78987e6ec0b7 +size 1199483 diff --git a/libical.changes b/libical.changes index 96501dd..bbe5d2e 100644 --- a/libical.changes +++ b/libical.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sun Jun 9 09:18:41 UTC 2013 - toddrme2178@gmail.com + +- New 1.x package. + This version uses the cmake build system +- Add devel-static subpackage +- Remove unneeded buildrequires +- Changed license from MPL-1.1 to MPL-1.0. That is the license + listed in the COPYING file and the headers. +- Removed scripts directory from documentation. Putting perl + files in the documentation directory is apparently no longer + allowed. +- Ran spec-cleaner + ------------------------------------------------------------------- Sat Jan 28 18:37:35 UTC 2012 - jengelh@medozas.de diff --git a/libical.spec b/libical.spec index d893847..5b9b420 100644 --- a/libical.spec +++ b/libical.spec @@ -1,7 +1,7 @@ # # spec file for package libical # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,20 +16,19 @@ # - Name: libical -BuildRequires: db-devel -BuildRequires: libtool -BuildRequires: pkg-config -BuildRequires: python-devel -Url: http://sourceforge.net/projects/freeassociation/ -Version: 0.48 +Version: 1.0 Release: 0 +%define sonum 1 Summary: An Implementation of Basic iCAL Protocols -License: MPL-1.1 or LGPL-2.1 +License: MPL-1.0 or LGPL-2.1 Group: Development/Libraries/C and C++ -Source: libical-%{version}.tar.bz2 +Url: http://sourceforge.net/projects/freeassociation/ +Source: libical-%{version}.tar.gz Source2: baselibs.conf +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: pkg-config BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -38,13 +37,13 @@ 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. -%package -n libical0 +%package -n %{name}%{sonum} Summary: An Implementation of Basic iCAL Protocols Group: Development/Libraries/C and C++ -Provides: libical = %{version} -Obsoletes: libical < %{version} +Provides: %{name} = %{version} +Obsoletes: %{name} < %{version} -%description -n libical0 +%description -n %{name}%{sonum} 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 @@ -53,7 +52,7 @@ component properties, parameters, and subcomponents. %package devel Summary: An implementation of basic iCAL protocols Group: Development/Libraries/C and C++ -Requires: libical0 = %{version} +Requires: %{name}%{sonum} = %{version} %description devel Libical is an Open Source implementation of the IETF's iCalendar @@ -61,10 +60,21 @@ 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. +%package devel-static +Summary: An implementation of basic iCAL protocols +Group: Development/Libraries/C and C++ +Requires: %{name}-devel = %{version} + +%description devel-static +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. + %package doc Summary: An Implementation of Basic iCAL Protocols Group: Development/Libraries/C and C++ -Requires: libical0 = %{version} +Recommends: %{name}%{sonum} = %{version} %description doc Libical is an open source implementation of the IETF's iCalendar @@ -76,34 +86,29 @@ component properties, parameters, and subcomponents. %setup -q %build -# triger autoreconf since the 0.46 tarball is missing autotools bootstrap files -autoreconf -f -i -%{configure} \ - --with-bdb4 \ - --with-bdb4-dir=%{_prefix} \ - --without-builtintz \ - --enable-shared \ - --disable-static -%{__make} %{?_smp_mflags} +mkdir build +pushd build +cmake -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ + -DLIB_SUFFIX="$(echo %_lib | cut -b4-)" \ + .. +make +popd %install -%{makeinstall} -%{__rm} $RPM_BUILD_ROOT/%{_libdir}/libical*.la -%{__rm} doc/Makefile* -%{__rm} -rf examples/.deps -%{__rm} -rf examples/.libs -%{__rm} examples/*.o -%{__rm} examples/doesnothing -%{__rm} scripts/Makefile* -%{__sed} -i -e '1s,.*,#!/usr/bin/perl,' scripts/mkneticali.pl +pushd build +%make_install +popd +rm examples/CMakeLists.txt +rm examples/Makefile.* -%post -n libical0 -p /sbin/ldconfig +%post -n %{name}%{sonum} -p /sbin/ldconfig -%postun -n libical0 -p /sbin/ldconfig +%postun -n %{name}%{sonum} -p /sbin/ldconfig -%files -n libical0 +%files -n %{name}%{sonum} %defattr(-,root,root) -%doc README AUTHORS ChangeLog NEWS TEST THANKS TODO +%doc AUTHORS README COPYING ChangeLog LICENSE NEWS TEST THANKS TODO %{_libdir}/*.so.* %files devel @@ -111,10 +116,15 @@ autoreconf -f -i %{_libdir}/*.so %{_libdir}/pkgconfig/libical.pc %{_includedir}/ical.h -%{_includedir}/libical +%{_includedir}/libical/ + +%files devel-static +%defattr(-,root,root) +%{_libdir}/*.a %files doc %defattr(-,root,root) -%doc doc examples scripts +%doc doc/*.txt +%doc examples/ %changelog