summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2011-09-21 18:52:25 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2011-09-21 18:52:25 +0000
commit5dba36d05800339bf50ead72a2adc27a91f3babe (patch)
treefa6f6233481f36811eb368abaa2426188a1c9b13
parentb849af4b3cb5d99a001d7c3259f0e38b3779c849 (diff)
downloadMPC-5dba36d05800339bf50ead72a2adc27a91f3babe.tar.gz
Wed Sep 21 18:51:02 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* rpm/MPC.templ: * rpm/buildrpm.sh: * rpm/MPC.spec: Renamed the MPC spec file template to .templ and update the script to read the template and create MPC.spec. Within a source package we can only have one spec file and MPC is also included in the A/T/C/D source package which will result in two spec files
-rw-r--r--ChangeLog10
-rw-r--r--rpm/MPC.templ (renamed from rpm/MPC.spec)0
-rwxr-xr-xrpm/buildrpm.sh2
3 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 29d1dc98..dd44d840 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Wed Sep 21 18:51:02 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * rpm/MPC.templ:
+ * rpm/buildrpm.sh:
+ * rpm/MPC.spec:
+ Renamed the MPC spec file template to .templ and update the script
+ to read the template and create MPC.spec. Within a source package
+ we can only have one spec file and MPC is also included in the A/T/C/D
+ source package which will result in two spec files
+
Tue Sep 20 13:34:11 UTC 2011 James H. Hill <hillj at cs dot iupui dot edu>
* config/tena_middleware.mpb:
diff --git a/rpm/MPC.spec b/rpm/MPC.templ
index cbb6b3d3..cbb6b3d3 100644
--- a/rpm/MPC.spec
+++ b/rpm/MPC.templ
diff --git a/rpm/buildrpm.sh b/rpm/buildrpm.sh
index 98b224d8..90039ed9 100755
--- a/rpm/buildrpm.sh
+++ b/rpm/buildrpm.sh
@@ -74,7 +74,7 @@ fi
## Create our working directory and make the spec file
mkdir -p $WDIR
cd $WDIR
-sed "s/VERSION/$VERSION/; s/PACKAGER/$PACKAGER/; s!FINALDIR!$FDIR!" $loc/rpm/MPC.spec > MPC.spec
+sed "s/VERSION/$VERSION/; s/PACKAGER/$PACKAGER/; s!FINALDIR!$FDIR!" $loc/rpm/MPC.templ > MPC.spec
## Make a copy of the original MPC source to the new directory
mkdir -p $MDIR/$FDIR