From 89a8e3bb36b1c32874a047526e3b929f34515be9 Mon Sep 17 00:00:00 2001 From: codestation Date: Thu, 24 Apr 2014 11:55:55 -0430 Subject: [PATCH] Fix variable expansion in specfiles. --- rpmbuild/VitaMTP-fedora.spec | 3 ++- rpmbuild/VitaMTP-openSUSE.spec | 3 ++- rpmbuild/qcma-fedora.spec | 3 ++- rpmbuild/qcma-openSUSE.spec | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/rpmbuild/VitaMTP-fedora.spec b/rpmbuild/VitaMTP-fedora.spec index 3156249..f7c5473 100644 --- a/rpmbuild/VitaMTP-fedora.spec +++ b/rpmbuild/VitaMTP-fedora.spec @@ -47,7 +47,8 @@ This package contains only the files necessary for development. %prep rm -rf $RPM_SOURCE_DIR/%{name}%{sonum} -git clone "${VITAMTP_REPO:=https://github.com/codestation/VitaMTP.git}" $RPM_SOURCE_DIR/%{name}%{sonum} +%{!?_vitamtp_repo:%define _vitamtp_repo https://github.com/codestation/VitaMTP.git} +git clone "%{_vitamtp_repo}" $RPM_SOURCE_DIR/%{name}%{sonum} cp -r $RPM_SOURCE_DIR/%{name}%{sonum} $RPM_BUILD_DIR/%{name}%{sonum} %setup -n %{name}%{sonum} -DT diff --git a/rpmbuild/VitaMTP-openSUSE.spec b/rpmbuild/VitaMTP-openSUSE.spec index 2fed7eb..7a0bdb8 100644 --- a/rpmbuild/VitaMTP-openSUSE.spec +++ b/rpmbuild/VitaMTP-openSUSE.spec @@ -47,7 +47,8 @@ This package contains only the files necessary for development. %prep rm -rf $RPM_SOURCE_DIR/%{name}%{sonum} -git clone "${VITAMTP_REPO:=https://github.com/codestation/VitaMTP.git}" $RPM_SOURCE_DIR/%{name}%{sonum} +%{!?_vitamtp_repo:%define _vitamtp_repo https://github.com/codestation/VitaMTP.git} +git clone "${_vitamtp_repo}" $RPM_SOURCE_DIR/%{name}%{sonum} cp -r $RPM_SOURCE_DIR/%{name}%{sonum} $RPM_BUILD_DIR/%{name}%{sonum} %setup -n %{name}%{sonum} -DT diff --git a/rpmbuild/qcma-fedora.spec b/rpmbuild/qcma-fedora.spec index e4b677d..25af46f 100644 --- a/rpmbuild/qcma-fedora.spec +++ b/rpmbuild/qcma-fedora.spec @@ -26,7 +26,8 @@ is meant to be compatible with Linux, Windows and MAC OS X. %prep rm -rf $RPM_SOURCE_DIR/%{name}-%{version} -git clone "${QCMA_REPO:=https://github.com/codestation/qcma.git}" $RPM_SOURCE_DIR/%{name}-%{version} +%{!?_qcma_repo:%define _qcma_repo https://github.com/codestation/qcma.git} +git clone "%{_qcma_repo}" $RPM_SOURCE_DIR/%{name}-%{version} cp -r $RPM_SOURCE_DIR/%{name}-%{version} $RPM_BUILD_DIR/%{name}-%{version} %setup -n %{name}-%{version} -DT diff --git a/rpmbuild/qcma-openSUSE.spec b/rpmbuild/qcma-openSUSE.spec index 2590688..b38a0ad 100644 --- a/rpmbuild/qcma-openSUSE.spec +++ b/rpmbuild/qcma-openSUSE.spec @@ -26,7 +26,8 @@ is meant to be compatible with Linux, Windows and MAC OS X. %prep rm -rf $RPM_SOURCE_DIR/%{name}-%{version} -git clone "${QCMA_REPO:=https://github.com/codestation/qcma.git}" $RPM_SOURCE_DIR/%{name}-%{version} +%{!?_qcma_repo:%define _qcma_repo https://github.com/codestation/qcma.git} +git clone "%{_qcma_repo}" $RPM_SOURCE_DIR/%{name}-%{version} cp -r $RPM_SOURCE_DIR/%{name}-%{version} $RPM_BUILD_DIR/%{name}-%{version} %setup -n %{name}-%{version} -DT