rpms/xcin/devel xcin.spec,1.3,1.4

[Warren Togami (wtogami)]

Author: wtogami

Update of /cvs/extras/rpms/xcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32685

Modified Files:
	xcin.spec 
Log Message:
- fix BuildReqs
- macroize stuff and other fixes



Index: xcin.spec
===================================================================
RCS file: /cvs/extras/rpms/xcin/devel/xcin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xcin.spec	21 Mar 2005 03:05:20 -0000	1.3
+++ xcin.spec	21 Mar 2005 04:23:52 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: An X Input Method Server for Chinese.
 Name: xcin
 Version: 2.5.3.pre3
-Release: 25
+Release: 26
 License: GPL
 Group: User Interface/X
 Source0: ftp://xcin.linux.org.tw/pub/xcin/xcin/%{name}-%{version}.tar.gz
@@ -11,11 +11,14 @@
 Source5: xinput.d-%{name}
 Patch0: xcin-2.5.3-mkuserdir.patch
 Patch1:  xcin-2.5.3-no_rpath.patch
-BuildRequires: libtabe >= 0.2.4a
-Requires: libtabe >= 0.2.4a
-Requires(post,preun): /usr/sbin/alternatives
-BuildPrereq: db4-devel,libtabe-devel
 Buildroot: %{_tmppath}/%{name}-buildroot
+Requires(post): /usr/sbin/alternatives
+Requires(preun): /usr/sbin/alternatives
+BuildRequires: db4-devel
+BuildRequires: libtabe-devel >= 0.2.4a
+BuildRequires: libtool
+BuildRequires: xorg-x11-devel
+BuildRequires: gettext
 
 %description
 An X Input Method Server for Chinese.
@@ -37,14 +40,14 @@
 
 
 %build
-cp /usr/share/libtool/config.sub $RPM_BUILD_DIR/%{name}/script/
-cp /usr/share/libtool/config.guess $RPM_BUILD_DIR/%{name}/script/
+cp %{_datadir}/libtool/config.sub $RPM_BUILD_DIR/%{name}/script/
+cp %{_datadir}/libtool/config.guess $RPM_BUILD_DIR/%{name}/script/
 CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" ./configure \
-	--prefix=/usr/X11R6 --libdir=/usr/X11R6/%{_lib} \
-        --with-xcin-dir=/usr/X11R6/%{_lib}/X11/xcin \
-	--with-xcin-rcdir=/etc/chinese/xcin \
-	--with-localedir=/usr/share/locale \
-	--with-extra-lib=/usr/%{_lib}
+	--prefix=%{_prefix}/X11R6 --libdir=%{_prefix}/X11R6/%{_lib} \
+        --with-xcin-dir=%{_prefix}/X11R6/%{_lib}/X11/xcin \
+	--with-xcin-rcdir=%{_sysconfdir}/chinese/xcin \
+	--with-localedir=%{_datadir}/locale \
+	--with-extra-lib=%{_libdir}
 
 perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=\"-L\\\$libdir\"|g;' libtool
 
@@ -53,31 +56,31 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/X11/xcin
-mkdir -p $RPM_BUILD_ROOT/usr/X11R6/bin
-mkdir -p $RPM_BUILD_ROOT/etc/chinese/xcin
-mkdir -p $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/X11/xcin/tab
-mkdir -p $RPM_BUILD_ROOT/usr/X11R6/man
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/%{_lib}/X11/xcin
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/bin
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/chinese/xcin
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/%{_lib}/X11/xcin/tab
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/man
 
 export program_prefix=$RPM_BUILD_ROOT
-export xcin_rcp=$RPM_BUILD_ROOT/etc/chinese/xcin
+export xcin_rcp=$RPM_BUILD_ROOT%{_sysconfdir}/chinese/xcin
 make -e install
 
-mkdir -p $RPM_BUILD_ROOT/usr/share/icons/
-mkdir -p $RPM_BUILD_ROOT/usr/share/gnome/apps/Utilities/
-mkdir -p $RPM_BUILD_ROOT/usr/share/locale/zh_TW/LC_MESSAGES/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome/apps/Utilities/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale/zh_TW/LC_MESSAGES/
 
 install -m 644 $RPM_SOURCE_DIR/xcin.xpm \
-		$RPM_BUILD_ROOT/usr/share/icons/xcin.xpm
-install -m 644 po/xcin.mo $RPM_BUILD_ROOT/usr/share/locale/zh_TW/LC_MESSAGES/xcin.mo
-install -m 644 src/lib/.libs/libxcin.so.0.0.0 $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/
+		$RPM_BUILD_ROOT%{_datadir}/icons/xcin.xpm
+install -m 644 po/xcin.mo $RPM_BUILD_ROOT%{_datadir}/locale/zh_TW/LC_MESSAGES/xcin.mo
+install -m 644 src/lib/.libs/libxcin.so.0.0.0 $RPM_BUILD_ROOT%{_prefix}/X11R6/%{_lib}/
 install -D -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/chinese/xcin/xcinrc
 install -D -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}
 
 # remove unpackaged files from the buildroot
-rm -rf $RPM_BUILD_ROOT/usr/X11R6/man
-rm -f $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/{libxcin.a,libxcin.la}
-rm -rf $RPM_BUILD_ROOT/usr/X11R6/share
+rm -rf $RPM_BUILD_ROOT%{_prefix}/X11R6/man
+rm -f $RPM_BUILD_ROOT%{_prefix}/X11R6/%{_lib}/{libxcin.a,libxcin.la}
+rm -rf $RPM_BUILD_ROOT%{_prefix}/X11R6/share
 
 %post
 /sbin/ldconfig
@@ -97,21 +100,24 @@
 %dir %{_sysconfdir}/chinese
 %dir %{_sysconfdir}/chinese/xcin
 %config %{_sysconfdir}/chinese/xcin/xcinrc
-/usr/X11R6/bin/*
-/usr/X11R6/%{_lib}/X11/xcin/
-/usr/X11R6/%{_lib}/*
-/usr/share/icons/xcin.xpm
+%{_prefix}/X11R6/bin/*
+%{_prefix}/X11R6/%{_lib}/*
+%{_datadir}/icons/xcin.xpm
 %lang(zh_TW) /usr/share/locale/zh_TW/LC_MESSAGES/xcin.mo
 %{_sysconfdir}/X11/xinit/xinput.d
 
 %clean 
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Mon Mar 21 2005 Leon Ho <llch at redhat.com>
 - rebuilt for Fedora Extras
 - add rm -rf $RPM_BUILD_ROOT
 
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com>
+- fix BuildReqs
+- macroize stuff and other fixes
+
 * Thu Jul 01 2004 Leon Ho <llch at redhat.com>
 - modify post script