rpms/sunbird/devel .cvsignore,1.7,1.8 sunbird.spec,1.13,1.14

[Lubomir Rintel (lkundrak)]

Author: lkundrak

Update of /cvs/pkgs/rpms/sunbird/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1528

Modified Files:
	.cvsignore sunbird.spec 
Log Message:
* Mon Aug 11 2008 Lubomir Rintel <lkundrak at v3.sk> 0.9-0.2.20080807cvs
- Get rid of relative symlinks
- Remove lignthing's libcalbasecomps.so provide
- Fix dependencies of scriptlets



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Aug 2008 19:34:40 -0000	1.7
+++ .cvsignore	11 Aug 2008 20:23:15 -0000	1.8
@@ -1 +1,2 @@
 sunbird-0.9pre.tar.gz
+sunbird-langpacks-0.8.tar.gz


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sunbird.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sunbird.spec	10 Aug 2008 19:57:59 -0000	1.13
+++ sunbird.spec	11 Aug 2008 20:23:15 -0000	1.14
@@ -1,10 +1,19 @@
+# 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}
 %define docs LEGAL LICENSE README.txt
 %{?_with_official:%define official 1}
 
+# This is to filter unwanted provides, that should be provided only by gecko-devel
+%define _use_internal_dependency_generator 0
+%define __find_requires %{SOURCE100} %{buildroot}
+
 Name:           sunbird
 Version:        0.9
-Release:        0.1.20080807cvs%{?dist}
+Release:        0.2.20080807cvs%{?dist}
 Summary:        Mozilla Sunbird Calendar
 
 Group:          Applications/Productivity
@@ -33,11 +42,10 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  zip
 
-Requires(pre):  desktop-file-utils
+Requires(post):  desktop-file-utils
+Requires(postun):  desktop-file-utils
 
 AutoProv: 0
-%define _use_internal_dependency_generator 0
-%define __find_requires %{SOURCE100} %{buildroot}
 
 %description
 Mozilla Sunbirdâ„¢ is a cross-platform calendar application, built upon
@@ -47,9 +55,10 @@
 %package -n thunderbird-lightning
 Summary:        The calendar extension to Thunderbird
 Group:          Applications/Productivity
-Requires:       thunderbird
+Requires:       thunderbird >= 2
 Obsoletes:      thunderbird-lightning-wcap <= 0.8
 Provides:       thunderbird-lightning-wcap = %{version}-%{release}
+AutoProv: 0
 
 %description -n thunderbird-lightning
 Lightning brings the Sunbird calendar to the popular email client,
@@ -133,11 +142,13 @@
 rm -rf $RPM_BUILD_ROOT
 # The make install does not work (it tries to build additional stuff that break)
 #make install DESTDIR=$RPM_BUILD_ROOT
+# TODO: Is the above still true? Recheck!
+
 # copy tree into RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{progdir}
 cp -rf $RPM_BUILD_DIR/mozilla/dist/%{name}/* $RPM_BUILD_ROOT%{progdir}
 mkdir $RPM_BUILD_ROOT%{_bindir}
-ln -sf ../..%{progdir}/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
+mv $RPM_BUILD_ROOT%{progdir}/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
 
 
 desktop-file-install --vendor="fedora"                  \
@@ -155,7 +166,7 @@
 
 # Icon
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
-ln -s %{progdir}/icons/mozicon128.png \
+cp $RPM_BUILD_ROOT%{progdir}/icons/mozicon128.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
 
 # Docs in %%doc
@@ -254,6 +265,11 @@
 
 
 %changelog
+* Mon Aug 11 2008 Lubomir Rintel <lkundrak at v3.sk> 0.9-0.2.20080807cvs
+- Get rid of relative symlinks
+- Remove lignthing's libcalbasecomps.so provide
+- Fix dependencies of scriptlets
+
 * Sun Aug 10 2008 Lubomir Rintel <lkundrak at v3.sk> 0.9-0.1.20080807cvs
 - First attempt at 0.9, CVS snapshot close to first RC
 - Rewrite the requires generation, for it suffered bitrot