public/rpms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Polemarch wrong version removed

Browse Source
This commit is contained in:
dani
2019-07-27 16:18:12 +02:00
parent 69042b8695
commit dbf040c3aa
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fedora/SPECS/polemarch.spec
View File

@@ -15,11 +15,7 @@
%define namebase polemarch %define namebase polemarch
%define user polemarch %define user polemarch
%define datad poledata %define datad poledata
<<<<<<< HEAD
%define version 1.2.2
=======
%define version 1.3.1 %define version 1.3.1
>>>>>>> ebbf0ac45fc8d9ebd3f0f316186518df44db17ce
%define release 1 %define release 1
%define __prelink_undo_cmd %{nil} %define __prelink_undo_cmd %{nil}
%define _binaries_in_noarch_packages_terminate_build 0 %define _binaries_in_noarch_packages_terminate_build 0
@@ -115,13 +111,8 @@ sudo -u %{user} /opt/%{name}/bin/%{shortname}ctl migrate
[ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/* [ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/*
%changelog %changelog
<<<<<<< HEAD
* Thu Jun 20 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org>
- Update to 1.2.2 version.
=======
* Sat Jul 13 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org> * Sat Jul 13 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org>
- Update to 1.3.1 version. - Update to 1.3.1 version.
>>>>>>> ebbf0ac45fc8d9ebd3f0f316186518df44db17ce
* Mon Jun 15 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org> * Mon Jun 15 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org>
- Update to 1.2.1 version. - Update to 1.2.1 version.