From 24c793a3082c1fc750a1721e9cc5ea6f1c04307e Mon Sep 17 00:00:00 2001 From: marostegui Date: Thu, 4 Jan 2007 10:42:10 +0000 Subject: [PATCH] 2007-01-04 Manuel Arostegui * pandora_console.spec: Now pandora console is installed with the correct name, not with the release name after "pandora_console". git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@351 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 6 ++++++ pandora_console/pandora_console.spec | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 8727e96e74..9348f1f23e 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2007-01-04 Manuel Arostegui + + * pandora_console.spec: Now pandora console is installed + with the correct name, not with the release name after + "pandora_console". + 2007-01-02 Manuel Arostegui * pandora_console.spec: Added man pages. diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec index 24ab13567f..913f27044d 100755 --- a/pandora_console/pandora_console.spec +++ b/pandora_console/pandora_console.spec @@ -63,7 +63,7 @@ Prefix: /srv/www %else Prefix: /var/www/html %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot +BuildRoot: %{_tmppath}/%{name} BuildArchitectures: noarch AutoReq: 0 @@ -100,15 +100,15 @@ rm -rf $RPM_BUILD_ROOT %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{prefix}/%{name}-%{version}-%{release} +mkdir -p $RPM_BUILD_ROOT%{prefix}/%{name} mkdir -p $RPM_BUILD_ROOT/usr/share/ mkdir -p $RPM_BUILD_ROOT/usr/share/man/ mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1/ -cp -aRf * $RPM_BUILD_ROOT%{prefix}/%{name}-%{version}-%{release} +cp -aRf * $RPM_BUILD_ROOT%{prefix}/%{name} cp pandora.1 $RPM_BUILD_ROOT/usr/share/man/man1/ cp pandora_console.1 $RPM_BUILD_ROOT/usr/share/man/man1/ -if [ -f $RPM_BUILD_ROOT%{prefix}/%{name}-%{version}-%{release}/%{name}.spec ] ; then - rm $RPM_BUILD_ROOT%{prefix}/%{name}-%{version}-%{release}/%{name}.spec +if [ -f $RPM_BUILD_ROOT%{prefix}/%{name}/%{name}.spec ] ; then + rm $RPM_BUILD_ROOT%{prefix}/%{name}/%{name}.spec fi %clean @@ -117,7 +117,7 @@ rm -rf $RPM_BUILD_ROOT echo "Please you HAVE to take a look at the INSTALL file placed on your DocumentRoot in order to follow the instructions to create the database for Pandora" %files %defattr(0644,%{httpd_user},%{httpd_group},0755) -%docdir %{prefix}/%{name}-%{version}-%{release}/docs -%{prefix}/%{name}-%{version}-%{release} +%docdir %{prefix}/%{name}/docs +%{prefix}/%{name} %{_mandir}/man1/pandora.1.gz %{_mandir}/man1/pandora_console.1.gz