rpms/cgoban/devel cgoban.desktop,1.1,1.2 cgoban.spec,1.3,1.4

[Phillip Compton (pcompton)]

Changeset from: pcompton

Update of /cvs/extras/rpms/cgoban/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv11008

Modified Files:
	cgoban.desktop cgoban.spec 
Log Message:
Clean up spec/Bump release.



Index: cgoban.desktop
===================================================================
RCS file: /cvs/extras/rpms/cgoban/devel/cgoban.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cgoban.desktop	8 Nov 2004 04:08:55 -0000	1.1
+++ cgoban.desktop	12 Nov 2004 06:23:32 -0000	1.2
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Version=1.0
-Type=Application
 Encoding=UTF-8
 Name=CGoban
 Comment=cgoban v1 Board viewer and gnugo interface
 Exec=cgoban
 Icon=cgoban.png
 Terminal=false
+Type=Application
+Categories=Application;Game;BoardGame;


Index: cgoban.spec
===================================================================
RCS file: /cvs/extras/rpms/cgoban/devel/cgoban.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cgoban.spec	8 Nov 2004 04:09:07 -0000	1.3
+++ cgoban.spec	12 Nov 2004 06:23:32 -0000	1.4
@@ -1,29 +1,28 @@
-Summary:        X board for playing go
 Name:           cgoban
 Version:        1.9.14
-Release:        0.fdr.2.2
-Epoch:          0
+Release:        0.fdr.3
+Summary:        X board for playing go
+
 Group:          Amusements/Games
 License:        GPL
 URL:            http://cgoban1.sourceforge.net/
 Source0:	http://prdownloads.sourceforge.net/cgoban1/cgoban-1.9.14.tar.gz
 Source1:        cgoban.desktop
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	XFree86-devel
+
 BuildRequires:	desktop-file-utils
+BuildRequires:	xorg-x11-devel
 
 %description
 CGoban (Complete Goban) is for Unix systems with X11.  It has the ability
 to be a computerized go board, view and edit smart-go files, and connect to
 go servers on the Internet.
 
-# -----------------------------------------------------------------------------
 
 %prep
 rm -rf ${RPM_BUILD_ROOT}
 %setup -q
 
-# -----------------------------------------------------------------------------
 
 %build
 %configure
@@ -31,42 +30,35 @@
 ./config.status
 make %{?_smp_mflags}
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-
 %makeinstall 
-
 install -p -D -m644 cgoban_icon.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/cgoban.png
-install -p -D -m644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/applications/cgoban.desktop
 
-desktop-file-install --vendor fedora --delete-original  \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   	\
-  --add-category X-Fedora                               \
-  --add-category Application                            \
-  --add-category Game                                   \
-  --add-category BoardGame                              \
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+desktop-file-install --vendor fedora               \
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications  \
+  --add-category X-Fedora                          \
+  %{SOURCE1}
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-# -----------------------------------------------------------------------------
 
 %files
 %defattr(-,root,root,-)
 %doc COPYING README TODO
+%doc %{_mandir}/man6/*
 %{_bindir}/*
-%{_mandir}/man6/*
-%{_datadir}/pixmaps/cgoban.png
 %{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/pixmaps/cgoban.png
 
-# -----------------------------------------------------------------------------
 
 %changelog
+* Fri Nov 12 2004 Phillip Compton <pcompton[AT]proteinmedia.com> 1.9.14-0.fdr.3
+- Clean up spec/Bump release.
+
 * Wed Jul 30 2003 Phillip Compton <pcompton[AT]proteinmedia.com> 0:1.9.14-0.fdr.2
 - Appleied Michael Schwendt's patch to spec (now honors RPM_OPT_FLAGS).