Accepting request 81160 from home:vuntz:branches:GNOME:Apps

Update to 2.90.2

OBS-URL: https://build.opensuse.org/request/show/81160
OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/ghex?expand=0&rev=9

ghex.spec

@@ -18,14 +18,14 @@
 
 
 Name:           ghex
-Version:        2.90.1
+Version:        2.90.2
 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
+# PATCH-FIX-UPSTREAM ghex-empty-search-crash.patch bgo#473208
 Patch7:         ghex-empty-search-crash.patch
 BuildRequires:  fdupes
 BuildRequires:  gnome-doc-utils-devel
@@ -45,14 +45,21 @@ 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.
 
+%package -n libgtkhex-3-0
+License:        GPLv2+
+Summary:        GNOME Binary Editor -- Library
+Group:          System/Libraries
+
+%description -n libgtkhex-3-0
+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.
+
 %package devel
 License:        GPLv2+
-Summary:        GNOME Binary Editor
-Group:          Development/Tools/Other
-Requires:       %{name} = %{version}
-Requires:       atk-devel
-Requires:       gail-devel
-Requires:       gtk2-devel
+Summary:        GNOME Binary Editor -- Development Files
+Group:          Development/Libraries/GNOME
+Requires:       libgtkhex-3-0 = %{version}
 
 %description devel
 GHex allows the user to load data from any file and to view and edit it
@@ -75,13 +82,7 @@ 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;@;@" < %{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
+%suse_update_desktop_file -r %name GNOME Utility Editor
 %find_lang %{name}-3.0 %{?no_lang_C}
 %find_lang %{name} ghex-3.0.lang %{?no_lang_C}
 %fdupes -s %{buildroot}
@@ -90,7 +91,6 @@ mv %{buildroot}%{_datadir}/locale/sr@Latn %{buildroot}%{_datadir}/locale/sr@lati
 rm -rf %{buildroot}
 
 %post
-/sbin/ldconfig
 %if 0%{?suse_version} > 1130
 %desktop_database_post
 %icon_theme_cache_post
@@ -98,20 +98,20 @@ rm -rf %{buildroot}
 %endif
 
 %postun
-/sbin/ldconfig
 %if 0%{?suse_version} > 1130
 %desktop_database_postun
 %icon_theme_cache_postun
 %glib2_gsettings_schema_postun
 %endif
 
-%files lang -f %{name}-3.0.lang
+%post -n libgtkhex-3-0 -p /sbin/ldconfig
+
+%postun -n libgtkhex-3-0 -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
 %doc README COPYING COPYING-DOCS AUTHORS
 %{_bindir}/ghex
-%{_libdir}/libgtkhex-3.so.*
 %{_datadir}/applications/ghex.desktop
 %dir %{_datadir}/GConf
 %dir %{_datadir}/GConf/gsettings
@@ -121,7 +121,11 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/
 %dir %{_datadir}/gnome/help/%{name}
 %doc %{_datadir}/gnome/help/%{name}/C/
-%{_datadir}/omf/%{name}/%{name}-C.omf
+%doc %{_datadir}/omf/%{name}/%{name}-C.omf
+
+%files -n libgtkhex-3-0
+%defattr(-,root,root)
+%{_libdir}/libgtkhex-3.so.*
 
 %files devel
 %defattr(-,root,root)
@@ -129,4 +133,6 @@ rm -rf %{buildroot}
 %{_libdir}/libgtkhex-3.so
 %{_libdir}/pkgconfig/gtkhex-3.pc
 
+%files lang -f %{name}-3.0.lang
+
 %changelog