From 2e43eb5965e482899e8c120c725a5b9089f9650f Mon Sep 17 00:00:00 2001 From: Marc Maurer Date: Feb 16 2006 12:42:40 +0000 Subject: Fix bug 158140 --- diff --git a/aiksaurus-1.2.1-desktop.patch b/aiksaurus-1.2.1-desktop.patch deleted file mode 100644 index 175050d..0000000 --- a/aiksaurus-1.2.1-desktop.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- /dev/null 2005-01-24 09:03:19.124049840 +0000 -+++ aiksaurus-1.2.1/gaiksaurus.desktop 2005-01-24 10:43:05.176025758 +0000 -@@ -0,0 +1,9 @@ -+[Desktop Entry] -+Encoding=UTF-8 -+Name=Thesaurus -+Comment=Lookup words in a thesaurus -+Exec=gaiksaurus -+Terminal=false -+Type=Application -+StartupNotify=true -+Categories=GNOME;Application;Utility; diff --git a/aiksaurus.desktop b/aiksaurus.desktop new file mode 100644 index 0000000..13ab58f --- /dev/null +++ b/aiksaurus.desktop @@ -0,0 +1,10 @@ +[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; diff --git a/aiksaurus.png b/aiksaurus.png new file mode 100644 index 0000000..0a389ab Binary files /dev/null and b/aiksaurus.png differ diff --git a/aiksaurus.spec b/aiksaurus.spec index a294d9e..6787b44 100644 --- a/aiksaurus.spec +++ b/aiksaurus.spec @@ -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/ - -Patch0: aiksaurus-1.2.1-desktop.patch +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 + %description Aiksaurus is an English-language thesaurus library that can be @@ -19,18 +25,22 @@ embedded in word processors, email composers, and other authoring 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 @@ It provides an attractive thesaurus interface, and can be embedded 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 @@ rm -rf $RPM_BUILD_ROOT %{_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 @@ update-desktop-database %{_datadir}/applications %{_libdir}/*GTK*.so %{_libdir}/pkgconfig/gaiksaurus-1.0.pc + %changelog +* Tue Jan 24 2006 Brian Pepple - 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 1:1.2.1-10 - Rebuild against new libcairo