diff --git a/ghex-2.21.92.tar.bz2 b/ghex-2.21.92.tar.bz2 new file mode 100644 index 0000000..bf88dfa --- /dev/null +++ b/ghex-2.21.92.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25b8f6a8e2a68a190440d26ea9dd1f7dd8b2bdcab7a2d58de0a921821b7b165e +size 1251021 diff --git a/ghex-2.8.2.tar.bz2 b/ghex-2.8.2.tar.bz2 deleted file mode 100644 index b1c4d7a..0000000 --- a/ghex-2.8.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:47142d1903ac8cf09d888a4a349e0a6ea671314354937b63a544b829e008861d -size 955164 diff --git a/ghex-search-crash.patch b/ghex-search-crash.patch deleted file mode 100644 index 64c904e..0000000 --- a/ghex-search-crash.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/gtkhex.c -+++ src/gtkhex.c -@@ -2290,7 +2290,7 @@ - gint len, - const gchar *colour) - { -- GtkHex_AutoHighlight *new = g_malloc0(sizeof(GtkHex_Highlight)); -+ GtkHex_AutoHighlight *new = g_malloc0(sizeof(GtkHex_AutoHighlight)); - - new->search_string = g_memdup(search, len); - new->search_len = len; diff --git a/ghex.changes b/ghex.changes index dbcf92c..595a6a8 100644 --- a/ghex.changes +++ b/ghex.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Mar 31 19:57:05 CEST 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 16:58:01 CET 2008 - sbrabec@suse.cz diff --git a/ghex.spec b/ghex.spec index 8e536d3..20b1151 100644 --- a/ghex.spec +++ b/ghex.spec @@ -1,5 +1,5 @@ # -# spec file for package ghex (Version 2.8.2) +# spec file for package ghex (Version 2.21.92) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,20 +12,17 @@ Name: ghex -BuildRequires: fdupes gail-devel gnome-common gnutls-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel perl-XML-Parser update-desktop-files +BuildRequires: fdupes gail-devel gnome-common gnome-doc-utils-devel gnutls-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel perl-XML-Parser update-desktop-files # FIXME: only for directory ownership: BuildRequires: scrollkeeper License: GPL v2 or later Group: Development/Tools/Other -Version: 2.8.2 -Release: 183 +Version: 2.21.92 +Release: 1 Summary: GNOME Binary Editor Url: http://www.gnome.org/ Source: ftp://ftp.gnome.org/pub/GNOME/sources/ghex/2.8/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Patch4: ghex_60921.diff -Patch5: ghex_60922.diff -Patch6: ghex-search-crash.patch Patch7: ghex-empty-search-crash.patch %if %suse_version > 1020 Requires: %{name}-lang = %{version} @@ -45,6 +42,7 @@ Authors: Chema Celorio %package devel +License: GPL v2 or later Summary: GNOME Binary Editor Group: Development/Tools/Other Requires: %{name} = %{version} gtk2-devel gail-devel atk-devel @@ -64,21 +62,9 @@ Authors: %lang_package %prep %setup -n ghex-%{version} -%patch4 -p1 -%patch5 -p1 -%patch6 %patch7 -# Change po files according to ghex_60921.diff and ghex_60922.diff. -sed -i ' - /^msgid "Character _Table\.\.\."/,/^$/s/\.\.\.// - s/^msgid "C_ut"/msgid "Cu_t"/ - s/^msgid "_Paste"/msgid "Pa_ste"/ - s/^msgid "_Replace"/msgid "R_eplace"/ - ' po/*.po %build -rm po/no.* -sed -i "s/\(ALL_LINGUAS.*\) no /\1 /" configure.in autoreconf -f -i intltoolize --force # FIXME: Build as root modifies system! @@ -110,14 +96,12 @@ rm -rf $RPM_BUILD_ROOT %pre -f %{name}.schemas_pre -%post -%run_ldconfig +%post -p /sbin/ldconfig %posttrans -f %{name}.schemas_posttrans %preun -f %{name}.schemas_preun -%postun -%run_ldconfig +%postun -p /sbin/ldconfig %files -f %{name}.lst %defattr(-,root,root) @@ -126,8 +110,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so.* %{_datadir}/applications/*.desktop %{_datadir}/gnome-2.0/ui/*.xml -%{_datadir}/pixmaps/*.png -%{_datadir}/omf/* +%{_datadir}/icons/hicolor/*/apps/ghex.* %files lang -f %{name}.lang @@ -139,6 +122,13 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog +* 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 @@ -169,7 +159,7 @@ rm -rf $RPM_BUILD_ROOT - 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 +* Sat Feb 18 2006 sreeves@suse.de - Update .desktop file (Name, GenericName, Comment, DocPath) * Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires @@ -225,7 +215,7 @@ rm -rf $RPM_BUILD_ROOT - removed wrong docdir * Fri Sep 27 2002 ro@suse.de - Added alsa alsa-devel to neededforbuild (esound) -* Fri Jul 26 2002 adrian@suse.de +* Sat Jul 27 2002 adrian@suse.de - fix neededforbuild * Tue May 28 2002 ro@suse.de - removed gpc from neededforbuild diff --git a/ghex_60921.diff b/ghex_60921.diff deleted file mode 100644 index 2e988f9..0000000 --- a/ghex_60921.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- ghex-2.6.0/src/ghex-ui.xml 2004-06-30 16:06:33.897483696 +0530 -+++ ghex-2.6.0-wc/src/ghex-ui.xml 2004-06-30 16:08:36.519842264 +0530 -@@ -204,7 +204,7 @@ - - - -+ _label="Character _Table"/> - - - diff --git a/ghex_60922.diff b/ghex_60922.diff deleted file mode 100644 index 9bcfdb4..0000000 --- a/ghex_60922.diff +++ /dev/null @@ -1,23 +0,0 @@ ---- ghex-2.6.0/src/ghex-ui.xml 2004-06-30 16:06:33.000000000 +0530 -+++ ghex-2.6.0-wc/src/ghex-ui.xml 2004-07-01 11:17:23.060415376 +0530 -@@ -149,8 +149,8 @@ - - - -- -- -+ -+ - - - -@@ -158,7 +158,7 @@ - - - -- -+ - - - -