commit gjiten for openSUSE:Factory
Hello community, here is the log from the commit of package gjiten for openSUSE:Factory checked in at 2012-02-29 14:06:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gjiten (Old) and /work/SRC/openSUSE:Factory/.gjiten.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gjiten", Maintainer is "DMZhang@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/gjiten/gjiten.changes 2011-10-16 12:49:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gjiten.new/gjiten.changes 2012-02-29 14:06:56.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Feb 15 17:27:13 CET 2012 - tiwai@suse.de + +- clean up spec file: fix Makefile.am to build properly, remove + obsoleted suse macro +- Enable parallel builds + +------------------------------------------------------------------- New: ---- gjiten-automake-fix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gjiten.spec ++++++ --- /var/tmp/diff_new_pack.Vsl6u0/_old 2012-02-29 14:06:57.000000000 +0100 +++ /var/tmp/diff_new_pack.Vsl6u0/_new 2012-02-29 14:06:57.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gjiten # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,24 +15,29 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: gjiten -BuildRequires: edict intltool libglade2-devel libgnomeui-devel libtool libxslt perl-XML-Parser -BuildRequires: scrollkeeper sgml-skel update-desktop-files w3m xmlto +BuildRequires: edict +BuildRequires: intltool +BuildRequires: libglade2-devel +BuildRequires: libgnomeui-devel +BuildRequires: libtool +BuildRequires: libxslt +BuildRequires: perl-XML-Parser +BuildRequires: scrollkeeper +BuildRequires: sgml-skel +BuildRequires: update-desktop-files +BuildRequires: w3m +BuildRequires: xmlto %if 0%{?suse_version} >= 1130 BuildRequires: libgnome-keyring-devel %else BuildRequires: gnome-keyring-devel %endif -License: GPL-2.0+ -Group: Productivity/Office/Dictionary Requires: edict -AutoReqProv: on Provides: locale(libgnome:ja) Version: 2.6 -Release: 222 +Release: 0 Url: http://gjiten.sourceforge.net/ # CVS version is here: # cvs -d:pserver:anonymous@gjiten.cvs.sourceforge.net:/cvsroot/gjiten login @@ -45,8 +50,11 @@ Patch4: schemas.patch Patch5: skip-validation.patch Patch348100: bugzilla-348100-empty-radicals-window.patch +Patch6: gjiten-automake-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Japanese Dictionary Browser for GNOME/GTK+ +License: GPL-2.0+ +Group: Productivity/Office/Dictionary %define gnome_prefix %(pkg-config --variable=prefix libgnomeui-2.0) %if "%gnome_prefix" == "/usr" %define gnome_etc /etc @@ -77,16 +85,9 @@ %patch4 -p1 %patch5 -p1 %patch348100 -p1 +%patch6 -p1 %build -rm -f config.cache -# update config.{guess,sub} -%{?suse_update_config} -if [ ! -f README ] ; then - touch README # for autoconf -fi -#libtoolize --force -#autoreconf -I /opt/gnome/share/aclocal --force --install --verbose export CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%{gnome_prefix} \ --mandir=%{_mandir} \ @@ -94,7 +95,7 @@ --with-gnome=%{gnome_prefix} \ --with-gconf-schema-file-dir=%{gnome_etc}/gconf/schemas \ %{_target_cpu}-suse-linux -make +make %{?_smp_mflags} %install make DESTDIR=$RPM_BUILD_ROOT install ++++++ gjiten-automake-fix.diff ++++++ --- Makefile.am | 1 + 1 file changed, 1 insertion(+) --- a/Makefile.am +++ b/Makefile.am @@ -7,3 +7,4 @@ intltool-extract.in intltool-merge intltool-merge.in intltool-update intltool-update.in \ ltmain.sh missing mkinstalldirs config.h.in po/*stamp* *stamp* +AUTOMAKE_OPTIONS = foreign -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de