diff --git a/.gitignore b/.gitignore index aaaa333..5297cc6 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /9d724aa10312b860f32a82ffb3606ff74f2214fe.tar.gz /8a66e2950de23da470122980a5649f14d0f294a7.tar.gz /09ac4796ba8b9a913d440aa3d712115bdbaa85db.tar.gz +/d378de0dbbf15123cc5322dfe10a09d9fcbcbca7.tar.gz diff --git a/atomic.spec b/atomic.spec index 8f60658..905e015 100644 --- a/atomic.spec +++ b/atomic.spec @@ -13,12 +13,12 @@ %global pylint python3-pylint %endif -%global commit 09ac4796ba8b9a913d440aa3d712115bdbaa85db +%global commit d378de0dbbf15123cc5322dfe10a09d9fcbcbca7 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: atomic Version: 1.7 -Release: 1.git%{shortcommit}%{?dist} +Release: 2.git%{shortcommit}%{?dist} Summary: Tool for managing ProjectAtomic systems and containers License: LGPLv2+ URL: https://github.com/projectatomic/atomic @@ -109,6 +109,9 @@ python autofiles.py > files \ %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.%{name}.conf %changelog +* Mon Nov 23 2015 Lokesh Mandvekar - 1.7-2.gitd378de0 +- built atomic commit#d378de0 + * Thu Nov 12 2015 Fedora Release Engineering - 1.6-6.git09ac479 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 diff --git a/separate-pylint-from-python-build.patch b/separate-pylint-from-python-build.patch deleted file mode 100644 index af166df..0000000 --- a/separate-pylint-from-python-build.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -up atomic-8a66e2950de23da470122980a5649f14d0f294a7/Makefile.pylint atomic-8a66e2950de23da470122980a5649f14d0f294a7/Makefile ---- atomic-8a66e2950de23da470122980a5649f14d0f294a7/Makefile.pylint 2015-11-10 13:01:13.000000000 +0100 -+++ atomic-8a66e2950de23da470122980a5649f14d0f294a7/Makefile 2015-11-11 12:24:16.942917135 +0100 -@@ -7,7 +7,7 @@ PYLINT ?= /usr/bin/pylint - GO_MD2MAN ?= /usr/bin/go-md2man - - .PHONY: all --all: python-build docs -+all: python-build docs pylint-check - - .PHONY: test - test: -@@ -16,6 +16,8 @@ test: - .PHONY: python-build - python-build: - $(PYTHON) setup.py build -+ -+pylint-check: - $(PYLINT) -E --additional-builtins=_ *.py atomic Atomic tests/unit/*.py - - MANPAGES_MD = $(wildcard docs/*.md) -diff -up atomic-8a66e2950de23da470122980a5649f14d0f294a7/Makefile.pylint atomic-8a66e2950de23da470122980a5649f14d0f294a7/Makefile ---- atomic-8a66e2950de23da470122980a5649f14d0f294a7/Makefile.pylint 2015-11-11 12:51:18.814015403 +0100 -+++ atomic-8a66e2950de23da470122980a5649f14d0f294a7/Makefile 2015-11-11 12:51:56.626414033 +0100 -@@ -33,8 +33,8 @@ clean: - $(PYTHON) setup.py clean - -rm -rf build *~ \#* *pyc .#* docs/*.1 - --.PHONY: install --install: all -+.PHONY: install-only -+install-only: - $(PYTHON) setup.py install --install-scripts /usr/share/atomic `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` - - install -d -m 0755 $(DESTDIR)/usr/bin -@@ -50,3 +50,6 @@ install: all - install -m 644 $(basename $(MANPAGES_MD)) $(PREFIX)/share/man/man1 - - echo ".so man1/atomic-push.1" > $(PREFIX)/share/man/man1/atomic-upload.1 -+ -+.PHONY: install -+install: all install-only diff --git a/sources b/sources index 76b5c6c..ac7e79f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1126f399e0e2bdbaf55427110fb236e8 09ac4796ba8b9a913d440aa3d712115bdbaa85db.tar.gz +de2fa6153e21d585f96fdaf0f4b7883a d378de0dbbf15123cc5322dfe10a09d9fcbcbca7.tar.gz