Browse code

toybox: make it non-conflicting with elixir

Change-Id: I647986dfc96964d579860162b1b34ee18906ffb2
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/9991
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>

Prashant Singh Chauhan authored on 2020/06/29 19:52:31
Showing 2 changed files
... ...
@@ -2,7 +2,7 @@
2 2
 Name:            elixir
3 3
 Summary:         A modern approach to programming for the Erlang VM
4 4
 Version:         1.8.2
5
-Release:         1%{?dist}
5
+Release:         2%{?dist}
6 6
 License:         ASL 2.0
7 7
 URL:             http://elixir-lang.org/
8 8
 Source0:         https://github.com/elixir-lang/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
... ...
@@ -14,6 +14,7 @@ BuildRequires:   git
14 14
 BuildRequires:   sed
15 15
 BuildRequires:   erlang
16 16
 Requires:        erlang
17
+Conflicts:       toybox < 0.8.2-3
17 18
 
18 19
 %description
19 20
 Elixir is a programming language built on top of the Erlang VM.
... ...
@@ -46,6 +47,8 @@ ln -s %{_datadir}/%{name}/%{version}/bin/{elixir,elixirc,iex,mix} %{buildroot}/%
46 46
 %{_datadir}/%{name}
47 47
 
48 48
 %changelog
49
+*   Tue Jun 30 2020 Prashant S Chauhan <psinghchauha@vmware.com> 1.8.2-2
50
+-   Do not conflict with toybox >= 0.8.2-3
49 51
 *   Tue Oct 29 2019 Keerthana K <keerthanak@vmware.com> 1.8.2-1
50 52
 -   Update to 1.8.2
51 53
 *   Mon Aug 26 2019 Keerthana K <keerthanak@vmware.com> 1.5.0-1
... ...
@@ -1,6 +1,6 @@
1 1
 Name:           toybox
2 2
 Version:        0.8.2
3
-Release:        2%{?dist}
3
+Release:        3%{?dist}
4 4
 License:        BSD
5 5
 Summary:        Common Linux command line utilities in a single executable
6 6
 Url:            http://landley.net/toybox/
... ...
@@ -144,6 +144,10 @@ tests_to_run=`echo  $tests_to_run | sed -e 's/pkill//g'`
144 144
 [ $2 -eq 0 ] || exit 0
145 145
 %mktoy /usr/bin/cmp
146 146
 
147
+%triggerpostun -- elixir
148
+[ $2 -eq 0 ] || exit 0
149
+%mktoy /usr/bin/mix
150
+
147 151
 %triggerpostun -- expect
148 152
 [ $2 -eq 0 ] || exit 0
149 153
 %mktoy /usr/bin/mkpasswd
... ...
@@ -384,6 +388,9 @@ tests_to_run=`echo  $tests_to_run | sed -e 's/pkill//g'`
384 384
 # diffutils
385 385
 %ghost /usr/bin/cmp
386 386
 
387
+# elixir
388
+%ghost /usr/bin/mix
389
+
387 390
 # expect
388 391
 %ghost /usr/bin/mkpasswd
389 392
 
... ...
@@ -535,6 +542,9 @@ tests_to_run=`echo  $tests_to_run | sed -e 's/pkill//g'`
535 535
 /usr/bin/uuencode
536 536
 
537 537
 %changelog
538
+*   Tue Jun 30 2020 Prashant S Chauhan <psinghchauhan@vmware.com> 0.8.2-3
539
+-   Avoid conflicts with other packages by not packaging (%ghost-ing) symlinks
540
+-   Added elixir
538 541
 *   Wed Apr 15 2020 Alexey Makhalov <amakhalov@vmware.com> 0.8.2-2
539 542
 -   Avoid conflicts with other packages by not packaging (%ghost-ing) symlinks
540 543
 -   Use system zlib as it is installed by tdnf