update: global, xplanet

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6252 ec354946-7b23-47d6-9f5a-488ba84defc7

g/global/global-vl.spec

@@ -3,13 +3,17 @@
 Summary: GNU GLOBAL is a source code tag system
 Summary(ja): GNU GLOBAL ソースコードタグシステム
 Name: global
-Version: 5.8.2
+Version: 6.2.2
 Release: 1%{?_dist_release}
+
 License: GPLv3
 Group: Development/Tools
 URL: http://www.gnu.org/software/global/
+
 Source0: ftp://ftp.gnu.org/pub/gnu/global/%{name}-%{version}.tar.gz
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: ncurses-devel
 Requires: perl
 Requires(post,preun): /sbin/install-info
 
@@ -18,11 +22,11 @@ Distribution: Vine Linux
 
 %description
 GNU GLOBAL is a source code tag system that works the same way across diverse
-environments. It supports C, C++, Yacc and Java source code.
+environments. It supports C, C++, Yacc, Java and PHP4 source code.
 
 %description -l ja
 GNU GLOBAL はソースコードに索引付けを行います．
-C, C++, Yacc, Java のソースコードをサポートします．
+C, C++, Yacc, Java, PHP4 のソースコードをサポートします．
 
 %prep
 %setup -q
@@ -32,12 +36,8 @@ C, C++, Yacc, Java のソースコードをサポートします．
 make
 
 %install
-rm -rf %{buildroot}
-%makeinstall
-
-# gctags command conflicts emacs package.
-#%__mv %{buildroot}%{_bindir}/gctags %{buildroot}%{_bindir}/gctags.global
-#%__mv %{buildroot}%{_mandir}/man1/gctags.1 %{buildroot}%{_mandir}/man1/gctags.global.1
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT install
 
 pushd $RPM_BUILD_ROOT%{_datadir}/gtags
 rm -f AUTHORS BOKIN_* COPYING ChangeLog DONORS FAQ \
@@ -48,16 +48,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gtags/*.la
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %post
-#/sbin/update-alternatives --install /usr/bin/gctags gctags /usr/bin/gctags.global %{priority}
-#/sbin/update-alternatives --config gctags
 /sbin/install-info %{_infodir}/global.info.* %{_infodir}/dir
 
 %preun
 if [ $1 = 0 ]; then
-#    /sbin/update-alternatives --remove gctags /usr/bin/gctags.global
     /sbin/install-info --delete %{_infodir}/global.info.* %{_infodir}/dir
 fi
 
@@ -65,7 +62,7 @@ fi
 %defattr(-,root,root)
 %doc AUTHORS BOKIN_* COPYING ChangeLog DONORS FAQ INSTALL 
 %doc LICENSE NEWS README THANKS
-%doc globash.rc gtags.conf gtags.el gtags.pl
+%doc gtags.conf gtags.el gtags.pl gtags.vim
 %{_bindir}/*
 %{_libdir}/gtags/*.so
 %{_mandir}/man?/*
@@ -73,6 +70,13 @@ fi
 %{_infodir}/global.info*
 
 %changelog
+* Tue May 15 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 6.2.2-1
+- new upstream release
+- added BR: ncurses-devel
+
+* Tue May  4 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 5.8.2-1
+- new upstream release
+
 * Tue May  4 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 5.8.2-1
 - new upstream release
 

x/xplanet/xplanet-vl.spec

@@ -1,27 +1,26 @@
 Summary:	Render a planetary image into an X window
 Name:		xplanet
-Version:	1.2.1
-Release:	3%{?_dist_release}
+Version:	1.3.0
+Release:	1%{?_dist_release}
 
 License:	GPLv2
 Group:		Applications/Edutainment
-Source:		http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:		xplanet-1.2.1-g++44.patch
 URL:		http://%{name}.sourceforge.net
 
+Source:		http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	expat-devel
+BuildRequires:	giflib-devel
 BuildRequires:	glib2-devel
 BuildRequires:	libXScrnSaver-devel
 BuildRequires:	libXt-devel
 BuildRequires:	libjpeg-devel
-BuildRequires:	libungif-devel
 BuildRequires:	libtiff-devel
 BuildRequires:	netpbm-devel
 BuildRequires:	pango-devel
-#if 0%{?fedora} >= 11
-#Requires:	gnu-free-mono-fonts
-#%endif
+
+Requires:	TrueType-gnu-freefont-mono
 
 %description
 Xplanet is similar to Xearth, where an image of the earth is rendered
@@ -34,23 +33,22 @@ locations with map files.
 
 %prep
 %setup -q
-#patch0 -p1 -b .g++
 
 %build
 %configure
 make %{?_smp_mflags} -k
 
 %install
-rm -rf %{buildroot}
-CPPROG="cp -p" make DESTDIR=%{buildroot} install
+rm -rf $RPM_BUILD_ROOT
+CPPROG="cp -p" make DESTDIR=$RPM_BUILD_ROOT install
 
-#if 0%{?fedora} >=11
-#ln -sf ../fonts/gnu-free/FreeMonoBold.ttf \
-#	%{buildroot}%{_datadir}/%{name}/FreeMonoBold.ttf
-#endif
+# use TrueType-gnu-freefont-mono
+rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts/FreeMonoBold.ttf
+ln -sf ../../fonts/TrueType-gnu-freefont/FreeMonoBold.ttf \
+    $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts/FreeMonoBold.ttf
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
@@ -60,6 +58,11 @@ rm -rf %{buildroot}
 %{_datadir}/xplanet
 
 %changelog
+* Sat May 26 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.3.0-1
+- updated to 1.3.0
+- used TrueType-gnu-freefont-mono
+- rebuilt with rpm-4.8.1-3
+
 * Sun Aug 30 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.2.1-3
 - Initial build for Vine Linux