rpms/sunbird/devel sunbird-0.9-libical.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 sunbird.spec, 1.15, 1.16 sunbird-0.3.1-link-layout.patch, 1.1, NONE

Lubomir Rintel lkundrak at fedoraproject.org
Tue Sep 23 20:39:22 UTC 2008 

Author: lkundrak

Update of /cvs/pkgs/rpms/sunbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18950

Modified Files:
	.cvsignore sources sunbird.spec 
Added Files:
	sunbird-0.9-libical.patch 
Removed Files:
	sunbird-0.3.1-link-layout.patch 
Log Message:
* Tue Sep 23 2008 Lubomir Rintel <lkundrak at v3.sk> 0.9-1
- 0.9 GOLD
- Fix use of system nss and nspr4
- Link against system libical (#459923)
- Add language packs for lightning (#449770)


sunbird-0.9-libical.patch:

--- NEW FILE sunbird-0.9-libical.patch ---
Link against system libical instead of bundled.
https://bugzilla.redhat.com/show_bug.cgi?id=459923

Lubomir Rintel <lkundrak at v3.sk>

--- mozilla/calendar/base/src/calDateTime.cpp.libical	2008-09-23 17:12:32.000000000 +0200
+++ mozilla/calendar/base/src/calDateTime.cpp	2008-09-23 17:10:35.000000000 +0200
@@ -592,7 +592,7 @@
     }
 
     if (mIsDate || otherIsDate) {
-        *aResult = icaltime_compare_date_only(a, b, cal::getIcalTimezone(mTimezone));
+        *aResult = icaltime_compare_date_only(a, b);
     } else {
         *aResult = icaltime_compare(a, b);
     }
--- mozilla/calendar/base/build/Makefile.in.libical	2007-12-27 11:01:41.000000000 +0100
+++ mozilla/calendar/base/build/Makefile.in	2008-09-23 16:02:42.000000000 +0200
@@ -63,7 +63,6 @@
 	js \
 	xpconnect \
 	string \
-	ical \
 	calbase
 
 CPPSRCS = calBaseModule.cpp \
@@ -74,7 +73,6 @@
 
 SHARED_LIBRARY_LIBS = \
     $(DEPTH)/calendar/base/src/$(LIB_PREFIX)calbase_s.$(LIB_SUFFIX) \
-    $(DEPTH)/calendar/libical/src/libical/$(LIB_PREFIX)mozical.$(LIB_SUFFIX) \
     $(NULL)
 
 ifdef MOZILLA_INTERNAL_API
@@ -94,4 +92,7 @@
 	$(NULL)
 endif
 
+# External libical
+EXTRA_DSO_LDOPTS += -lical
+
 include $(topsrcdir)/config/rules.mk
--- mozilla/calendar/Makefile.in.libical	2008-09-23 17:13:34.000000000 +0200
+++ mozilla/calendar/Makefile.in	2008-09-23 17:07:30.000000000 +0200
@@ -42,7 +42,7 @@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE	= calendar
-DIRS = libical resources base providers import-export locales
+DIRS = resources base providers import-export locales
 
 ifdef ENABLE_TESTS
 DIRS += test
--- mozilla/calendar/lightning/Makefile.in.libical	2008-07-24 03:07:05.000000000 +0200
+++ mozilla/calendar/lightning/Makefile.in	2008-09-23 16:02:42.000000000 +0200
@@ -71,7 +71,7 @@
 endif
 endif
 
-DIRS = ../libical \
+DIRS = \
        ../locales \
        ../base \
        ../providers \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	24 Aug 2008 20:37:24 -0000	1.9
+++ .cvsignore	23 Sep 2008 20:38:51 -0000	1.10
@@ -1,2 +1,3 @@
-sunbird-0.9pre.tar.gz
-sunbird-langpacks-0.9pre.tar.gz
+lightning-0.9.linux-i686.xpi
+sunbird-langpacks-0.9.tar.gz
+lightning-sunbird-0.9-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	24 Aug 2008 20:37:24 -0000	1.9
+++ sources	23 Sep 2008 20:38:51 -0000	1.10
@@ -1,2 +1,3 @@
-85ea2996f33a403b9dd3c752f0ea0bc4  sunbird-0.9pre.tar.gz
-2d3b4e492e1c791cf280653c2eab0ac5  sunbird-langpacks-0.9pre.tar.gz
+8086ee725f2d3eca17c375a3812c3618  lightning-0.9.linux-i686.xpi
+adcef4eab2cbc14c1534ab80cb684273  sunbird-langpacks-0.9.tar.gz
+ff4ae1e9c1071d8d478504d95d7dabee  lightning-sunbird-0.9-source.tar.bz2


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sunbird.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sunbird.spec	24 Aug 2008 20:37:24 -0000	1.15
+++ sunbird.spec	23 Sep 2008 20:38:51 -0000	1.16
@@ -1,9 +1,4 @@
-# TODO:	sunbird.i386: E: shared-lib-without-dependency-information /usr/lib/sunbird-0.9/libnspr4.so
-# 	we should be linking against system nspr
-# TODO: link against system libical (rishi)
-# TODO: language packs, also for lightning
-
-%define progdir %{_prefix}/%{_lib}/%{name}-%{version}pre
+%define progdir %{_prefix}/%{_lib}/%{name}-%{version}
 %define docs LEGAL LICENSE README.txt
 %{?_with_official:%define official 1}
 
@@ -13,18 +8,21 @@
 
 Name:           sunbird
 Version:        0.9
-Release:        0.3.20080824cvs%{?dist}
+Release:        1%{?dist}
 Summary:        Mozilla Sunbird Calendar
 
 Group:          Applications/Productivity
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 URL:            http://www.mozilla.org/projects/calendar/sunbird/
-Source0:        sunbird-0.9pre.tar.gz
-#http://releases.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/%{version}/source/lightning-sunbird-%{version}-source.tar.bz2
+Source0:        http://releases.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/%{version}/source/lightning-sunbird-%{version}-source.tar.bz2
 Source1:        sunbird.desktop
-Source2:        sunbird-langpacks-0.9pre.tar.gz
+Source2:        sunbird-langpacks-%{version}.tar.gz
 Source3:        mozilla-extension-update.sh
+# This is used just for langpacks.
+# TODO: build them!
+Source4:        http://releases.mozilla.org/pub/mozilla.org/calendar/lightning/releases/%{version}/lightning-%{version}.linux-i686.xpi
 Source100:      find-external-requires
+Patch0:         sunbird-0.9-libical.patch
 
 # build patches
 Patch2:         sunbird-0.7-path.patch
@@ -40,6 +38,9 @@
 BuildRequires:  freetype-devel >= 2.1.9
 BuildRequires:  libXt-devel
 BuildRequires:  desktop-file-utils
+BuildRequires:  nss-devel
+BuildRequires:  nspr-devel
+BuildRequires:  libical-devel
 BuildRequires:  zip
 
 Requires(post):  desktop-file-utils
@@ -80,6 +81,7 @@
 
 %prep
 %setup -q -n mozilla
+%patch0 -p1 -b .libical
 %patch2 -p1 -b .path
 %patch3 -p1 -b .uilocale
 # Fix source perms to avoid errors in the debuginfo RPM (bug 357661)
@@ -183,7 +185,7 @@
   language=$(basename $langpack .xpi)
   extensiondir=$RPM_BUILD_ROOT%{progdir}/extensions/langpack-$language at sunbird.mozilla.org
   mkdir -p $extensiondir
-  unzip $langpack -d $extensiondir
+  unzip -qod $extensiondir $langpack
   find $extensiondir -type f -print0 |xargs -0 chmod 644
   # Fix #441500
   sed 's/\r//g' $extensiondir/install.rdf |awk '/^$/ {next} {print}' >lala
@@ -191,12 +193,22 @@
 done
 
 # Lightning
-unzip -d $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning dist/xpi-stage/lightning.xpi
+unzip -qod $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning dist/xpi-stage/lightning.xpi
 install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/mozilla-extension-update.sh
 # Fix some permissions
 chmod -x $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/js/calAlarmMonitor.js \
   $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/js/calFreeBusyService.js
 
+# Unpack lightning language packs, except en_US
+unzip -l %{SOURCE4} '*.jar'                                     |
+  awk '/-[^\/]*\.jar/ && !/en-US/ {print $4}'                   |
+  xargs unzip -qod $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning %{SOURCE4}
+# Register them
+ls $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/chrome       |
+  sed -n '/en-US/n;s/\(\([^-]*\)-\(.*\)\.jar\)/locale \2 \3 jar:chrome\/\1!\/locale\/\3\/\2\//p' \
+  >> $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/chrome.manifest
+# ^^^ I'm going to burn in hell for this ^^^
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -265,6 +277,12 @@
 
 
 %changelog
+* Tue Sep 23 2008 Lubomir Rintel <lkundrak at v3.sk> 0.9-1
+- 0.9 GOLD
+- Fix use of system nss and nspr4
+- Link against system libical (#459923)
+- Add language packs for lightning (#449770)
+
 * Sun Aug 24 2008 Lubomir Rintel <lkundrak at v3.sk> 0.9-0.3.20080824cvs
 - Newer snapshot closer to RC
 - New langpacks


--- sunbird-0.3.1-link-layout.patch DELETED ---

More information about the fedora-extras-commits mailing list