diff --git a/debian/rules b/debian/rules index d6ae9f5002b3a56e7ccc09cbcf9dc56420a925b2..fb6a2f4850fa08d974977f11da83b89b3218c1cf 100755 --- a/debian/rules +++ b/debian/rules @@ -5,8 +5,6 @@ PKD = $(abspath $(dir $(MAKEFILE_LIST))) #PKG = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog --show-field=Source)) PKG = $(shell dpkg-parsechangelog -l$(PKD)/changelog --show-field=Source) VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-\d+.*)};') -DISTRIB_ID = $(shell grep -hPo "^ID=\K.*" /etc/*ease) -DISTRIB_VERSION_ID = $(shell grep -hPo "^VERSION_ID=\K.*" /etc/*ease) DAEMON_TAG = origin/master @@ -45,9 +43,6 @@ override_dh_auto_install: mkdir -p $(CURDIR)/debian/ring-daemon-dev/usr/include/dring mv $(CURDIR)/debian/ring-daemon/usr/include/dring/* $(CURDIR)/debian/ring-daemon-dev/usr/include/dring rm -rf $(CURDIR)/debian/ring-daemon/usr/include/ - # Add repository file - mkdir -p $(CURDIR)/debian/ring-daemon/etc/apt/sources.list.d/ - echo "deb http://nightly.apt.ring.cx/$(DISTRIB_ID)_$(DISTRIB_VERSION_ID) ring main" > $(CURDIR)/debian/ring-daemon/etc/apt/sources.list.d/ring-nightly.list dh_auto_install get-orig-source: diff --git a/ring-daemon.spec b/ring-daemon.spec index ed7c709491c4a4f844cde691f5bb7c93eeba9b8c..2ed98ebfc855762940d3e12d992543d150223a72 100644 --- a/ring-daemon.spec +++ b/ring-daemon.spec @@ -65,14 +65,6 @@ make -j %{?_smp_mflags} %install mkdir -p %{buildroot}/ring-daemon make DESTDIR=%{buildroot} install -mkdir -p %{buildroot}/%{_sysconfdir}/yum.repos.d/ -echo '[ring]' > %{buildroot}/%{_sysconfdir}/yum.repos.d/ring-nightly.repo -echo 'name=Ring - $basearch - Nightly' >> %{buildroot}/%{_sysconfdir}/yum.repos.d/ring-nightly.repo -echo 'baseurl=http://nightly.yum.ring.cx/fedora_$releasever' >> %{buildroot}/%{_sysconfdir}/yum.repos.d/ring-nightly.repo -echo 'gpgcheck=1' >> %{buildroot}/%{_sysconfdir}/yum.repos.d/ring-nightly.repo -echo 'gpgkey=http://gpl.savoirfairelinux.net/ring-download/ring.pub.key' >> %{buildroot}/%{_sysconfdir}/yum.repos.d/ring-nightly.repo -echo 'enabled=1' >> %{buildroot}/%{_sysconfdir}/yum.repos.d/ring-nightly.repo - %files %defattr(-,root,root,-)