Version 1.06

ocelot-inc · Dec 12, 2017 · dd4bdbd · dd4bdbd
1 parent 0eac6b0
commit dd4bdbd
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/rpm_build.sh b/rpm_build.sh
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # rpm_build.sh -- used by Ocelot to produce .rpm file for release 1.0.6
 
 # We produced ocelotgui-1.0.6-1.x86_64.rpm with Fedora Release 26 64-bit thus:
@@ -45,11 +44,6 @@
 
 cd ~/ocelotgui
 tar -czvf ocelotgui-1.0.6-for-rpm.tar.gz ocelotgui-1.0.6/
-=======
-# WARNING: This destroys ~/.rpmmacros if such a file already exists.
-cd ~/ocelotgui
-tar -czvf ocelotgui-1.0.5.tar.gz ocelotgui-1.0.5/
->>>>>>> 4361611a1d70d98a1431161aff4f09517d206cf3
 rm -r rp
 mkdir rp
 cd rp
@@ -59,13 +53,8 @@ cat <<EOF > ~/.rpmmacros
 %_ocelotguidir $HOME/ocelotgui
 EOF
 mkdir -p rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
-<<<<<<< HEAD
 cp ~/ocelotgui/ocelotgui-1.0.6-for-rpm.tar.gz ocelotgui-1.0.6-for-rpm.tar.gz
 cp ocelotgui-1.0.6-for-rpm.tar.gz rpmbuild/SOURCES/ocelotgui-1.0.6-for-rpm.tar.gz
-=======
-cp ~/ocelotgui/ocelotgui-1.0.5.tar.gz ocelotgui-1.0.5.tar.gz
-cp ocelotgui-1.0.5.tar.gz rpmbuild/SOURCES/ocelotgui-1.0.5.tar.gz
->>>>>>> 4361611a1d70d98a1431161aff4f09517d206cf3
 cp ~/ocelotgui/ocelotgui.spec ocelotgui.spec
 rpmbuild -ba ocelotgui.spec