[Box Backup-commit] COMMIT r1247 - box/chris/merge/distribution/boxbackup/contrib/rpm

boxbackup-dev at fluffy.co.uk boxbackup-dev at fluffy.co.uk
Sun Jan 14 20:53:10 GMT 2007


Author: chris
Date: 2007-01-14 20:53:10 +0000 (Sun, 14 Jan 2007)
New Revision: 1247

Modified:
   box/chris/merge/distribution/boxbackup/contrib/rpm/boxbackup.spec
Log:
Fix building from distribution tarballs again (refs #3)


Modified: box/chris/merge/distribution/boxbackup/contrib/rpm/boxbackup.spec
===================================================================
--- box/chris/merge/distribution/boxbackup/contrib/rpm/boxbackup.spec	2007-01-14 20:29:49 UTC (rev 1246)
+++ box/chris/merge/distribution/boxbackup/contrib/rpm/boxbackup.spec	2007-01-14 20:53:10 UTC (rev 1247)
@@ -12,7 +12,7 @@
 # distribution/boxbackup, so the following line overrides the default above:
 # (this section will be removed automatically from distribution tarballs
 # by infrastructure/makedistribution.pl)
-%define distribution_dir distribution/boxbackup
+%define distribution_dir distribution/boxbackup/
 # BOX_PRIVATE_END
 
 # Detect distribution. So far we only special-case SUSE. If you need to make
@@ -112,18 +112,18 @@
 install -m 644 LICENSE.txt \
 	$RPM_BUILD_ROOT%{_docdir}/%{ident}
 
-install -m 644 %{distribution_dir}/CONTACT.txt \
+install -m 644 %{distribution_dir}CONTACT.txt \
 	$RPM_BUILD_ROOT%{_docdir}/%{ident}
-install -m 644 %{distribution_dir}/DOCUMENTATION.txt \
+install -m 644 %{distribution_dir}DOCUMENTATION.txt \
 	$RPM_BUILD_ROOT%{_docdir}/%{ident}
-install -m 644 %{distribution_dir}/LINUX.txt \
+install -m 644 %{distribution_dir}LINUX.txt \
 	$RPM_BUILD_ROOT%{_docdir}/%{ident}
-install -m 644 %{distribution_dir}/THANKS.txt \
+install -m 644 %{distribution_dir}THANKS.txt \
 	$RPM_BUILD_ROOT%{_docdir}/%{ident}
 
 # Client
 touch $RPM_BUILD_ROOT%{_sysconfdir}/box/bbackupd.conf
-install -m 755 %{distribution_dir}/contrib/%{dist}/bbackupd \
+install -m 755 %{distribution_dir}contrib/%{dist}/bbackupd \
 	$RPM_BUILD_ROOT%{init_dir}
 %if %{is_suse}
 ln -s ../../%{init_dir}/bbackupd $RPM_BUILD_ROOT%{_sbindir}/rcbbackupd
@@ -137,7 +137,7 @@
 # Server
 touch $RPM_BUILD_ROOT%{_sysconfdir}/box/bbstored.conf
 touch $RPM_BUILD_ROOT%{_sysconfdir}/box/raidfile.conf
-install -m 755 %{distribution_dir}/contrib/%{dist}/bbstored \
+install -m 755 %{distribution_dir}contrib/%{dist}/bbstored \
 	$RPM_BUILD_ROOT%{init_dir}
 %if %{is_suse}
 ln -s ../../%{init_dir}/bbstored $RPM_BUILD_ROOT%{_sbindir}/rcbbstored




More information about the Boxbackup-commit mailing list