aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile15
-rw-r--r--initscripts.spec10
2 files changed, 7 insertions, 18 deletions
diff --git a/Makefile b/Makefile
index 2c9f795b..814982a1 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,7 @@ SUPERUSER=root
SUPERGROUP=root
VERSION := $(shell awk '/Version:/ { print $$2 }' initscripts.spec)
-RELEASE := $(shell awk '/Release:/ { print $$2 }' initscripts.spec | sed 's|%{?dist}||g')
-TAG=initscripts-$(VERSION)-$(RELEASE)
+TAG=$(VERSION)
mandir=/usr/share/man
@@ -122,15 +121,3 @@ clean:
tag:
@git tag -a -f -m "Tag as $(TAG)" $(TAG)
@echo "Tagged as $(TAG)"
-
-archive: clean syntax-check tag changelog
- @git archive --format=tar --prefix=initscripts-$(VERSION)/ HEAD > initscripts-$(VERSION).tar
- @mkdir -p initscripts-$(VERSION)/
- @cp ChangeLog initscripts-$(VERSION)/
- @tar --append -f initscripts-$(VERSION).tar initscripts-$(VERSION)
- @bzip2 -f initscripts-$(VERSION).tar
- @rm -rf initscripts-$(VERSION)
- @echo "The archive is at initscripts-$(VERSION).tar.bz2"
- @sha1sum initscripts-$(VERSION).tar.bz2 > initscripts-$(VERSION).sha1sum
- @scp initscripts-$(VERSION).tar.bz2 initscripts-$(VERSION).sha1sum fedorahosted.org:initscripts 2>/dev/null|| scp initscripts-$(VERSION).tar.bz2 initscripts-$(VERSION).sha1sum fedorahosted.org:/srv/web/releases/i/n/initscripts
- @echo "Everything done, files uploaded to Fedorahosted.org"
diff --git a/initscripts.spec b/initscripts.spec
index 8f1bfdbd..039b6273 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,12 +1,11 @@
Summary: Scripts to bring up network interfaces and legacy utilities
Name: initscripts
-Version: 9.69
+Version: 9.70
License: GPLv2
Group: System Environment/Base
Release: 1%{?dist}
-URL: http://fedorahosted.org/releases/i/n/initscripts/
-Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+URL: https://github.com/fedora-sysv/initscripts
+Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
Requires: /bin/awk, sed, coreutils
Requires: grep
Requires: module-init-tools
@@ -177,6 +176,9 @@ fi
%{_sysconfdir}/profile.d/debug*
%changelog
+* Fri Feb 24 2017 Lukáš Nykrýn <lnykryn@redhat.com> - 9.70-1
+- move source to github
+
* Tue Aug 30 2016 David Kaspar [Dee'Kej] <dkaspar@redhat.com> - 9.69-1
- fedora-import-state should no longer try to create folder with empty name (#1370259)