Merge branch 'augensalat-master' (Updated RPM Spec)

Fixes #87
magicmonty · Oct 11, 2014 · 5a09d4a · 5a09d4a
2 parents a4a7902 + ecb1fd9
commit 5a09d4a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -260,10 +260,10 @@ from scratch by following this procedure:
 * Run the following command to create a tarball:
 
 ````sh
-    VER1=$(git describe)
+    VER=$(git describe)
     # replace dash with underscore to work around
     # rpmbuild does not allow dash in version string
-    VER=${VER1//\-/_}
+    VER=${VER//\-/_}
     git archive                                \
         --format tar                           \
         --prefix=bash-git-prompt-${VER}/       \
@@ -272,6 +272,7 @@ from scratch by following this procedure:
             *.py                               \
             *.fish                             \
             README.md                          \
+            themes                             \
       > bash-git-prompt-${VER}.tar
     mkdir -p /tmp/bash-git-prompt-${VER}
     sed "s/Version:.*/Version:        ${VER}/"          \
@@ -317,4 +318,4 @@ I accept tips through [Gittip][tip] and [Flattr][flattr].
 [license]:https://github.com/magicmonty/bash-git-prompt/tree/master/LICENSE.txt
 [flattr]: https://flattr.com/submit/auto?user_id=magicmonty&url=https%3A%2F%2Fgithub.com%2Fmagicmonty%2Fbash-git-prompt
 [homebrew]: http://brew.sh/
-[upforgrabs]: https://github.com/magicmonty/bash-git-prompt/labels/up-for-grabs
+[upforgrabs]: https://github.com/magicmonty/bash-git-prompt/labels/up-for-grabs
diff --git a/bash-git-prompt.spec b/bash-git-prompt.spec
@@ -34,6 +34,9 @@ install -pm 755 *.sh %{buildroot}%{_datadir}/%{name}
 install -pm 755 *.py %{buildroot}%{_datadir}/%{name}
 install -pm 755 *.fish %{buildroot}%{_datadir}/%{name}
 install -pm 644 README.md %{buildroot}%{_datadir}/%{name}
+install -d 755 %{buildroot}%{_datadir}/%{name}/themes
+install -pm 644 themes/*.bgptheme %{buildroot}%{_datadir}/%{name}/themes
+install -pm 644 themes/*.bgptemplate %{buildroot}%{_datadir}/%{name}/themes
 
 # never include compiled Python program
 rm -fr  %{buildroot}%{_datadir}/%{name}/*.pyo
@@ -57,6 +60,7 @@ if [ -f %{_datadir}/%{name}/gitprompt.sh ]; then
     # Set config variables first
 
     GIT_PROMPT_ONLY_IN_REPO=1
+    GIT_PROMPT_THEME=Default
     source %{_datadir}/%{name}/gitprompt.sh
 fi
 %{END_TOKEN}