Meet FE standards (thanks to Ignacio Vazquez-Abrams)

1 files changed, 34 insertions, 19 deletions

diff --git a/packaging/fedora-doc-common.spec b/packaging/fedora-doc-common.spec
index c031764..7ae9171 100644
--- a/packaging/fedora-doc-common.spec
+++ b/packaging/fedora-doc-common.spec
@@ -5,11 +5,11 @@
 Summary:        Fedora Documentation common files
 Name:           fedora-doc-common
 # To be defined in Makefile
-Version:        %version
-Release: 	%release
+Version:        0.2
+Release: 	1
 License:        FDL
 Url:		http://fedora.redhat.com/projects/docs/
-Source0:	fedora-doc-common-%release.src.tar.gz
+Source0:	fedora-doc-common-%version.src.tar.gz
 Group:          Documentation
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,7 +23,7 @@ This package contains the following official Fedora Documentation components:
 
 
 %prep
-%setup -q -n %{name}-%{release}
+%setup -q
 
 
 %build
@@ -34,39 +34,41 @@ rm -rf $RPM_BUILD_ROOT
 install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/bin/
 for i in xmlformat xmldiff copy-figs tidy-bowl fdpsh doctype
 do
-	install -m 755 $RPM_BUILD_DIR/%{name}-%{release}/bin/${i} \
+	install -m 755 bin/${i} \
 		$RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/bin/
 done
 for i in xmlformat-fdp.conf xmldiff.pl active fdp-functions
 do
-	install -m 644 $RPM_BUILD_DIR/%{name}-%{release}/bin/${i} \
+	install -m 755 bin/${i} \
 		$RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/bin/
 done
+# Correct exceptions to make rpmlint happy
+for i in active fdp-functions xmlformat-fdp.conf
+do
+	chmod 644 $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/bin/${i}
+done
 install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/common/
-install -m 644 $RPM_BUILD_DIR/%{name}-%{release}/common/*.{xml,ent} \
+install -m 644 common/*.{xml,ent} \
 	$RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/common/
 install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/css/
-install -m 644 $RPM_BUILD_DIR/%{name}-%{release}/css/* \
-	$RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/css/
+install -m 644 css/* $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/css/
 install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/menus/applications-merged/
-install -m 644 \
-	$RPM_BUILD_DIR/%{name}-%{release}/packaging/fedora-documentation.menu \
+install -m 644 packaging/fedora-documentation.menu \
 	$RPM_BUILD_ROOT/%{_sysconfdir}/xdg/menus/applications-merged/
 install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/stylesheet-images/
-install -m 644 $RPM_BUILD_DIR/%{name}-%{release}/stylesheet-images/* \
+install -m 644 stylesheet-images/* \
 	$RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/stylesheet-images/
 install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/packaging/
-install -m 644 $RPM_BUILD_DIR/%{name}-%{release}/packaging/*.{xsl,dtd} \
+install -m 644 packaging/*.{xsl,dtd} \
 	$RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/packaging/
 install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/xsl/
-install -m 644 $RPM_BUILD_DIR/%{name}-%{release}/xsl/* \
-	$RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/xsl/
+install -m 644 xsl/* $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/xsl/
 install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/images/
-install -m 644 $RPM_BUILD_DIR/%{name}-%{release}/images/* \
+install -m 644 images/* \
 	$RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/images/
 install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/apps/khelpcenter/plugins/Fedora
-install -m 644 $RPM_BUILD_DIR/%{name}-%{release}/packaging/khelpcenter-fdp.directory $RPM_BUILD_ROOT/%{_datadir}/apps/khelpcenter/plugins/Fedora/.directory
-install -m 644 $RPM_BUILD_DIR/%{name}-%{release}/Makefile.common \
+install -m 644 packaging/khelpcenter-fdp.directory $RPM_BUILD_ROOT/%{_datadir}/apps/khelpcenter/plugins/Fedora/.directory
+install -m 644 Makefile.common \
 	$RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/Makefile.common
 
 
@@ -76,7 +78,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root,-)
-%docdir %{_datadir}/fedora/doc/docs-common/common/
+%dir %{_datadir}/fedora/
+%dir %{_datadir}/fedora/doc/
+%dir %{_datadir}/fedora/doc/docs-common/
+%dir %{_datadir}/fedora/doc/docs-common/bin/
+%dir %{_datadir}/fedora/doc/docs-common/common/
+%dir %{_datadir}/fedora/doc/docs-common/css/
+%dir %{_datadir}/fedora/doc/docs-common/images/
+%dir %{_datadir}/fedora/doc/docs-common/packaging/
+%dir %{_datadir}/fedora/doc/docs-common/stylesheet-images/
+%dir %{_datadir}/fedora/doc/docs-common/xsl/
 %{_datadir}/fedora/doc/docs-common/Makefile.common
 %{_datadir}/fedora/doc/docs-common/bin/*
 %{_datadir}/fedora/doc/docs-common/common/*
@@ -85,7 +96,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/fedora/doc/docs-common/packaging/*
 %{_datadir}/fedora/doc/docs-common/stylesheet-images/*
 %{_datadir}/fedora/doc/docs-common/xsl/*
+%dir %{_datadir}/apps/khelpcenter/plugins/Fedora/
 %{_datadir}/apps/khelpcenter/plugins/Fedora/.directory
 %{_sysconfdir}/xdg/menus/applications-merged/*
 
 %changelog
+* Fri Feb  3 2006 Paul W. Frields <stickster@gmail.com> - 0.2-1
+- Initial RPM version
+