[Box Backup-commit] COMMIT r2682 - box/RELEASE/0.11rc7/contrib/rpm

[subversion at boxbackup.org]

Author: chris
Date: 2010-04-30 18:31:45 +0100 (Fri, 30 Apr 2010)
New Revision: 2682

Modified:
   box/RELEASE/0.11rc7/contrib/rpm/boxbackup.spec
Log:
Merge [2681] from trunk. Fix RPM spec broken by license file changes.


Modified: box/RELEASE/0.11rc7/contrib/rpm/boxbackup.spec
===================================================================
--- box/RELEASE/0.11rc7/contrib/rpm/boxbackup.spec	2010-04-30 17:23:13 UTC (rev 2681)
+++ box/RELEASE/0.11rc7/contrib/rpm/boxbackup.spec	2010-04-30 17:31:45 UTC (rev 2682)
@@ -104,24 +104,17 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/box/bbstored
 mkdir -p $RPM_BUILD_ROOT%{_var}/lib/box
 
-install -m 644 BUGS.txt \
-	$RPM_BUILD_ROOT%{_docdir}/%{ident}
-install -m 644 VERSION.txt \
-	$RPM_BUILD_ROOT%{_docdir}/%{ident}
-install -m 644 ExceptionCodes.txt \
-	$RPM_BUILD_ROOT%{_docdir}/%{ident}
-install -m 644 LICENSE.txt \
-	$RPM_BUILD_ROOT%{_docdir}/%{ident}
+install -m 644 -t $RPM_BUILD_ROOT%{_docdir}/%{ident} \
+	BUGS.txt \
+	VERSION.txt \
+	ExceptionCodes.txt \
+	LICENSE-GPL.txt \
+	LICENSE-BSD.txt \
+	%{distribution_dir}CONTACT.txt \
+	%{distribution_dir}DOCUMENTATION.txt \
+	%{distribution_dir}LINUX.txt \
+	%{distribution_dir}THANKS.txt
 
-install -m 644 %{distribution_dir}CONTACT.txt \
-	$RPM_BUILD_ROOT%{_docdir}/%{ident}
-install -m 644 %{distribution_dir}DOCUMENTATION.txt \
-	$RPM_BUILD_ROOT%{_docdir}/%{ident}
-install -m 644 %{distribution_dir}LINUX.txt \
-	$RPM_BUILD_ROOT%{_docdir}/%{ident}
-install -m 644 %{distribution_dir}THANKS.txt \
-	$RPM_BUILD_ROOT%{_docdir}/%{ident}
-
 install -m 644 contrib/bbreporter/LICENSE \
 	$RPM_BUILD_ROOT%{_docdir}/%{ident}/bbreporter
 install -m 755 contrib/bbreporter/bbreporter.py \