Mercurial Mercurial > sustaining > oi_151a > spec-files / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* evolution.spec: Remove patch that has been moved upstream.
authordc144907
Mon, 16 Aug 2004 14:32:59 +0000
changeset 3577 310050b35732
parent 3576 20e4888d7e1e
child 3578 a29ce14729a2
* evolution.spec: Remove patch that has been moved upstream. * patches/evolution-03-event-page.diff: Removed. Now upstream. * ggv.spec,gnome-desktop.spec,gnome-terminal.spec,gnome-user-docs.spec, Solaris/SUNWgnome-base-libs.spec,Solaris/SUNWgnome-component.spec, Solaris/SUNWgnome-panel.spec,Solaris/SUNWgnome-rmm-utils.spec: Change perms on multiple files in preparation for Solaris integration.
ChangeLog file | annotate | diff | comparison | revisions
Solaris/ChangeLog file | annotate | diff | comparison | revisions
Solaris/SUNWgnome-base-libs.spec file | annotate | diff | comparison | revisions
Solaris/SUNWgnome-component.spec file | annotate | diff | comparison | revisions
Solaris/SUNWgnome-panel.spec file | annotate | diff | comparison | revisions
Solaris/SUNWgnome-rmm-utils.spec file | annotate | diff | comparison | revisions
evolution.spec file | annotate | diff | comparison | revisions
ggv.spec file | annotate | diff | comparison | revisions
gnome-desktop.spec file | annotate | diff | comparison | revisions
gnome-terminal.spec file | annotate | diff | comparison | revisions
gnome-user-docs.spec file | annotate | diff | comparison | revisions
patches/evolution-03-event-page.diff file | annotate | diff | comparison | revisions 
--- a/ChangeLog	Mon Aug 16 14:26:24 2004 +0000
+++ b/ChangeLog	Mon Aug 16 14:32:59 2004 +0000
@@ -1,3 +1,12 @@
+2004-08-16  Damien Carbery <[email protected]>
+
+	* gnome-user-docs.spec: update xml permission for Solaris Integration
+	* gnome-terminal.spec: update xml permission for Solaris Integration
+	* ggv.spec: update xml permission for Solaris Integration
+	* gnome-desktop.spec:
+	* evolution.spec: Remove patch that has been moved upstream.
+	* patches/evolution-03-event-page.diff: Removed. Now upstream.
+
 2004-08-16  Vinay  <[email protected]>
 
 	* gnome-pilot.spec: Update.
--- a/Solaris/ChangeLog	Mon Aug 16 14:26:24 2004 +0000
+++ b/Solaris/ChangeLog	Mon Aug 16 14:32:59 2004 +0000
@@ -1,3 +1,10 @@
+2004-08-16  Damien Carbery <[email protected]>
+
+	* SUNWgnome-rmm-utils.spec: Updated permission for Solaris integration.
+	* SUNWgnome-panel.spec: Updated permission for Solaris integration.
+	* SUNWgnome-base-libs.spec: Updated permissions for Solaris integration.
+	* SUNWgnome-component.spec: Updated permissions for Solaris integration.
+
 2004-08-16  Dermot McCluskey <[email protected]>
 
 	* SUNWjdsver.spec: change root from /etc to / for Solaris Integration
--- a/Solaris/SUNWgnome-base-libs.spec	Mon Aug 16 14:26:24 2004 +0000
+++ b/Solaris/SUNWgnome-base-libs.spec	Mon Aug 16 14:32:59 2004 +0000
@@ -156,7 +156,7 @@
 install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/sman1
 install --mode=0644 %SOURCE5 $RPM_BUILD_ROOT%{_mandir}/sman1
 install --mode=0644 %SOURCE6 $RPM_BUILD_ROOT%{_mandir}/sman1
-install --mode=0644 %SOURCE7 $RPM_BUILD_ROOT%{_mandir}/sman1
+install --mode=0755 %SOURCE7 $RPM_BUILD_ROOT%{_mandir}/sman1
 install -d $RPM_BUILD_ROOT%{_mandir}/sman3
 install --mode=0644 %SOURCE8 $RPM_BUILD_ROOT%{_mandir}/sman3
 install --mode=0644 %SOURCE9 $RPM_BUILD_ROOT%{_mandir}/sman3
@@ -167,14 +167,14 @@
 install --mode=0644 %SOURCE14 $RPM_BUILD_ROOT%{_mandir}/sman3
 install --mode=0644 %SOURCE15 $RPM_BUILD_ROOT%{_mandir}/sman3
 install --mode=0644 %SOURCE16 $RPM_BUILD_ROOT%{_mandir}/sman3
-install --mode=0644 %SOURCE17 $RPM_BUILD_ROOT%{_mandir}/sman3
+install --mode=0755 %SOURCE17 $RPM_BUILD_ROOT%{_mandir}/sman3
 install --mode=0644 %SOURCE18 $RPM_BUILD_ROOT%{_mandir}/sman3
-install --mode=0644 %SOURCE19 $RPM_BUILD_ROOT%{_mandir}/sman3
+install --mode=0755 %SOURCE19 $RPM_BUILD_ROOT%{_mandir}/sman3
 install --mode=0644 %SOURCE20 $RPM_BUILD_ROOT%{_mandir}/sman3
 install --mode=0644 %SOURCE21 $RPM_BUILD_ROOT%{_mandir}/sman3
 install --mode=0644 %SOURCE22 $RPM_BUILD_ROOT%{_mandir}/sman3
 install -d $RPM_BUILD_ROOT%{_mandir}/sman5
-install --mode=0644 %SOURCE23 $RPM_BUILD_ROOT%{_mandir}/sman5
+install --mode=0755 %SOURCE23 $RPM_BUILD_ROOT%{_mandir}/sman5
 install -d $RPM_BUILD_ROOT%{_mandir}/entities
 install --mode=0644 %SOURCE24 $RPM_BUILD_ROOT%{_mandir}/entities
 
@@ -259,6 +259,8 @@
 %{_datadir}/locale
 
 %changelog
+* Mon Aug 16 2004 - [email protected]
+- Changed multiple manpage modes to 0755 for Solaris integration.
 * Sat Jun 26 2004  [email protected]
 - Changed install location to /usr/...
 * Wed Jun 1 2004 - [email protected]
--- a/Solaris/SUNWgnome-component.spec	Mon Aug 16 14:26:24 2004 +0000
+++ b/Solaris/SUNWgnome-component.spec	Mon Aug 16 14:32:59 2004 +0000
@@ -96,15 +96,15 @@
 %bonobo.install -d %name-%version
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 install -d $RPM_BUILD_ROOT%{_mandir}/sman1
-install --mode=0644 %SOURCE0 $RPM_BUILD_ROOT%{_mandir}/sman1
+install --mode=0755 %SOURCE0 $RPM_BUILD_ROOT%{_mandir}/sman1
 install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/sman1
 install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/sman1
 install -d $RPM_BUILD_ROOT%{_mandir}/sman3
-install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/sman3
-install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/sman3
+install --mode=0755 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/sman3
+install --mode=0755 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/sman3
 install --mode=0644 %SOURCE5 $RPM_BUILD_ROOT%{_mandir}/sman3
-install --mode=0644 %SOURCE6 $RPM_BUILD_ROOT%{_mandir}/sman3
-install --mode=0644 %SOURCE7 $RPM_BUILD_ROOT%{_mandir}/sman3
+install --mode=0755 %SOURCE6 $RPM_BUILD_ROOT%{_mandir}/sman3
+install --mode=0755 %SOURCE7 $RPM_BUILD_ROOT%{_mandir}/sman3
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -161,6 +161,8 @@
 %{_datadir}/locale
 
 %changelog
+* Mon Aug 16 2004 - [email protected]
+- Changed multiple manpage modes to 0755 for Solaris integration.
 * Sat Jun 26 2004  [email protected]
 - Changed install location to /usr/...
 * Thu May 27 2004 - [email protected]
--- a/Solaris/SUNWgnome-panel.spec	Mon Aug 16 14:26:24 2004 +0000
+++ b/Solaris/SUNWgnome-panel.spec	Mon Aug 16 14:32:59 2004 +0000
@@ -304,7 +304,7 @@
 install -d $RPM_BUILD_ROOT%{_mandir}/sman3
 install --mode=0644 %SOURCE6 $RPM_BUILD_ROOT%{_mandir}/sman3
 install -d $RPM_BUILD_ROOT%{_mandir}/sman5
-install --mode=0644 %SOURCE7 $RPM_BUILD_ROOT%{_mandir}/sman5
+install --mode=0755 %SOURCE7 $RPM_BUILD_ROOT%{_mandir}/sman5
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -698,6 +698,8 @@
 %{_datadir}/omf/*/*-[a-z][a-z]_*.omf
 
 %changelog
+* Mon Aug 16 2004 - [email protected]
+- Changed SOURCE7 mode to 0755 for Solaris integration.
 * Tue Aug 10 2004 - [email protected]
 - Remove GNOME_DriveMountApplet.server to remove applet's panel menu entry.
 * Tue Jul 27 2004 - [email protected]
--- a/Solaris/SUNWgnome-rmm-utils.spec	Mon Aug 16 14:26:24 2004 +0000
+++ b/Solaris/SUNWgnome-rmm-utils.spec	Mon Aug 16 14:32:59 2004 +0000
@@ -57,7 +57,7 @@
 
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 install -d $RPM_BUILD_ROOT%{_mandir}/sman1
-install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/sman1
+install --mode=0755 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/sman1
                                 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -75,6 +75,8 @@
 %{_mandir}/*/*
 
 %changelog
+* Mon Aug 16 2004 - [email protected]
+- Changed SOURCE1 mode to 0755 for Solaris integration.
 * Tue Jun 22 2004 - [email protected]
 - changed install location to /usr/lib and /usr/bin
 * Wed Jun 02 2004 - [email protected]
--- a/evolution.spec	Mon Aug 16 14:26:24 2004 +0000
+++ b/evolution.spec	Mon Aug 16 14:32:59 2004 +0000
@@ -24,7 +24,6 @@
 Source3:	evolution-l10n-po-1.2.tar.bz2
 Patch:		evolution-01-forte-build.diff
 Patch1:		evolution-docs.diff
-Patch2:         evolution-03-event-page.diff
 #Patch0:         evolution_patch0.diff
 #Patch1:         evolution_patch1.diff
 #Patch2:         evolution_patch2.diff
@@ -228,7 +227,6 @@
 bzcat %SOURCE3 | tar xvf -
 %patch -p1
 %patch1 -p1
-%patch2 -p1
 #%patch -p1 -P 0
 #%patch -p1 -P 1
 #%patch -p1 -P 2
@@ -358,6 +356,9 @@
 
 
 %changelog
+* Mon Aug 16 2004 - [email protected]
+- Remove patch to fix compilation error in event-page.c - file fixed in cvs.
+
 * Mon Aug 16 2004 - [email protected]
 - Bug 5086653 - Remove javahelp-convert lines are there were not needed.
 
--- a/ggv.spec	Mon Aug 16 14:26:24 2004 +0000
+++ b/ggv.spec	Mon Aug 16 14:32:59 2004 +0000
@@ -73,6 +73,7 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 install -d $RPM_BUILD_ROOT%{_mandir}/man1
 install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man1
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/gnome/help/ggv/*/*.xml
 
 javahelp-convert-install $RPM_BUILD_ROOT %{name} %{name}.xml
 
@@ -121,6 +122,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Aug 16 2004 - [email protected]
+- Updated /usr/share/gnome/help/ggv/*/*.xml to 0644 for Solaris integration.
+
 * Thu Aug 05 2004 [email protected]
 - Incorporate new docs tarball from [email protected].
 
--- a/gnome-desktop.spec	Mon Aug 16 14:26:24 2004 +0000
+++ b/gnome-desktop.spec	Mon Aug 16 14:32:59 2004 +0000
@@ -108,7 +108,7 @@
 install -d $RPM_BUILD_ROOT%{_mandir}/man1
 install -d $RPM_BUILD_ROOT%{_mandir}/man5
 install --mode=0644 %SOURCE6 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE7 $RPM_BUILD_ROOT%{_mandir}/man5
+install --mode=0755 %SOURCE7 $RPM_BUILD_ROOT%{_mandir}/man5
 install --mode=0755 %SOURCE8 $RPM_BUILD_ROOT%{_bindir}
 #Copy zh_HK from zh_TW
 #Fixes bug 4930405
@@ -152,6 +152,9 @@
 %{_libdir}/libgnome-desktop-2.so
 
 %changelog
+* Mon Aug 16 2004 - [email protected]
+- Changed SOURCE7 mode to 0755 for Solaris integration.
+
 * Thu Jul 15 2004 - [email protected]
 - Updated spec-file to change the release version to 3 for 
   Solaris. Fixes bug #5073195.
--- a/gnome-terminal.spec	Mon Aug 16 14:26:24 2004 +0000
+++ b/gnome-terminal.spec	Mon Aug 16 14:32:59 2004 +0000
@@ -80,6 +80,7 @@
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 install -d $RPM_BUILD_ROOT%{_mandir}/man1
 install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/man1 
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/gnome/help/gnome-terminal/*/*.xml
 
 #Copy zh_HK from zh_TW
 #Fixes bug 4930405
@@ -130,6 +131,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Aug 16 2004 - [email protected]
+- Updated /usr/share/gnome/help/gnome-terminal/*/*.xml to 0644 for Solaris
+  integration.
+
 * Thu Aug 05 2004 [email protected]
 - Incorporate new docs tarball from [email protected].
 
--- a/gnome-user-docs.spec	Mon Aug 16 14:26:24 2004 +0000
+++ b/gnome-user-docs.spec	Mon Aug 16 14:32:59 2004 +0000
@@ -76,6 +76,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/gnome/help/user-guide/*/*.xml
 
 javahelp-convert-install $RPM_BUILD_ROOT gnome-access-guide gnome-access-guide.xml
 javahelp-convert-install $RPM_BUILD_ROOT system-admin-guide system-admin-guide.xml
@@ -98,6 +99,10 @@
 %{_datadir}/omf/*
 
 %changelog
+* Mon Aug 16 2004 - [email protected]
+- Updated /usr/share/gnome/help/user-guide/*/*.xml to 0644 for Solaris
+  integration.
+
 * Thu Aug 12 2004 - [email protected]
 - Update docs tarball (gnome-user-docs-UG-0.15) from [email protected]
 
--- a/patches/evolution-03-event-page.diff	Mon Aug 16 14:26:24 2004 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- evolution-1.4.6/calendar/gui/dialogs/event-page.h.orig	2004-08-10 09:39:07.782108000 +0100
-+++ evolution-1.4.6/calendar/gui/dialogs/event-page.h	2004-08-10 09:39:37.764383000 +0100
-@@ -53,6 +53,8 @@
- GtkType    event_page_get_type  (void);
- EventPage *event_page_construct (EventPage *epage);
- EventPage *event_page_new       (void);
-+static void times_updated (EventPage *epage, gboolean adjust_end_time);
-+
- 
- 
-
sustaining/oi_151a/spec-files