rpms/nabi/devel nabi.spec, 1.8, 1.9 sources, 1.4, 1.5 xinput.d-nabi, 1.4, 1.5 nabi-makefile.patch, 1.1, NONE theme-removal.sh, 1.1, NONE

[Jens Petersen]

Author: petersen

Update of /cvs/extras/rpms/nabi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22118

Modified Files:
	nabi.spec sources xinput.d-nabi 
Removed Files:
	nabi-makefile.patch theme-removal.sh 
Log Message:
- update to 0.99.2 release
- no longer need nabi-makefile.patch and theme-removal.sh
- add icon to xinput conf




Index: nabi.spec
===================================================================
RCS file: /cvs/extras/rpms/nabi/devel/nabi.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nabi.spec	15 Feb 2008 11:34:38 -0000	1.8
+++ nabi.spec	28 Oct 2008 09:53:49 -0000	1.9
@@ -1,32 +1,20 @@
 Summary: Hangul X Input Method
 Name: nabi
-Version: 0.18
-Release: 9%{?dist}
+Version: 0.99.2
+Release: 1%{?dist}
 
 Group: User Interface/X
 License: GPLv2+
 URL: http://nabi.kldp.net/
-Source0: nabi-%{version}_fedora.tar.gz
-
-# The upstream tarball
-# http://download.kldp.net/%{name}/Nabi/%{version}/%{name}-%{version}.tar.gz
-# currently contains some themes with images based on propriety desktops.
-# Hence, we use the following script to remove them before shipping.
-# Download the upstream tarball and invoke this script while in the
-# tarball directory:
-# ./theme-removal.sh %{version}
-# (Upstream will probably remove the said themes from a feature release.)
-
-Source1: theme-removal.sh
-Source2: xinput.d-%{name}
-Patch0: nabi-makefile.patch
+Source0: http://download.kldp.net/%{name}/Nabi/%{version}/%{name}-%{version}.tar.gz
+Source1: xinput.d-%{name}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gtk2-devel >= 2.2.0
-BuildRequires: libhangul-devel >= 0.0.6
+BuildRequires: libhangul-devel >= 0.0.8
 BuildRequires: gettext, desktop-file-utils
 
-Requires:      libhangul >= 0.0.6
+Requires:      libhangul >= 0.0.8
 Requires:      im-chooser
 Requires(post): %{_sbindir}/alternatives
 Requires(preun): %{_sbindir}/alternatives
@@ -36,12 +24,9 @@
 It shows its status in the notification area.
 
 %prep
-%setup -q -n %{name}-%{version}_fedora
-%patch0 -p0
+%setup -q
 
 %build
-aclocal
-automake
 %configure
 make %{?_smp_mflags}
 
@@ -49,7 +34,7 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT 
 mkdir -p 644 $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d
-install -D -m 644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}
+install -D -m 644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}
 
 %find_lang %{name}
 
@@ -73,6 +58,11 @@
 
 
 %changelog
+* Tue Oct 28 2008 Jens Petersen <petersen at redhat.com> - 0.99.2-1
+- update to 0.99.2 release
+- no longer need nabi-makefile.patch and theme-removal.sh
+- add icon to xinput conf
+
 * Fri Feb 15 2008 Subhransu Behera <sbehera at redhat.com> - 0.18-9
 - Resolved bug # 432594
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nabi/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Sep 2007 06:27:48 -0000	1.4
+++ sources	28 Oct 2008 09:53:49 -0000	1.5
@@ -1 +1 @@
-9e01930256f1b2540088ec118d7b9f4a  nabi-0.18_fedora.tar.gz
+e70530790df83302b7875eacd5227de0  nabi-0.99.2.tar.gz


Index: xinput.d-nabi
===================================================================
RCS file: /cvs/extras/rpms/nabi/devel/xinput.d-nabi,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xinput.d-nabi	5 Feb 2008 11:05:24 -0000	1.4
+++ xinput.d-nabi	28 Oct 2008 09:53:49 -0000	1.5
@@ -1,3 +1,4 @@
 XIM=nabi
 XIM_PROGRAM=/usr/bin/nabi
+ICON=/usr/share/nabi/nabi.svg
 GTK_IM_MODULE=xim


--- nabi-makefile.patch DELETED ---


--- theme-removal.sh DELETED ---