From 89de8d6107891c0113d66bb1383e9b2953f4a528efd854bdf870a5a75fd077ba Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Mon, 14 Feb 2011 00:16:34 +0000 Subject: [PATCH] Accepting request 60928 from GNOME:Apps Accepted submit request 60928 from user vuntz OBS-URL: https://build.opensuse.org/request/show/60928 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ghex?expand=0&rev=20 --- ghex.changes | 13 ++++ ghex.spec | 197 ++++++--------------------------------------------- 2 files changed, 34 insertions(+), 176 deletions(-) diff --git a/ghex.changes b/ghex.changes index 35f3d78..c908bfc 100644 --- a/ghex.changes +++ b/ghex.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sat Feb 12 17:43:30 CET 2011 - vuntz@opensuse.org + +- Call relevant macros in %post/%postun: + + %desktop_database_post/postun because the package ships at + least one desktop file. + + %icon_theme_cache_post/postun because the package ships themed + icons. +- Pass %{?no_lang_C} to %find_lang so that english documentation + can be packaged with the program, and not in the lang subpackage. +- Change Requires of lang subpackage to Recommends, since the + english documentation is not there anymore. + ------------------------------------------------------------------- Mon Mar 16 14:46:16 CET 2009 - sbrabec@suse.cz diff --git a/ghex.spec b/ghex.spec index f403d27..fb8e744 100644 --- a/ghex.spec +++ b/ghex.spec @@ -36,7 +36,7 @@ Source: ftp://ftp.gnome.org/pub/GNOME/sources/ghex/2.8/%{name}-%{version BuildRoot: %{_tmppath}/%{name}-%{version}-build # PATCH-FIX-UPSTREAM ghex-empty-search-crash.patch bgo532184 Patch7: ghex-empty-search-crash.patch -Requires: %{name}-lang = %{version} +Recommends: %{name}-lang %gconf_schemas_prereq %description @@ -44,13 +44,6 @@ GHex allows the user to load data from any file and to view and edit it in either hex or ASCII. It is a must for anyone playing games that use a non-ASCII format for saving. - - -Authors: --------- - Jaka Mocnik - Chema Celorio - %package devel License: GPL v2 or later Summary: GNOME Binary Editor @@ -62,13 +55,6 @@ GHex allows the user to load data from any file and to view and edit it in either hex or ASCII. It is a must for anyone playing games that use a non-ASCII format for saving. - - -Authors: --------- - Jaka Mocnik - Chema Celorio - %lang_package %prep %setup -n ghex-%{version} @@ -91,10 +77,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/applications/ghex.desktop.new \ $RPM_BUILD_ROOT%{_datadir}/applications/ghex.desktop # Change sr@Latn to sr@latin mv %{buildroot}%{_datadir}/locale/sr@Latn %{buildroot}%{_datadir}/locale/sr@latin -%find_lang %{name}-2.0 -%find_lang %{name}2 +%find_lang %{name}-2.0 %{?no_lang_C} +%find_lang %{name}2 %{?no_lang_C} %find_gconf_schemas -cat %{name}.schemas_list >%{name}.lst cat %{name}-2.0.lang %{name}2.lang > %{name}.lang %{__rm} -vf %{buildroot}%{_libdir}/*.la %fdupes -s $RPM_BUILD_ROOT @@ -104,16 +89,31 @@ rm -rf $RPM_BUILD_ROOT %pre -f %{name}.schemas_pre -%post -p /sbin/ldconfig +%post +/sbin/ldconfig +%if 0%{?suse_version} > 1130 +%desktop_database_post +%icon_theme_cache_post +%endif + %posttrans -f %{name}.schemas_posttrans %preun -f %{name}.schemas_preun -%postun -p /sbin/ldconfig +%postun +/sbin/ldconfig +%if 0%{?suse_version} > 1130 +%desktop_database_postun +%icon_theme_cache_postun +%endif -%files -f %{name}.lst +%files -f %{name}.schemas_list %defattr(-,root,root) %doc README COPYING COPYING-DOCS AUTHORS +%dir %{_datadir}/gnome/ +%dir %{_datadir}/gnome/help/ +%dir %{_datadir}/gnome/help/ghex2/ +%doc %{_datadir}/gnome/help/ghex2/C/ %{_bindir}/* %{_libdir}/*.so.* %{_datadir}/applications/*.desktop @@ -129,158 +129,3 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog -* Mon Mar 16 2009 sbrabec@suse.cz -- Added support for translation-update-upstream (FATE#301344). -* Sun Feb 22 2009 vuntz@novell.com -- Update to version 2.24.0: - + set G_LOG_DOMAIN for the shared libgtkhex library so that - warning messages use the right domain - + fix background between the hex and ascii widgets becoming dark - black. (bgo#527279) - + Fix the allocation code to allocate the child widgets relative - to the GtkHex allocation.x and allocation.y coordinates instead - of (0,0). (bgo#527272) - + fix a bug where the selection would always start at 0 if the - user only used the keyboard - + Update the About Dialog to use the application icon. - (bgo#520983) - + fix ghex2 printing g_warning on startup because it uses a - deprecated API (bgo#564371) - + remove unused variables (bgo#564375) - + make desktop files follow freedesktop spec (bgo#568023) - + Fix an off-by-one error in reporting the number of bytes - selected in the status bar - + GObject type ids should be instances of GType, not of guint -- Remove BuildRequires: gail-devel (provided by gtk2-devel), - gnome-common, gnutls-devel, libglade2-devel, libwnck-devel, - perl-XML-Parser, scrollkeeper -- Remove check for old versions of openSUSE. -- Do not set DocPath in the desktop file (not needed by yelp). -- Remove call to autoreconf. -* Sat Jan 31 2009 vuntz@novell.com -- Use sr@latin instead of sr@Latn. -* Mon Jan 19 2009 crrodriguez@suse.de -- remove "la" files [BNC#357465] -* Tue Sep 02 2008 mboman@novell.com -- Update to version 2.22.0: - + Cosmetic version bump -* Thu May 08 2008 rodrigo@suse.de -- Upstream remaining patch -* Mon Mar 31 2008 vuntz@suse.de -- Update to version 2.21.92 (too many changes to list here) -- Remove ghex_60921.diff (fixed upstream), ghex_60922.diff (fixed - upstream), ghex-search-crash.patch (fixed upstream). -- Remove workaround for no translations. -- Add gnome-doc-utils-devel buildrequires. -- Stop using %%run_ldconfig and call ldconfig. -* Thu Mar 13 2008 sbrabec@suse.cz -- Custom look'n'feel gconf keys moved to gconf2-branding-openSUSE. -* Thu Mar 06 2008 maw@suse.de -- Fix the build when against newer versions of intltool. -* Thu Oct 11 2007 sbrabec@suse.cz -- Removed bogus dependency on mDNSResponder. -* Mon Sep 03 2007 sbrabec@suse.cz -- Fixed crash for empty search string (GNOME#473208). -* Thu Aug 09 2007 maw@suse.de -- Fix up the lang subpackage. -* Wed Aug 08 2007 mauro@suse.de -- Split out a -lang subpackage -- Add %%fdupes stuff -* Fri Apr 27 2007 sbrabec@suse.cz -- Do not call meinproc (#227624). -* Wed Feb 07 2007 sbrabec@suse.cz -- Do not build unusable static libraries (#238552). -* Wed Jan 03 2007 sbrabec@suse.cz -- Prefix changed to /usr. -- Spec file cleanup. -- Created ghex-devel subpackage. -* Tue Sep 19 2006 jhargadon@suse.de -- update to version 2.8.2 -- translation updates -* Wed Apr 19 2006 sbrabec@suse.cz -- Fixed crash in search (#155494). -* Wed Apr 19 2006 sbrabec@suse.cz -- I18N fix. -* Tue Feb 28 2006 sbrabec@suse.cz -- Use kdelibs3-doc in BuildRequires for meinproc (#153635#c14). -* Fri Feb 17 2006 sreeves@suse.de -- Update .desktop file (Name, GenericName, Comment, DocPath) -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Tue Feb 22 2005 ro@suse.de -- change category to build -* Fri Feb 18 2005 sbrabec@suse.cz -- Updated to version 2.8.1. -* Tue Nov 02 2004 ro@suse.de -- locale rename: no -> nb -* Wed Aug 25 2004 clahey@suse.de -- Cache the ghex help and show ghex in khelpcenter. -* Fri Jul 16 2004 shprasad@suse.de -- Fixes bug #60916 (Fix given by smadduri@novell.com) - Corrects Typo mistakes in status messages -- Fixes bug #60919 (Fix given by smadduri@novell.com) - Status bar resets upon file close -- Fixes bug #60921 (Fix given by smadduri@novell.com) - Removed ellipses in Menu option "Character Table" -- Fixes bug #60922 (Fix given by smadduri@novell.com) - Removes Duplicate accelerator keys for Edit menu options. -- Fixes bug #60918 (Fix given by smadduri@novell.com) - Avoids Crashing when trying to open /proc files. -* Wed Jun 23 2004 shprasad@suse.de -- Fixes bug #60089 (Fix given by smadduri@novell.com) - Changed The Title Pattern. -* Wed Jun 23 2004 shprasad@suse.de -- Fixes bug #59873 (Fix given by smadduri@novell.com) - Changed the default Fonts. -* Wed May 05 2004 sbrabec@suse.cz -- Updated to version 2.6.0 (GNOME 2.6). -* Wed Mar 10 2004 sbrabec@suse.cz -- Fixed gconf schemas installation (#33114). -* Fri Feb 20 2004 sbrabec@suse.cz -- Fixed PreReq. -* Thu Feb 12 2004 sbrabec@suse.cz -- Updated to version 2.4.1. -* Sat Jan 10 2004 adrian@suse.de -- add %%run_ldconfig -* Mon Oct 27 2003 sbrabec@suse.cz -- Updated to version 2.4.0.1 (GNOME 2.4). -* Sun Sep 14 2003 adrian@suse.de -- add Editor Category -* Mon Aug 18 2003 sbrabec@suse.cz -- Updated to version 2.2.1 (GNOME2). -* Wed May 28 2003 sbrabec@suse.cz -- Include all doc and omf files info package. -* Wed May 28 2003 ro@suse.de -- remove unpackaged files from buildroot -* Mon Nov 11 2002 ro@suse.de -- changed neededforbuild to -* Tue Oct 22 2002 hhetter@suse.de -- added libxslt to #neededforbuild to get scrollkeeper to run -- removed wrong docdir -* Fri Sep 27 2002 ro@suse.de -- Added alsa alsa-devel to neededforbuild (esound) -* Fri Jul 26 2002 adrian@suse.de -- fix neededforbuild -* Tue May 28 2002 ro@suse.de -- removed gpc from neededforbuild -* Fri Feb 01 2002 ro@suse.de -- changed neededforbuild to -* Fri Nov 30 2001 ro@suse.de -- changed neededforbuild to -* Wed Nov 21 2001 ro@suse.de -- added freetype2 to neededforbuild -* Fri Jun 15 2001 hhetter@suse.de -- update to 1.2.1 -- use bz2 -- added scrollkeeper to neededforbuild -- added suse_update_config -* Tue Mar 27 2001 ro@suse.de -- changed neededforbuild to -* Thu Mar 22 2001 hhetter@suse.de -- updated to version 1.2 (RC1) -- specfile improvements -* Wed Mar 14 2001 ro@suse.de -- changed neededforbuild to -* Thu Feb 22 2001 hhetter@suse.de -- initial build -- tested on 7.1 in GNOME1.4 Environment