rpms/gwaei/F-12 gwaei-1.3.0-autogen.sh, NONE, 1.1 gwaei-1.3.0-gnomehelp-conditional.patch, NONE, 1.1 gwaei.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Thu Apr 8 21:29:28 UTC 2010

Author: uggla

Update of /cvs/pkgs/rpms/gwaei/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6401/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	gwaei-1.3.0-autogen.sh gwaei-1.3.0-gnomehelp-conditional.patch 
	gwaei.spec import.log 
Log Message:
 Thu Apr 08 2010 René Ribaud <rene.ribaud at free.fr> - 1.3.0-3
- import into Fedora CVS.

--- NEW FILE gwaei-1.3.0-autogen.sh ---
#! /bin/sh

gnome-doc-prepare -c -f \
&& aclocal \
&& autoheader -f \
&& automake -c -f --add-missing \
&& autoconf -f

gwaei-1.3.0-gnomehelp-conditional.patch:
 configure.ac     |    3 +--
 help/Makefile.am |    4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE gwaei-1.3.0-gnomehelp-conditional.patch ---
--- gwaei-1.3.0/configure.ac.HELP	2010-02-18 09:49:37.000000000 +0900
+++ gwaei-1.3.0/configure.ac	2010-03-30 02:27:32.000000000 +0900
@@ -130,8 +130,7 @@
 AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION(0.17)
 
-if([test x$gnome = xfalse]);then([cp help/Makefile.am.gnome help/Makefile.am]);fi
-if([test x$gnome = xtrue]);then([cp help/Makefile.am.none help/Makefile.am]);fi
+AM_CONDITIONAL(MAKE_GNOMEHELP, test x$gnome = xfalse)
 
 AC_CONFIG_FILES([Makefile src/Makefile mandir/Makefile help/Makefile help/gwaei.omf help/C/gwaei.xml src/xml/Makefile src/img/Makefile src/schemas/Makefile src/desktop/Makefile src/kpengine/Makefile src/kpengine/conv_jdata.pl rpm/gwaei.spec po/Makefile.in rpm/rpm_gconf_install_post.sh rpm/rpm_gconf_uninstall_pre.sh src/schemas/gwaei.schemas src/include/gwaei/definitions.h] Doxyfile)
 AC_OUTPUT
--- gwaei-1.3.0/help/Makefile.am.HELP	2010-03-20 09:13:30.000000000 +0900
+++ gwaei-1.3.0/help/Makefile.am	2010-03-30 02:29:20.000000000 +0900
@@ -3,6 +3,8 @@
 datadir = @datadir@
 
 
+if MAKE_GNOMEHELP
+
 include $(top_srcdir)/gnome-doc-utils.make
 dist-hook: doc-dist-hook
 DOC_MODULE = gwaei
@@ -20,4 +22,4 @@
 	@ rm -rf Makefile
 	@ rm -rf gwaei.omf
 	@ rm -rf gwaei-C.omf
-
+endif


--- NEW FILE gwaei.spec ---
Summary:   A Japanese dictionary for Gnome
Name:      gwaei
Version:   1.3.0
Release:   3%{?dist}
License:   GPLv2+
Group:     Applications/Productivity
URL:       http://gwaei.sourceforge.net/
Source0:   http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1:   %{name}-%{version}-autogen.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: GConf2
BuildRequires: gettext
BuildRequires: gettext-devel
BuildRequires: libcurl-devel
BuildRequires: libgnomeui-devel
BuildRequires: libsexy-devel
BuildRequires: ncurses-devel
BuildRequires: unique-devel
BuildRequires: gnome-doc-utils
BuildRequires: desktop-file-utils
BuildRequires: rarian-compat
Requires: vlgothic-fonts
Requires(pre): GConf2
Requires(post): GConf2
Requires(preun): GConf2
Patch0: gwaei-1.3.0-gnomehelp-conditional.patch


%description
gWaei is an easy to use and yet powerful full-featured dictionary program
for Japanese to English translation.
It organizes results by relevance, supports regexp searches, tabs,
spell checking, kanji handwriting recognition and an accompanying console
version for searches through the terminal.

The dictionary files it uses are from Jim Breen's WWWJDIC project and
are installed separately through the program.


%prep
%setup -q
cp %{SOURCE1} ./autogen.sh
chmod +x autogen.sh
%patch0 -p1 -b .gnomehelp-conditional.patch
./autogen.sh


%build
%configure --disable-schemas-install
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
rm -rf %{buildroot}/%{_datadir}/doc/%{name}  # Fix to correct documentation path
%find_lang %{name}
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%pre
%gconf_schema_prepare %{name}


%post
# Gconf
%gconf_schema_upgrade %{name}

# Icons
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :


%preun
%gconf_schema_remove %{name}


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi


%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS THANKS ChangeLog COPYING NEWS
%{_libdir}/%{name}
%{_bindir}/gwaei
%{_bindir}/waei
%{_datadir}/applications/%{name}.desktop
%{_datadir}/%{name}
%{_datadir}/omf/%{name}
%{_datadir}/icons/hicolor/*/apps/*.png
%{_datadir}/icons/hicolor/*/actions/*.png
%{_datadir}/gnome/help/%{name}
%{_datadir}/man/man*/*.gz
%{_sysconfdir}/gconf/schemas/%{name}.schemas


%changelog
* Sat Apr 04 2010 René Ribaud <rene.ribaud at free.fr> - 1.3.0-3
- Corrections after Mamoru Tasaka's review #2 of this new package.
- Fix link to the source file.
- Fix autogen.sh to call tools correctly and add autoheader.
- Fix configure.ac and help/Makefile.am to avoid autotool called
  automaticaly, thanks to Mamoru's patch.

* Sat Mar 28 2010 René Ribaud <rene.ribaud at free.fr> - 1.3.0-2
- Corrections after Mamoru Tasaka's review of this new package.
- Add autogen script from git to fix automake building error.
- Use new Gconf macros.
- Fix icon cache.
- Fix documentation path.

* Sat Mar 21 2010 René Ribaud <rene.ribaud at free.fr> - 1.3.0-1
- New package with gwaei 1.3.0 release.
- This release corrects segfaults installing dictionnaries with F13.

* Sat Feb 19 2010 René Ribaud <rene.ribaud at free.fr> - 1.2.1-5
- Corrections after first Fedora review by Mamoru Tasaka.

* Sat Feb 13 2010 René Ribaud <rene.ribaud at free.fr> - 1.2.1-4
- Add blank lines in changelog.

* Sat Feb 11 2010 René Ribaud <rene.ribaud at free.fr> - 1.2.1-3
- Add proposed modifications from Fedora-Fr community second review.

* Sat Feb 06 2010 René Ribaud <rene.ribaud at free.fr> - 1.2.1-2
- Lots of corrections based on Fedora-Fr community rpm first review

* Sat Jan 30 2010 René Ribaud <rene.ribaud at free.fr> - 1.2.1-1
- Initial build


--- NEW FILE import.log ---
gwaei-1_3_0-3_fc12:F-12:gwaei-1.3.0-3.fc12.src.rpm:1270762129


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gwaei/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Apr 2010 02:49:50 -0000	1.1
+++ .cvsignore	8 Apr 2010 21:29:27 -0000	1.2
@@ -0,0 +1 @@
+gwaei-1.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gwaei/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Apr 2010 02:49:50 -0000	1.1
+++ sources	8 Apr 2010 21:29:27 -0000	1.2
@@ -0,0 +1 @@
+45c026be1c4c3b4876afe96782d80aa5  gwaei-1.3.0.tar.gz

