packages: awesome/awesome.spec - rel 5 - use doc/awesome-version instead do...

[uzsolt]

Author: uzsolt                       Date: Sat Jun 13 19:02:10 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 5
- use doc/awesome-version instead doc/awesome-doc-version in doc subpackage

---- Files affected:
packages/awesome:
   awesome.spec (1.58 -> 1.59) 

---- Diffs:

================================================================
Index: packages/awesome/awesome.spec
diff -u packages/awesome/awesome.spec:1.58 packages/awesome/awesome.spec:1.59
--- packages/awesome/awesome.spec:1.58	Fri Jun 12 08:57:51 2009
+++ packages/awesome/awesome.spec	Sat Jun 13 21:02:05 2009
@@ -4,7 +4,7 @@
 Summary(pl.UTF-8):	Zarządca okien X - Awesome
 Name:		awesome
 Version:	3.3
-Release:	4
+Release:	5
 License:	GPL v2
 Group:		X11/Window Managers
 Source0:	http://awesome.naquadah.org/download/%{name}-%{version}.tar.bz2
@@ -282,13 +282,13 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir}/xsessions,%{_docdir}/%{name}-doc-%{version}}
+install -d $RPM_BUILD_ROOT{%{_datadir}/xsessions,%{_docdir}/%{name}-%{version}}
+install AUTHORS BUGS README STYLE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop
 
-mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/luadoc $RPM_BUILD_ROOT%{_docdir}/%{name}-doc-%{version}/luadoc
 for file in $(%{__find} $RPM_BUILD_ROOT%{_datadir}/%{name} -iname "*.in"); do
 	%{__rm} ${file}
 done
@@ -298,7 +298,8 @@
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS BUGS README STYLE
+%doc %{_docdir}/%{name}-%{version}
+%exclude %{_docdir}/%{name}-%{version}/luadoc
 %attr(755,root,root) %{_bindir}/%{name}
 %attr(755,root,root) %{_bindir}/%{name}-client
 %attr(755,root,root) %{_bindir}/awsetbg
@@ -313,7 +314,7 @@
 
 %files doc
 %defattr(644,root,root,755)
-%{_docdir}/%{name}-doc-%{version}
+%doc %{_docdir}/%{name}-%{version}/luadoc
 
 %files example-config
 %defattr(644,root,root,755)
@@ -367,6 +368,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.59  2009/06/13 19:02:05  uzsolt
+- rel 5
+- use doc/awesome-version instead doc/awesome-doc-version in doc subpackage
+
 Revision 1.58  2009/06/12 06:57:51  pawelz
 - Added bashizm patch
 - R: rlwrap (use by awesome-client if /bin/sh is not bash)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/awesome/awesome.spec?r1=1.58&r2=1.59&f=u