From 5c1a0f563868f431cc4e7aa8911adb4d854a9a5b25691fe5413562b21a1de03d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 11 Aug 2011 19:25:39 +0000 Subject: [PATCH] Accepting request 78151 from home:dimstar:branches:GNOME:Apps Update to 2.90.0 OBS-URL: https://build.opensuse.org/request/show/78151 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/ghex?expand=0&rev=5 --- ghex-2.24.0.tar.bz2 | 3 -- ghex-2.90.0.tar.bz2 | 3 ++ ghex.changes | 41 ++++++++++++++++++++++++ ghex.spec | 78 +++++++++++++++++++++++---------------------- 4 files changed, 84 insertions(+), 41 deletions(-) delete mode 100644 ghex-2.24.0.tar.bz2 create mode 100644 ghex-2.90.0.tar.bz2 diff --git a/ghex-2.24.0.tar.bz2 b/ghex-2.24.0.tar.bz2 deleted file mode 100644 index 07f57ba..0000000 --- a/ghex-2.24.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:df0e1a01472a99b9e94236ab1200108e10829d99c030f8422288323448762e2e -size 1272557 diff --git a/ghex-2.90.0.tar.bz2 b/ghex-2.90.0.tar.bz2 new file mode 100644 index 0000000..0ecbee3 --- /dev/null +++ b/ghex-2.90.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a73b05cedca2c4a4271de72666ce0df2cb6af87e2a844bda5c7fe7a7960909d +size 1484215 diff --git a/ghex.changes b/ghex.changes index c908bfc..e2c4a3c 100644 --- a/ghex.changes +++ b/ghex.changes @@ -1,3 +1,44 @@ +------------------------------------------------------------------- +Fri Aug 5 20:51:00 CEST 2011 - dimstar@opensuse.org + +- Update to version 2.90.0: + + Changes for GNOME 3 support: + - Port from poptOption to GOptionEntry + - Replace deprecated GTK+ symbols + - Remove libgnome and libgnomeui dependency + - Use Gio instead GnomeVfs + - Replace Gdk drawing with Cairo + - Port from BonoboUI to GtkUIManager + - Remove custom print widgets + - Port from libgnomeprint to GtkPrint + - Port to GTK+ 3 + - Rename the shared libray for parallel installability + + New Features and UI Improvements: + - Improve About dialog + - Add relative offset jumping with + and - in 'Go to Byte' + - Use double buffering for drawing, reducing flicker + + Bug fixes: + - Convert po files to UTF-8 + - Fix various compiler warnings + - Fix xsltproc warnings + - Fix the order of LDADD + - Fix build with stricter linker on latest Fedora + - Fix gnome-doc-utils support + - Modernize autotools configuration + - Use upstream gettext instead the glib one + - Fix regression with close on save confirmation + - Avoid showing status message on an already destroyed window + - Update overview when deleting a character with the 'DEL' key + + Bugs fixed: bgo#333819, bgo#445053, bgo#508563, bgo#547882, + bgo#548438, bgo#570688, bgo#571892, bgo#584006, bgo#590995, + bgo#590996, bgo#597683, bgo#597684, bgo#597685, bgo#597687, + bgo#597688, bgo#608275, bgo#608284, bgo#609277, bgo#609548, + bgo#612693, bgo#612885, bgo#630377. + + Updated translations. +- Remove libgnomeui-devel and libgnomeprintui-devel BuildRequires. +- Add pkgconfig(atk), pkgconfig(gail-3.0), pkgconfig(gconf-2.0), + pkgconfig(gio-2.0) and pkgconfig(gtk+-3.0) BuildRequires. + ------------------------------------------------------------------- Sat Feb 12 17:43:30 CET 2011 - vuntz@opensuse.org diff --git a/ghex.spec b/ghex.spec index 2fab5b6..6fce2ac 100644 --- a/ghex.spec +++ b/ghex.spec @@ -15,28 +15,30 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: ghex +Version: 2.90.0 +Release: 1 +License: GPLv2+ +Summary: GNOME Binary Editor +Url: http://www.gnome.org/ +Group: Development/Tools/Other +Source: http://download.gnome.org/sources/ghex/2.90/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM ghex-empty-search-crash.patch bgo532184 +Patch7: ghex-empty-search-crash.patch BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel BuildRequires: intltool -BuildRequires: libgnomeprintui-devel -BuildRequires: libgnomeui-devel +BuildRequires: pkgconfig(atk) >= 1.0.0 +BuildRequires: pkgconfig(gail-3.0) +BuildRequires: pkgconfig(gconf-2.0) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gtk+-3.0) >= 3.0 BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -License: GPLv2+ -Group: Development/Tools/Other -Version: 2.24.0 -Release: 9 -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 -# PATCH-FIX-UPSTREAM ghex-empty-search-crash.patch bgo532184 -Patch7: ghex-empty-search-crash.patch Recommends: %{name}-lang +BuildRoot: %{_tmppath}/%{name}-%{version}-build %gconf_schemas_prereq %description @@ -48,7 +50,10 @@ a non-ASCII format for saving. License: GPLv2+ Summary: GNOME Binary Editor Group: Development/Tools/Other -Requires: %{name} = %{version} gtk2-devel gail-devel atk-devel +Requires: %{name} = %{version} +Requires: atk-devel +Requires: gail-devel +Requires: gtk2-devel %description devel GHex allows the user to load data from any file and to view and edit it @@ -66,26 +71,25 @@ translation-update-upstream --disable-static\ --disable-scrollkeeper\ --disable-schemas-install -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install %makeinstall +find %{buildroot}%{_libdir} -name "*.la" -type f -delete -print %suse_update_desktop_file -N GHex -G "Hex Editor" %name Utility Editor -sed -e "s@;Development;@;@" < $RPM_BUILD_ROOT%{_datadir}/applications/ghex.desktop \ - > $RPM_BUILD_ROOT%{_datadir}/applications/ghex.desktop.new -mv $RPM_BUILD_ROOT%{_datadir}/applications/ghex.desktop.new \ - $RPM_BUILD_ROOT%{_datadir}/applications/ghex.desktop +sed -e "s@;Development;@;@" < %{buildroot}%{_datadir}/applications/ghex.desktop \ + > %{buildroot}%{_datadir}/applications/ghex.desktop.new +mv %{buildroot}%{_datadir}/applications/ghex.desktop.new \ + %{buildroot}%{_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 %{?no_lang_C} -%find_lang %{name}2 %{?no_lang_C} +%find_lang %{name}-3.0 %{?no_lang_C} +%find_lang %{name} ghex-3.0.lang %{?no_lang_C} %find_gconf_schemas -cat %{name}-2.0.lang %{name}2.lang > %{name}.lang -%{__rm} -vf %{buildroot}%{_libdir}/*.la -%fdupes -s $RPM_BUILD_ROOT +%fdupes -s %{buildroot} %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %pre -f %{name}.schemas_pre @@ -107,25 +111,23 @@ rm -rf $RPM_BUILD_ROOT %icon_theme_cache_postun %endif +%files lang -f %{name}-3.0.lang %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 -%{_datadir}/gnome-2.0/ui/*.xml +%{_bindir}/ghex +%{_libdir}/libgtkhex-3.so.* +%{_datadir}/applications/ghex.desktop %{_datadir}/icons/hicolor/*/apps/ghex.* - -%files lang -f %{name}.lang +%{_datadir}/%{name}/ +%dir %{_datadir}/gnome/help/%{name} +%doc %{_datadir}/gnome/help/%{name}/C/ +%{_datadir}/omf/%{name}/%{name}-C.omf %files devel %defattr(-,root,root) -%{_includedir}/* -%{_libdir}/*.so -%{_libdir}/pkgconfig/*.pc +%{_includedir}/gtkhex-3/ +%{_libdir}/libgtkhex-3.so +%{_libdir}/pkgconfig/gtkhex-3.pc %changelog