2007-09-21 Brian Cameron <[email protected]>
authoryippi
Fri, 21 Sep 2007 22:49:48 +0000
changeset 10546 46ad1237105d
parent 10545 57a39b575a3a
child 10547 d64a42b52d25
2007-09-21 Brian Cameron <[email protected]> * SUNWgnome-calculator.spec, base-specs/gcalctool.spec: Fix so that we ship the desktop file so the calculator appears in the menus.
ChangeLog
SUNWgnome-calculator.spec
base-specs/gcalctool.spec
--- a/ChangeLog	Fri Sep 21 14:03:14 2007 +0000
+++ b/ChangeLog	Fri Sep 21 22:49:48 2007 +0000
@@ -1,3 +1,9 @@
+2007-09-21  Brian Cameron  <[email protected]>
+
+	* SUNWgnome-calculator.spec, base-specs/gcalctool.spec:  Fix so
+	  that we ship the desktop file so the calculator appears in the
+	  menus.
+
 2007-09-21  Michal Pryc  <[email protected]>
 
 	* patches/nautilus-10-acl.diff: modified, fixes 6569821
--- a/SUNWgnome-calculator.spec	Fri Sep 21 14:03:14 2007 +0000
+++ b/SUNWgnome-calculator.spec	Fri Sep 21 22:49:48 2007 +0000
@@ -131,7 +131,7 @@
 %{_bindir}/*
 %dir %attr (0755, root, sys) %{_datadir}
 %dir %attr (0755, root, other) %{_datadir}/applications
-#%{_datadir}/applications/*
+%{_datadir}/applications/*
 %dir %attr (0755, root, other) %{_datadir}/gnome
 %{_datadir}/gnome/help/*/C
 %{_datadir}/omf/*/*-C.omf
@@ -156,6 +156,9 @@
 %{_sysconfdir}/gconf/schemas/gcalctool.schemas
 
 %changelog
+* Fri Sep 21 2007 - [email protected]
+- Re-add the desktop file back into the packaging.  It wasn't getting
+  built before because we weren't calling the proper autotools.
 * Thu Aug 16 2007 - [email protected]
 - Remove %files line because dir not installed.
 * Tue Apr 24 2007 - [email protected]
--- a/base-specs/gcalctool.spec	Fri Sep 21 14:03:14 2007 +0000
+++ b/base-specs/gcalctool.spec	Fri Sep 21 22:49:48 2007 +0000
@@ -65,6 +65,10 @@
   CPUS=1
 fi
 
+intltoolize --force --copy --automake
+aclocal $ACLOCAL_FLAGS -I ./m4
+automake -a -c -f
+autoconf
 CFLAGS="$RPM_OPT_FLAGS" \
   ./configure \
 	--prefix=%{_prefix} \
@@ -109,6 +113,11 @@
 %{_mandir}/man1/
 
 %changelog
+* Fri Sep 21 2007 - [email protected]
+- Call intltoolize and other autotools.  Otherwise the desktop
+  file doesn't get build and we don't see the calculator in the
+  menus.
+
 * Tue Sep 18 2007 - [email protected]
 - Bump to 5.20.0.