diff --git a/.gitignore b/.gitignore index 687b7ba..5e64efd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ ghex-2.22.0.tar.bz2 ghex-2.24.0.tar.bz2 +/ghex-2.90.0.tar.xz diff --git a/ghex.spec b/ghex.spec index cc53b78..cb5d919 100644 --- a/ghex.spec +++ b/ghex.spec @@ -1,19 +1,17 @@ Name: ghex -Version: 2.24.0 -Release: 5%{?dist} +Version: 2.90.0 +Release: 1%{?dist} Summary: Binary editor for GNOME Group: Applications/Editors License: GPLv2+ URL: http://ftp.gnome.org/pub/GNOME/sources/ghex/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/ghex/2.24/ghex-%{version}.tar.bz2 -Patch1: ghex2-no-as-needed-patch.txt +Source0: http://ftp.gnome.org/pub/GNOME/sources/ghex/2.90/ghex-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libgnomeui-devel -BuildRequires: libgnomeprintui22-devel -BuildRequires: gail-devel +BuildRequires: gtk3-devel +BuildRequires: GConf2-devel BuildRequires: gettext BuildRequires: desktop-file-utils BuildRequires: scrollkeeper @@ -37,15 +35,13 @@ non-ascii format for saving. Summary: Static library and include files for ghex Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: gtk2-devel -Requires: gail-devel +Requires: gtk3-devel %description devel This package contains a static library and include files for ghex. %prep %setup -q -%patch1 -p1 %build %configure --disable-schemas-install --disable-static @@ -66,7 +62,7 @@ desktop-file-install \ --add-category X-Fedora \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop -%find_lang %{name}-2.0 +%find_lang %{name}-3.0 %clean @@ -87,26 +83,33 @@ gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schem scrollkeeper-update -q -%files -f %{name}-2.0.lang +%files -f %{name}-3.0.lang %defattr(-,root,root,-) %doc AUTHORS COPYING COPYING-DOCS ChangeLog README %{_sysconfdir}/gconf/schemas/* %{_bindir}/* %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/gnome/help/* -%{_datadir}/gnome-2.0/ui/* %{_datadir}/icons/hicolor/*/apps/* +%{_datadir}/%{name}/ +%{_datadir}/%{name}/ghex-ui.xml +%{_datadir}/omf/%{name}/ +%{_datadir}/omf/%{name}/* %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) -%{_includedir}/gtkhex +%{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %exclude %{_libdir}/*.a %changelog +* Sat Aug 13 2011 Adel Gadllah - 2.90.0-1 +- Update to 2.90.0 - now uses GTK3 +- Remove now obsolete patch + * Tue Feb 09 2010 Dodji Seketeli - 2.24.0-5 - Add patch to fix building with --no-as-needed as linker option. diff --git a/ghex2-no-as-needed-patch.txt b/ghex2-no-as-needed-patch.txt deleted file mode 100644 index e8436d4..0000000 --- a/ghex2-no-as-needed-patch.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- ghex-2.24.0/src/Makefile.in.orig 2010-02-09 13:52:26.298000048 +0100 -+++ ghex-2.24.0/src/Makefile.in 2010-02-09 13:52:44.437000108 +0100 -@@ -77,7 +77,7 @@ - gnome-print-font-picker.$(OBJEXT) factory.$(OBJEXT) \ - hex-dialog.$(OBJEXT) - ghex2_OBJECTS = $(am_ghex2_OBJECTS) --ghex2_LDADD = $(LDADD) -+ghex2_LDADD = -lm $(LDADD) - ghex2_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - libgtkhex.la - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) diff --git a/sources b/sources index 91e12b7..bd111c2 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -6f1ee7a56f7dd04bfba5ee74a639948a ghex-2.22.0.tar.bz2 -982b2a4e70e80d2166bcc782e989889c ghex-2.24.0.tar.bz2 +27fd4c83ea57005998fd7cd1d7c55dd5 ghex-2.90.0.tar.xz