Merge pull request #1489 from jberry-suse/package-binaries

Makefile: package all executable files in bindir.

.noserc

@@ -0,0 +1,2 @@
+[nosetests]
+ignore-files=metrics_release\.py

.travis.yml

@@ -71,7 +71,7 @@ matrix:
         # Needs python prefix to use the correct interpretor.
         - python ./obs_clone.py --cache --debug --apiurl-target local
       script:
-        - nosetests --with-coverage --cover-package=. --cover-inclusive --exclude-dir=./oqamaint
+        - nosetests --with-coverage --cover-package=. --cover-inclusive --exclude-dir=./oqamaint -c .noserc
       after_success:
         - coveralls
 

Makefile

@@ -2,18 +2,7 @@ SUBDIRS = factory-package-news abichecker
 
 include Makefile.common
 
-pkgdata_BINS = \
+pkgdata_BINS = $(shell find * -maxdepth 0 -executable -type f)
-	check_maintenance_incidents.py \
-	check_source.py \
-	devel-project.py \
-	leaper.py \
-	manager_42.py \
-	metrics.py \
-	pkglistgen.py \
-	repo_checker.py \
-	suppkg_rebuild.py \
-	totest-manager.py \
-	update_crawler.py
 pkgdata_SCRIPTS=$(wildcard *.py *.pl *.sh)
 pkgdata_SCRIPTS+=bs_mirrorfull findfileconflicts
 pkgdata_DATA+=bs_copy metrics osclib $(wildcard *.pm *.testcase)
@@ -42,7 +31,7 @@ check: test
 
 test:
 	# to see more add -v -d -s --nologcapture
-	$(wildcard /usr/bin/nosetests-2.*)
+	$(wildcard /usr/bin/nosetests-2.*) -c .noserc
 
 package:
 	touch dist/package/$(package_name).changes

dist/ci/obs-build-target

@@ -13,7 +13,7 @@ cd "$OBS_PACKAGE"
 
 # point _service file to SOURCE_DIR instead of remote
 sed -i "s|$(cd "$SOURCE_DIR" && git remote get-url origin)|$SOURCE_DIR|" _service
-sed -i "s|<param name=\"scm\">git</param>|<param name=\"scm\">git</param><param name=\"revision\">$(cd "$SOURCE_DIR" && git describe --all)</param>|" _service
+sed -i "s|<param name=\"scm\">git</param>|<param name=\"scm\">git</param><param name=\"revision\">$(cd "$SOURCE_DIR" && git describe --all --always)</param>|" _service
 
 rm *.obscpio
 osc service disabledrun

dist/package/openSUSE-release-tools.spec

@@ -362,6 +362,26 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc README.asciidoc
+%{_bindir}/osrt-biarchtool
+%{_bindir}/osrt-bs_mirrorfull
+%{_bindir}/osrt-build-fail-reminder
+%{_bindir}/osrt-checknewer
+%{_bindir}/osrt-check_source_in_factory
+%{_bindir}/osrt-check_tags_in_requests
+%{_bindir}/osrt-compare_pkglist
+%{_bindir}/osrt-create_test_dvds
+%{_bindir}/osrt-fcc_submitter
+%{_bindir}/osrt-findfileconflicts
+%{_bindir}/osrt-issue-diff
+%{_bindir}/osrt-legal-auto
+%{_bindir}/osrt-obs_clone
+%{_bindir}/osrt-openqa-maintenance
+%{_bindir}/osrt-openqa-maintenance2
+%{_bindir}/osrt-rebuildpacs
+%{_bindir}/osrt-requestfinder
+%{_bindir}/osrt-status
+%{_bindir}/osrt-sync-rebuild
+%{_bindir}/osrt-unmaintained
 %{_datadir}/%{source_dir}
 %exclude %{_datadir}/%{source_dir}/abichecker
 %exclude %{_datadir}/%{source_dir}/%{announcer_filename}