From f77d62515cd49ac50d16f0a54f14f6086d4ff745 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sat, 13 Jan 2007 15:43:18 +0000 Subject: Support building from an unofficial tarball (from svn) by changing %{distribution_dir} at the top (automatically in distributions made by infrastructure/makedistribution.pl) Write our RPM version number into VERSION.txt and hence compile it in (refs #3) --- distribution/boxbackup/contrib/rpm/boxbackup.spec | 52 ++++++++++++++++++----- 1 file changed, 41 insertions(+), 11 deletions(-) (limited to 'distribution/boxbackup') diff --git a/distribution/boxbackup/contrib/rpm/boxbackup.spec b/distribution/boxbackup/contrib/rpm/boxbackup.spec index 12a2bb9f..eb09ecbe 100644 --- a/distribution/boxbackup/contrib/rpm/boxbackup.spec +++ b/distribution/boxbackup/contrib/rpm/boxbackup.spec @@ -1,6 +1,20 @@ %define bb_user_id 171 %define ident %{name}-%{version} +# In official distribution tarballs, distribution files are copied to +# the base directory (where configure is), so distribution_dir should be empty. +# This is the default, overridden by the following block in non-distribution +# builds. +%define distribution_dir + +# BOX_PRIVATE_BEGIN +# In unofficial tarballs, made from svn, distribution files are still in +# 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 +# BOX_PRIVATE_END + # Detect distribution. So far we only special-case SUSE. If you need to make # any distro specific changes to get the package building on your system # please email them to boxbackup-dev@fluffy.co.uk @@ -72,6 +86,7 @@ This package contains the server. %setup -q %build +echo -e '%{version}\n%{name}' > VERSION.txt test -e configure || ./bootstrap %configure @@ -88,19 +103,28 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/box/bbackupd 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 LINUX.txt $RPM_BUILD_ROOT%{_docdir}/%{ident} -install -m 644 VERSION.txt $RPM_BUILD_ROOT%{_docdir}/%{ident} -install -m 644 CONTACT.txt $RPM_BUILD_ROOT%{_docdir}/%{ident} -install -m 644 DOCUMENTATION.txt $RPM_BUILD_ROOT%{_docdir}/%{ident} -install -m 644 ExceptionCodes.txt $RPM_BUILD_ROOT%{_docdir}/%{ident} -install -m 644 THANKS.txt $RPM_BUILD_ROOT%{_docdir}/%{ident} -install -m 644 LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{ident} -install -m 644 TODO.txt $RPM_BUILD_ROOT%{_docdir}/%{ident} +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 %{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} # Client touch $RPM_BUILD_ROOT%{_sysconfdir}/box/bbackupd.conf -install -m 755 contrib/%{dist}/bbackupd $RPM_BUILD_ROOT%{init_dir} +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 %endif @@ -113,7 +137,8 @@ install %{client_dir}/bbackupd-config $RPM_BUILD_ROOT%{_sbindir} # Server touch $RPM_BUILD_ROOT%{_sysconfdir}/box/bbstored.conf touch $RPM_BUILD_ROOT%{_sysconfdir}/box/raidfile.conf -install -m 755 contrib/%{dist}/bbstored $RPM_BUILD_ROOT%{init_dir} +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 %endif @@ -195,6 +220,11 @@ rm -rf $RPM_BUILD_ROOT %{_sbindir}/raidfile-config %changelog +* Sat Jan 13 2006 Chris Wilson +- Support building from an unofficial tarball (from svn) by changing + %{distribution_dir} at the top. +- Write our RPM version number into VERSION.txt and hence compile it in + * Wed Dec 28 2005 Martin Ebourne - Box now uses autoconf so use configure macro -- cgit v1.2.3 From 7adebdfb61eced2905d3606d829de9e129ab6e39 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sun, 14 Jan 2007 20:28:27 +0000 Subject: Be nice to rpm that doesn't like empty macros (refs #3) --- distribution/boxbackup/contrib/rpm/boxbackup.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'distribution/boxbackup') diff --git a/distribution/boxbackup/contrib/rpm/boxbackup.spec b/distribution/boxbackup/contrib/rpm/boxbackup.spec index eb09ecbe..0de3589f 100644 --- a/distribution/boxbackup/contrib/rpm/boxbackup.spec +++ b/distribution/boxbackup/contrib/rpm/boxbackup.spec @@ -5,7 +5,7 @@ # the base directory (where configure is), so distribution_dir should be empty. # This is the default, overridden by the following block in non-distribution # builds. -%define distribution_dir +%define distribution_dir '' # BOX_PRIVATE_BEGIN # In unofficial tarballs, made from svn, distribution files are still in -- cgit v1.2.3 From a00db5b2b4824e4fe213a568b2ac7e45733a3d45 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sun, 14 Jan 2007 20:53:10 +0000 Subject: Fix building from distribution tarballs again (refs #3) --- distribution/boxbackup/contrib/rpm/boxbackup.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'distribution/boxbackup') diff --git a/distribution/boxbackup/contrib/rpm/boxbackup.spec b/distribution/boxbackup/contrib/rpm/boxbackup.spec index 0de3589f..111a00ff 100644 --- a/distribution/boxbackup/contrib/rpm/boxbackup.spec +++ b/distribution/boxbackup/contrib/rpm/boxbackup.spec @@ -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 ExceptionCodes.txt \ 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 @@ install %{client_dir}/bbackupd-config $RPM_BUILD_ROOT%{_sbindir} # 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 -- cgit v1.2.3 From e7a44dd27bb02fde83dd6bee24d18521bbe57f16 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 27 Jun 2007 19:17:30 +0000 Subject: Use SVN version in distributions built from this branch. --- distribution/boxbackup/VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'distribution/boxbackup') diff --git a/distribution/boxbackup/VERSION.txt b/distribution/boxbackup/VERSION.txt index 891c9b59..d46ff63a 100644 --- a/distribution/boxbackup/VERSION.txt +++ b/distribution/boxbackup/VERSION.txt @@ -1,2 +1,2 @@ -0.09_plus3 +0.10_plus_USE_SVN_VERSION boxbackup -- cgit v1.2.3 From 38d1e9596510560674dd80b6ed6b6e2c3ba5d1f0 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 27 Jun 2007 19:17:57 +0000 Subject: Add lib/intercept to distribution manifest, to ensure that it gets distributed. --- distribution/boxbackup/DISTRIBUTION-MANIFEST.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'distribution/boxbackup') diff --git a/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt b/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt index 96908264..b24a5527 100644 --- a/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt +++ b/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt @@ -1,3 +1,4 @@ +lib/intercept lib/raidfile test/raidfile test/raidfile/testfiles @@ -37,4 +38,4 @@ infrastructure/msvc NO-LICENSE-IN-DIR infrastructure/msvc/2003 infrastructure/msvc/2003 NO-LICENSE-IN-DIR infrastructure/msvc/2005 -infrastructure/msvc/2005 \ No newline at end of file +infrastructure/msvc/2005 -- cgit v1.2.3