remove .git* meta data files

MythTV · Mar 13, 2012 · 1c5fb87 · 1c5fb87
1 parent 8590e7f
commit 1c5fb87
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 11 deletions.
diff --git a/rpm/mythtv.spec b/rpm/mythtv.spec
@@ -64,10 +64,10 @@
 %define desktop_vendor  mythtv
 
 # MythTV Version string -- preferably the output from git --describe
-%define vers_string v0.25pre-4799-g7b526c4
+%define vers_string v0.25-beta-99-gff73126
 
 # Git Revision number and branch
-%define _gitrev 4799.g7b526c4
+%define _gitrev 1
 %define branch master
 
 #
@@ -852,6 +852,8 @@ SOURCE_VERSION=%{vers_string}
 BRANCH=%{branch}
 EOF
 
+# Delete any git control files
+    find . -name .git\* -exec rm {} \+
 # Drop execute permissions on contrib bits, since they'll be %doc
     find contrib/ -type f -exec chmod -x "{}" \;
 # And drop execute bit on theme html files
@@ -889,14 +891,17 @@ EOF
 cd ..
 
 ##### MythPlugins
-#%if %{with_plugins}
-#
-#cd mythplugins
-#
-## And back to the compile root
-#cd ..
-#
-#%endif
+%if %{with_plugins}
+
+cd mythplugins
+
+# Delete any git control files
+    find . -name .git\* -exec rm {} \+
+
+# And back to the compile root
+cd ..
+
+%endif
 
 ################################################################################
 
@@ -1474,6 +1479,9 @@ fi
 ################################################################################
 
 %changelog
+* Wed Mar 12 2012 Chris Petersen <cpetersen@mythtv.org> 0.25-0.1.git
+- Remove .git* meta data files before installing
+
 * Wed Mar 07 2012 Richard Shaw <hobbes1069@gmail.com> - 0.25-0.1.git
 - Update spec to allow for use of systemd for mythbackend.
 - Add systemd service file.

diff --git a/rpm/mythweb.spec b/rpm/mythweb.spec
@@ -30,7 +30,7 @@
 %define desktop_vendor  mythtv
 
 # Git Revision number and branch ID
-%define _gitrev 4799.g7b526c4
+%define _gitrev 1
 %define branch master
 
 #
@@ -76,6 +76,9 @@ The web interface to MythTV.
 %prep
 %setup -c -q
 
+# Delete any git control files
+    find . -name .git\* -exec rm {} \+
+
 # Fix up permissions for MythWeb
     chmod -R g-w mythweb/*
 
@@ -125,6 +128,9 @@ rm -rf %{buildroot}
 ################################################################################
 
 %changelog
+* Wed Mar 12 2012 Chris Petersen <cpetersen@mythtv.org> 0.25-0.1.git
+- Remove .git* meta data files before installing
+
 * Sun Mar 03 2012 Chris Petersen <cpetersen@mythtv.org> 0.25-0.1.git
 - Make this package compile