rpms/aiksaurus/devel aiksaurus.desktop, NONE, 1.1 aiksaurus.png, NONE, 1.1 aiksaurus.spec, 1.7, 1.8 aiksaurus-1.2.1-desktop.patch, 1.1, NONE

[Marc Maurer (uwog)]

Author: uwog

Update of /cvs/extras/rpms/aiksaurus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28069

Modified Files:
	aiksaurus.spec 
Added Files:
	aiksaurus.desktop aiksaurus.png 
Removed Files:
	aiksaurus-1.2.1-desktop.patch 
Log Message:
Fix bug 158140




--- NEW FILE aiksaurus.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Thesaurus
Comment=Lookup words in a thesaurus
Exec=gaiksaurus
Icon=aiksaurus.png
Terminal=false
Type=Application
StartupNotify=true
Categories=GNOME;Application;Utility;


Index: aiksaurus.spec
===================================================================
RCS file: /cvs/extras/rpms/aiksaurus/devel/aiksaurus.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- aiksaurus.spec	17 Aug 2005 12:33:07 -0000	1.7
+++ aiksaurus.spec	16 Feb 2006 12:42:40 -0000	1.8
@@ -1,17 +1,23 @@
-Summary: An English-language thesaurus library.
-Name: aiksaurus
-Version: 1.2.1
-Release: 10
-Epoch: 1
-Group: System Environment/Libraries
-License: GPL
-Source: http://download.sourceforge.net/aiksaurus/aiksaurus-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: gtk2-devel, desktop-file-utils >= 0.9
-PreReq: desktop-file-utils >= 0.9
-URL: http://aiksaurus.sourceforge.net/
+Name: 		aiksaurus
+Version: 	1.2.1
+Release: 	11
+Summary: 	An English-language thesaurus library
+
+Epoch: 		1
+Group: 		System Environment/Libraries
+License: 	GPL
+URL: 		http://aiksaurus.sourceforge.net/
+Source0: 	http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source1:	%{name}.png
+Source2: 	%{name}.desktop
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: 	gtk2-devel
+BuildRequires:	desktop-file-utils
+
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 
-Patch0: aiksaurus-1.2.1-desktop.patch
 
 %description
 Aiksaurus is an English-language thesaurus library that can be 
@@ -19,18 +25,22 @@
 software to provide thesaurus capabilities.  A basic command line 
 thesaurus program is also included.
 
+
 %package devel
-Requires: aiksaurus
-Summary: Files for developing with aiksaurus.
-Group: Development/Libraries
-                                                                                
+Requires: 	%{name} = %{version}-%{release}
+Summary: 	Files for developing with aiksaurus
+Group: 		Development/Libraries
+ 
+                                                                               
 %description devel
 Includes and definitions for developing with aiksaurus.
 
+
 %package gtk
-Requires: aiksaurus >= %{version}
-Summary: A GTK+ frontend to aiksaurus.
-Group: System Environment/Libraries
+Requires: 	%{name} = %{version}-%{release}
+Summary: 	A GTK+ frontend to aiksaurus
+Group: 		System Environment/Libraries
+
 
 %description gtk
 AiksaurusGTK is a GTK+ interface to the Aiksaurus library.  
@@ -38,43 +48,70 @@
 in GTK+ projects, notably AbiWord.  A standalone thesaurus program
 is also provided.
 
+
 %package gtk-devel
-Requires: aiksaurus-gtk
-Requires: aiksaurus-devel >= %{version}
-Requires: gtk2-devel
-Summary: Files for developing with aiksaurus-gtk.
-Group: Development/Libraries
-                                                                                
+Requires: 	%{name}-gtk = %{version}-%{release}
+Requires: 	gtk2-devel
+Summary: 	Files for developing with aiksaurus-gtk
+Group: 		Development/Libraries
+ 
+                                                                               
 %description gtk-devel
 gtk includes and definitions for developing with aiksaurus.
 
+
 %prep
 %setup -q
-%patch0 -p1 -b .desktop.patch
+
 
 %build
 %configure
-make
+make %{?_smp_mflags}
+
 
 %install
+rm -rf $RPM_BUILD_ROOT
 %makeinstall
+
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
-desktop-file-install --vendor gnome --dir $RPM_BUILD_ROOT%{_datadir}/applications ./gaiksaurus.desktop
+
+# Add the desktop icon.
+%{__install} -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
+
+# Add desktop file.
+desktop-file-install --vendor fedora                    \
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
+        --add-category X-Fedora                         \
+        %{SOURCE2}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post -p /sbin/ldconfig
 
+
 %postun -p /sbin/ldconfig
 
+
+%post gtk
+/sbin/ldconfig
+update-desktop-database &> /dev/null ||:
+
+
+%postun gtk
+/sbin/ldconfig
+update-desktop-database &> /dev/null ||:
+
+
 %files
 %defattr(-, root, root)
 %doc ChangeLog README COPYING AUTHORS
-%{_bindir}/aiksaurus
+%{_bindir}/%{name}
 %{_bindir}/caiksaurus
 %{_libdir}/*Aiksaurus-*.so.*
-%{_datadir}/aiksaurus
+%{_datadir}/%{name}/
+
 
 %files devel
 %defattr(-, root, root)
@@ -82,21 +119,16 @@
 %{_includedir}/Aiksaurus/Aiksaurus.h
 %{_includedir}/Aiksaurus/AiksaurusC.h
 %{_libdir}/*Aiksaurus.so
-%{_libdir}/pkgconfig/aiksaurus-1.0.pc
+%{_libdir}/pkgconfig/%{name}-1.0.pc
+
 
 %files gtk
 %defattr(-, root, root)
 %{_bindir}/gaiksaurus
 %{_libdir}/*GTK*.so.*
-%{_datadir}/applications/gnome-gaiksaurus.desktop
-
-%post gtk
-/sbin/ldconfig
-update-desktop-database %{_datadir}/applications
+%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/pixmaps/%{name}.png
 
-%postun gtk
-/sbin/ldconfig
-update-desktop-database %{_datadir}/applications
 
 %files gtk-devel
 %defattr(-, root, root)
@@ -104,7 +136,18 @@
 %{_libdir}/*GTK*.so
 %{_libdir}/pkgconfig/gaiksaurus-1.0.pc
 
+
 %changelog
+* Tue Jan 24 2006 Brian Pepple <bdpepple at ameritech.net> - 1:1.2.1-11
+- Add desktop icon.
+- Remove those pesky periods from the summaries.
+- Add smp_mflag.
+- Correct desktop file to meet FE requirements.
+- Correct ownership of datadir.
+- Correct sub-packages dependencies.
+- Drop PreReq (depreciated), and use requires.
+- Use preferred FE build root.
+
 * Wed Aug 17 2005 Marc Maurer <uwog at abisource.com> 1:1.2.1-10
 - Rebuild against new libcairo
 


--- aiksaurus-1.2.1-desktop.patch DELETED ---