Merge branch 'master' into custom-repos

Makefile

@@ -4,9 +4,6 @@ VERSION       = 0.0.2
 all:
 	@:
 
-init:
-	if [ ! -d package/.osc ]; then rm -f package/* && osc co systemsmanagement:SCC:RMT rmt-server -o package; fi;
-
 clean:
 	rm -f rmt.8*
 	rm -rf package/*.tar.bz2
@@ -16,7 +13,7 @@ man:
 	bundle exec ronn --roff --pipe --manual RMT README.md > rmt.8 && gzip -f rmt.8
 	mv rmt.8.gz package/
 
-dist: init clean man
+dist: clean man
 	@mkdir -p $(NAME)-$(VERSION)/
 
 	@cp -r app $(NAME)-$(VERSION)/

README.md

@@ -149,19 +149,27 @@ EOFF
 
 ### Packaging
 
-The package is build in the OBS at: https://build.opensuse.org/package/show/systemsmanagement:SCC:RMT/rmt-server
-
-To initialize the package directory please run:
-
-```
-make init
-```
-
-If your `package/` directory already is initialized as an obs project dir, a simple `osc up` is enough.
-
-To build the package with updated sources, call `make dist` and then build for your distribution with:
-
-`osc build <dist> x86_64 --no-verify` where <dist> can be one of: `SLE_15`, `SLE_12_SP2`, `SLE_12_SP3`, `openSUSE_Leap_42.2`, `openSUSE_Leap_42.3`, `openSUSE_Tumbleweed`
+The package is built in the OBS at: https://build.opensuse.org/package/show/systemsmanagement:SCC:RMT/rmt-server
+
+1. Checkout/update OBS working copy:
+      * If the OBS project is not checked out, check out working copy of OBS project into a separate directory, e.g.:
+          ```
+          mkdir ~/obs
+          cd ~/obs
+          osc co systemsmanagement:SCC:RMT rmt-server
+          ```
+      * Alternatively, if OBS working copy is already checked out, update the working copy by running `osc up`
+2. In Git working directory, run `make dist` to build a tarball;
+3. Copy files from `package` directory to OBS working directory;
+4. Build the package with updated sources, call `make dist` and then build for your distribution by running:
+
+    `osc build <repository> <arch> --no-verify`
+
+    The list of all build targets and architectures that configured for the project can be obtained by running `osc repos`.
+
+5. Examine the changes by running `osc status` and `osc diff`;
+6. Stage the changes by running `osc addremove`;
+7. Commit the changes into OBS by running `osc ci`.
 
 ### With docker-compose
 

package/rmt-server.spec

@@ -59,7 +59,7 @@ BuildRequires:  ruby2.4-rubygem-bundler
 %else
 BuildRequires:  ruby2.5
 BuildRequires:  ruby2.5-devel
-BuildRequires:  ruby2.5-stdlib
+BuildRequires:  ruby2.5-rubygem-bundler
 %endif
 BuildRequires:  fdupes
 
@@ -69,6 +69,7 @@ Requires(post): ruby2.4
 Requires(post): ruby2.4-rubygem-bundler
 %else
 Requires(post): ruby2.5
+Requires(post): ruby2.5-rubygem-bundler
 %endif
 Requires(post): timezone
 Requires(post): util-linux
@@ -104,7 +105,7 @@ cp -p %SOURCE2 .
 %if 0%{?use_ruby_2_4}
 bundle.ruby2.4 install %{?jobs:--jobs %jobs} --without test development --deployment --standalone
 %else
-bundle.ruby.ruby2.5 install %{?jobs:--jobs %jobs} --without test development --deployment --standalone
+bundle.ruby2.5 install %{?jobs:--jobs %jobs} --without test development --deployment --standalone
 %endif
 
 %install