[libical] Update to 1.0.1
Milan Crha
mcrha at fedoraproject.org
Mon Jan 26 11:08:13 UTC 2015
commit dca16e7578428f10f28b13957f5bc4df391a9e36
Author: Igor Gnatenko <ignatenkobrain at fedoraproject.org>
Date: Mon Jan 26 12:09:16 2015 +0100
Update to 1.0.1
.gitignore | 1 +
libical-1.0-avoid-putenv.patch | 22 ++++++++++------------
libical-1.0-r1150.patch | 24 ------------------------
libical-1.0-r1156.patch | 12 ------------
libical-1.0-ycaltime.patch | 12 ------------
libical.spec | 25 +++++++++++++------------
sources | 2 +-
7 files changed, 25 insertions(+), 73 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a0551a4..ba2c70a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/libical-0.48.tar.gz
/libical-1.0.tar.gz
+/libical-1.0.1.tar.gz
diff --git a/libical-1.0-avoid-putenv.patch b/libical-1.0-avoid-putenv.patch
index ee4518b..2b2fc80 100644
--- a/libical-1.0-avoid-putenv.patch
+++ b/libical-1.0-avoid-putenv.patch
@@ -1,6 +1,6 @@
-diff -up libical-1.0/src/libical/icaltime.c.old libical-1.0/src/libical/icaltime.c
---- libical-1.0/src/libical/icaltime.c.old 2014-11-26 13:29:50.809112801 +0100
-+++ libical-1.0/src/libical/icaltime.c 2014-11-26 14:56:05.740893525 +0100
+diff -up libical-1.0.1/src/libical/icaltime.c.avoid-putenv libical-1.0.1/src/libical/icaltime.c
+--- libical-1.0.1/src/libical/icaltime.c.avoid-putenv 2014-10-09 17:07:05.000000000 +0200
++++ libical-1.0.1/src/libical/icaltime.c 2015-01-26 11:56:35.153309240 +0100
@@ -64,11 +64,6 @@
#define gmtime_r(tp,tmp) (gmtime(tp)?(*(tmp)=*gmtime(tp),(tmp)):0)
#endif
@@ -22,25 +22,23 @@ diff -up libical-1.0/src/libical/icaltime.c.old libical-1.0/src/libical/icaltime
{
time_t tim;
-@@ -85,7 +80,7 @@ static time_t make_time(struct tm *tm, i
-
+@@ -91,13 +86,13 @@ static time_t make_time(struct tm *tm, i
+ #if (SIZEOF_TIME_T == 4)
/* check that year specification within range */
- if (tm->tm_year < 70 || tm->tm_year > 138)
-+ if (be_strict && sizeof (time_t) == 4 && (tm->tm_year < 70 || tm->tm_year > 138))
++ if (be_strict && (tm->tm_year < 70 || tm->tm_year > 138))
return((time_t) -1);
- /* check that month specification within range */
-@@ -96,7 +91,7 @@ static time_t make_time(struct tm *tm, i
/* check for upper bound of Jan 17, 2038 (to avoid possibility of
32-bit arithmetic overflow) */
- if (tm->tm_year == 138) {
-+ if (be_strict && sizeof (time_t) == 4 && tm->tm_year == 138) {
++ if (be_strict && tm->tm_year == 138) {
if (tm->tm_mon > 0)
return((time_t) -1);
else if (tm->tm_mday > 17)
-@@ -289,99 +284,12 @@ time_t icaltime_as_timet(const struct ic
+@@ -291,99 +286,12 @@ time_t icaltime_as_timet(const struct ic
stm.tm_year = tt.year-1900;
stm.tm_isdst = -1;
@@ -141,7 +139,7 @@ diff -up libical-1.0/src/libical/icaltime.c.old libical-1.0/src/libical/icaltime
/** Return the time as seconds past the UNIX epoch, using the
* given timezone.
*
-@@ -395,8 +303,6 @@ time_t icaltime_as_timet_with_zone(const
+@@ -397,8 +305,6 @@ time_t icaltime_as_timet_with_zone(const
{
icaltimezone *utc_zone;
struct tm stm;
@@ -150,7 +148,7 @@ diff -up libical-1.0/src/libical/icaltime.c.old libical-1.0/src/libical/icaltime
struct icaltimetype local_tt;
utc_zone = icaltimezone_get_utc_timezone ();
-@@ -424,25 +330,8 @@ time_t icaltime_as_timet_with_zone(const
+@@ -426,25 +332,8 @@ time_t icaltime_as_timet_with_zone(const
stm.tm_mon = local_tt.month-1;
stm.tm_year = local_tt.year-1900;
stm.tm_isdst = -1;
diff --git a/libical.spec b/libical.spec
index 6558d98..506a104 100644
--- a/libical.spec
+++ b/libical.spec
@@ -1,14 +1,11 @@
Summary: Reference implementation of the iCalendar data type and serialization format
Name: libical
-Version: 1.0
-Release: 9%{?dist}
+Version: 1.0.1
+Release: 1%{?dist}
License: LGPLv2 or MPLv1.1
URL: http://freeassociation.sourceforge.net/
-Source: http://downloads.sourceforge.net/freeassociation/%{name}-%{version}.tar.gz
-Patch0: libical-1.0-r1150.patch
-Patch1: libical-1.0-r1156.patch
-Patch2: libical-1.0-avoid-putenv.patch
-Patch3: libical-1.0-ycaltime.patch
+Source: https://github.com/%{name}/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
+Patch0: libical-1.0-avoid-putenv.patch
BuildRequires: bison, byacc, flex
BuildRequires: cmake
@@ -28,10 +25,7 @@ applications that use libical.
%prep
%setup -q
-%patch0 -p1 -b .r1150
-%patch1 -p1 -b .r1156
-%patch2 -p1 -b .avoid-putenv
-%patch3 -p1 -b .ycaltime
+%patch0 -p1 -b .avoid-putenv
%build
mkdir -p %{_target_platform}
@@ -47,12 +41,15 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
# omit static libs
rm -fv %{buildroot}%{_libdir}/lib*.a
+%check
+make test ARGS="-V" -C %{_target_platform}
+
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
-%doc LICENSE README THANKS
+%doc LICENSE ReadMe.txt THANKS
%{_libdir}/libical.so.1*
%{_libdir}/libicalss.so.1*
%{_libdir}/libicalvcal.so.1*
@@ -64,9 +61,13 @@ rm -fv %{buildroot}%{_libdir}/lib*.a
%{_libdir}/libicalss.so
%{_libdir}/libicalvcal.so
%{_libdir}/pkgconfig/libical.pc
+%{_libdir}/cmake/LibIcal/
%{_includedir}/libical/
%changelog
+* Mon Jan 26 2015 Igor Gnatenko <ignatenkobrain at fedoraproject.org> - 1.0.1-1
+- Update to 1.0.1
+
* Mon Jan 12 2015 Matthias Clasen <mclasen at redhat.com> - 1.0-9
- Fix a stupid typo in the definition of icaltime_days_in_year
diff --git a/sources b/sources
index 44462ff..5bc3682 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4438c31d00ec434f02867a267a92f8a1 libical-1.0.tar.gz
+af91db06b22559f863869c5a382ad08a libical-1.0.1.tar.gz
More information about the scm-commits
mailing list