SPECS: xephem.spec - pack with uncompressed documentation as it ap...

[havner]

Author: havner                       Date: Sun Jul 30 21:09:08 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- pack with uncompressed documentation as it appeared that xephem uses it
  for displaying help from program help menu. doc subpackage obsolete
- cosmetics

---- Files affected:
SPECS:
   xephem.spec (1.37 -> 1.38) 

---- Diffs:

================================================================
Index: SPECS/xephem.spec
diff -u SPECS/xephem.spec:1.37 SPECS/xephem.spec:1.38
--- SPECS/xephem.spec:1.37	Sun Jul 30 03:28:50 2006
+++ SPECS/xephem.spec	Sun Jul 30 23:09:03 2006
@@ -10,16 +10,14 @@
 # Source0-md5:	a7a89469f1c0681d186344ef96941b8d
 Source1:	%{name}.desktop
 Source2:	%{name}.png
-# http://www.clearskyinstitute.com/xephem/help/xephem.html
-Source3:	http://distfiles.pld-linux.org/src/xephem-reference-manual-html-3.7.1.tar.bz2
-# Source3-md5:	b5951f5cc23a9cbc91697df395987f09
-Source4:	%{name}_sites
+Source3:	%{name}_sites
 Patch0:		%{name}-makefile.patch
 Patch1:		%{name}-fits.patch
 URL:		http://www.clearskyinstitute.com/xephem/
 BuildRequires:	XFree86-devel
 BuildRequires:	openmotif-devel
 BuildRequires:	sed >= 4.0
+Obsoletes:	xephem-doc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_appdefsdir	/usr/X11R6/lib/X11/app-defaults
@@ -57,18 +55,6 @@
 XEphemdbd - filt do odnajdywania obiektów astronomicznych wg zadanych
 	    pól opisu.
 
-%package doc
-Summary:	XEphem documentation in PDF
-Summary(pl):	Dokumentacja XEphema w PDF-ie
-Group:		X11/Applications/Science
-Requires:	%{name} = %{version}-%{release}
-
-%description doc
-XEphem reference manual in HTML format.
-
-%description doc -l pl
-Podręcznik XEphema w formacie HTML.
-
 %prep
 %setup -q
 %patch0 -p1
@@ -80,6 +66,7 @@
 mv GUI/xephem/tools/indi/README GUI/xephem/tools/indi/README-indi
 mv GUI/xephem/tools/xedb/README GUI/xephem/tools/xedb/README-xedb
 mv GUI/xephem/tools/xephemdbd/README GUI/xephem/tools/xephemdbd/README-xephemdbd
+mv -f Copyright LICENSE
 
 %build
 
@@ -107,15 +94,16 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name}/doc,%{_mandir}/man1} \
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1} \
 	$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_appdefsdir}}
 
 rm -f GUI/xephem/auxil/xephem_sites
-cp %{SOURCE4} GUI/xephem/auxil/
+cp %{SOURCE3} GUI/xephem/auxil/
 
 install GUI/xephem/xephem $RPM_BUILD_ROOT%{_bindir}
 cp -a GUI/xephem/auxil $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -a GUI/xephem/catalogs $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -a GUI/xephem/help $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -a GUI/xephem/fifos $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -a GUI/xephem/fits $RPM_BUILD_ROOT%{_datadir}/%{name}
 
@@ -132,9 +120,6 @@
 
 install GUI/xephem/auxil/*.pl $RPM_BUILD_ROOT%{_bindir}
 install GUI/xephem/tools/xephemdbd/*.pl $RPM_BUILD_ROOT%{_bindir}
-cp -f Copyright LICENSE
-
-install %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -144,7 +129,6 @@
 %doc LICENSE
 %attr(755,root,root) %{_bindir}/xephem
 %{_datadir}/%{name}
-%exclude %{_datadir}/%{name}/doc
 %{_desktopdir}/*
 %{_pixmapsdir}/*
 %{_appdefsdir}/*
@@ -160,18 +144,19 @@
 %attr(755,root,root) %{_bindir}/xephemdbd
 %attr(755,root,root) %{_bindir}/*.pl
 
-%files doc
-%defattr(644,root,root,755)
-%{_datadir}/%{name}/doc
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2006/07/30 21:09:03  havner
+- pack with uncompressed documentation as it appeared that xephem uses it
+  for displaying help from program help menu. doc subpackage obsolete
+- cosmetics
+
 Revision 1.37  2006/07/30 01:28:50  havner
-- dont double packe documentation
+- dont double pack documentation
 
 Revision 1.36  2006/07/30 01:10:21  havner
 - fits patch
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xephem.spec?r1=1.37&r2=1.38&f=u