Hello community,
here is the log from the commit of package ghex
checked in at Wed Jan 10 23:37:03 CET 2007.
--------
--- GNOME/ghex/ghex.changes 2006-09-19 19:00:20.000000000 +0200
+++ /mounts/work_src_done/STABLE/ghex/ghex.changes 2007-01-03 18:31:56.000000000 +0100
@@ -1,0 +2,7 @@
+Wed Jan 3 18:08:18 CET 2007 - sbrabec@suse.cz
+
+- Prefix changed to /usr.
+- Spec file cleanup.
+- Created ghex-devel subpackage.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghex.spec ++++++
--- /var/tmp/diff_new_pack.q32350/_old 2007-01-10 23:36:52.000000000 +0100
+++ /var/tmp/diff_new_pack.q32350/_new 2007-01-10 23:36:52.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ghex (Version 2.8.2)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -12,23 +12,23 @@
Name: ghex
BuildRequires: gail-devel gnome-common gnutls-devel intltool kdelibs3-doc libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel mDNSResponder-devel perl-XML-Parser update-desktop-files
-%define prefix /opt/gnome
-%define sysconfdir /etc%{prefix}
-License: GPL
+# FIXME: only for directory ownership:
+BuildRequires: scrollkeeper
+License: GNU General Public License (GPL)
Group: Development/Tools/Other
-PreReq: filesystem gconf2
-Autoreqprov: on
Version: 2.8.2
-Release: 1
+Release: 37
Summary: GNOME Binary Editor
URL: http://www.gnome.org/
-Source: ftp://ftp.gnome.org/pub/GNOME/sources/ghex/2.8/ghex-%{version}.tar.bz2
+Source: ftp://ftp.gnome.org/pub/GNOME/sources/ghex/2.8/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Patch: ghex_59873.diff
Patch4: ghex_60921.diff
Patch5: ghex_60922.diff
Patch6: ghex-search-crash.patch
-Requires: gtk2-devel gail-devel atk-devel
+Autoreqprov: on
+
+%gconf_schemas_prereq
%description
GHex allows the user to load data from any file and to view and edit it
@@ -42,6 +42,23 @@
Jaka Mocnik
Chema Celorio
+%package devel
+Summary: GNOME Binary Editor
+Group: Development/Tools/Other
+Requires: %{name} = %{version} gtk2-devel gail-devel atk-devel
+
+%description devel
+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
+
%prep
%setup -n ghex-%{version}
%patch -p1
@@ -57,63 +74,68 @@
' po/*.po
%build
-rename no nb po/no.*
-sed "s/\(ALL_LINGUAS.*\) no /\1 nb /" configure.in > configure.in.tmp && mv configure.in.tmp configure.in
-%{?suse_update_config:%{suse_update_config -f}}
-libtoolize -f
-autoreconf -f
-CFLAGS="$RPM_OPT_FLAGS" \
-LIBS=-L/usr/X11R6/lib \
- ./configure \
- --prefix=%prefix \
- --libdir=%prefix/%_lib \
- --sysconfdir=%sysconfdir \
- --datadir=%prefix/share \
- --localstatedir=/var/lib
-make
+rm po/no.*
+sed -i "s/\(ALL_LINGUAS.*\) no /\1 /" configure.in
+autoreconf -f -i
+# FIXME: Build as root modifies system!
+# ghex-2.8.2: --disable-schemas-install is not implemented.
+%configure\
+ --disable-scrollkeeper\
+ --disable-schemas-install
+make %{?jobs:-j%jobs}
%install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-%find_lang ghex-2.0
%suse_update_desktop_file -N GHex -G "Hex Editor" -D ghex2 %name Utility Editor
-sed -e "s@;Development;@;@" < $RPM_BUILD_ROOT%{prefix}/share/applications/ghex.desktop \
- > $RPM_BUILD_ROOT%{prefix}/share/applications/ghex.desktop.new
-mv $RPM_BUILD_ROOT%{prefix}/share/applications/ghex.desktop.new \
- $RPM_BUILD_ROOT%{prefix}/share/applications/ghex.desktop
-for xml in $RPM_BUILD_ROOT%{prefix}/share/gnome/help/ghex2/*/ghex2.xml; do
+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
+for xml in $RPM_BUILD_ROOT%{_datadir}/gnome/help/ghex2/*/ghex2.xml; do
meinproc --check --cache `echo $xml | sed 's/xml$/cache.bz2/'` $xml || :
done
+%find_lang %{name}-2.0
+%find_lang %{name}2
+%find_gconf_schemas
+cat %{name}-2.0.lang %{name}2.lang %{name}.schemas_list >%{name}.lst
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%pre -f %{name}.schemas_pre
%post
%run_ldconfig
-export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/ghex2.schemas >/dev/null
+
+%posttrans -f %{name}.schemas_posttrans
+
+%preun -f %{name}.schemas_preun
%postun
%run_ldconfig
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files -f ghex-2.0.lang
+%files -f %{name}.lst
%defattr(-,root,root)
%doc README COPYING COPYING-DOCS AUTHORS
-%{sysconfdir}/gconf/schemas/ghex2.schemas
-%{prefix}/bin/*
-%{prefix}/%_lib/*.so.*
-%{prefix}/%_lib/*.so
-%{prefix}/%_lib/*.*a
-%{prefix}/%_lib/pkgconfig/*.pc
-%{prefix}/include/*
-%{prefix}/share/applications/*.desktop
-%{prefix}/share/gnome/help/*
-%{prefix}/share/gnome-2.0/ui/*.xml
-%{prefix}/share/pixmaps/*.png
-%{prefix}/share/omf/*
+%{_bindir}/*
+%{_libdir}/*.so.*
+%{_datadir}/applications/*.desktop
+%{_datadir}/gnome-2.0/ui/*.xml
+%{_datadir}/pixmaps/*.png
+%{_datadir}/omf/*
+
+%files devel
+%defattr(-,root,root)
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/*.*a
+%{_libdir}/pkgconfig/*.pc
%changelog -n ghex
+* 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
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org