Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-07-27 22:19:25 +02:00
Code Issues Projects Releases Wiki Activity

2018-11-20 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Modified the 'rivendell-opsguide' RPM package to be 'noarch'.
	* Added the components of the 'rivendell-opsguide' subpackage to
	the 'rivendell' RPM package.
This commit is contained in:
Fred Gleason 2018-11-20 16:37:56 -05:00
parent 61a02d63b5
commit 1617e978fd
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -18037,3 +18037,7 @@
2018-11-20 Fred Gleason <fredg@paravelsystems.com> 2018-11-20 Fred Gleason <fredg@paravelsystems.com>
* Fixed a packaging conflict between the 'rivendell' and * Fixed a packaging conflict between the 'rivendell' and
'rivendell-opsguide' RPM packages. 'rivendell-opsguide' RPM packages.
2018-11-20 Fred Gleason <fredg@paravelsystems.com>
* Modified the 'rivendell-opsguide' RPM package to be 'noarch'.
* Added the components of the 'rivendell-opsguide' subpackage to
the 'rivendell' RPM package.

1
Makefile.am
View File

@ -69,6 +69,7 @@ rpm: dist
cp rivendell-$(VERSION).tar.gz $(HOME)/rpmbuild/SOURCES/ cp rivendell-$(VERSION).tar.gz $(HOME)/rpmbuild/SOURCES/
$(RPMBUILD) -ba --target $(ARCH)-$(VENDOR)-linux rivendell.spec $(RPMBUILD) -ba --target $(ARCH)-$(VENDOR)-linux rivendell.spec
mv $(HOME)/rpmbuild/RPMS/$(ARCH)/rivendell-*.rpm $(top_srcdir)/ mv $(HOME)/rpmbuild/RPMS/$(ARCH)/rivendell-*.rpm $(top_srcdir)/
mv $(HOME)/rpmbuild/RPMS/noarch/rivendell-*.rpm $(top_srcdir)/
mv $(HOME)/rpmbuild/SRPMS/rivendell-*.src.rpm $(top_srcdir)/ mv $(HOME)/rpmbuild/SRPMS/rivendell-*.src.rpm $(top_srcdir)/
rm $(HOME)/rpmbuild/SOURCES/rivendell-$(VERSION).tar.gz rm $(HOME)/rpmbuild/SOURCES/rivendell-$(VERSION).tar.gz

9
rivendell.spec.in
View File

@ -25,9 +25,10 @@ Release: @RPM_RELEASE@
License: GPL License: GPL
Packager: Fred Gleason <fredg@paravelsystems.com> Packager: Fred Gleason <fredg@paravelsystems.com>
Source: rivendell-@VERSION@.tar.gz Source: rivendell-@VERSION@.tar.gz
Requires: @MYSQL_PKG@, @QT4_MYSQL_PKG@, @APACHE_PKG@, curl, @USERMODE_PKG@, @CDDA2WAV_PKG@, Requires: @MYSQL_PKG@, @QT4_MYSQL_PKG@, @APACHE_PKG@, curl, @USERMODE_PKG@, @CDDA2WAV_PKG@
BuildRoot: /var/tmp/rivendell-@VERSION@ BuildRoot: /var/tmp/rivendell-@VERSION@
Obsoletes: rivendell-base Obsoletes: rivendell-base rivendell-opsguide
Conflicts: rivendell-opsguide
%package importers %package importers
Summary: Library importers for the Rivendell Broadcast Automation System Summary: Library importers for the Rivendell Broadcast Automation System
@ -35,6 +36,8 @@ Requires: rivendell = @VERSION@, madplay
%package opsguide %package opsguide
Summary: Rivendell Operations and Administration Guide Summary: Rivendell Operations and Administration Guide
BuildArch: noarch
Conflicts: rivendell
%package webapi %package webapi
Summary: Client libraries for interfacing with Rivendell's Web API. Summary: Client libraries for interfacing with Rivendell's Web API.
@ -394,6 +397,8 @@ rm -rf $RPM_BUILD_ROOT
@HPI_FILE3@ @HPI_FILE3@
@HPI_FILE4@ @HPI_FILE4@
/etc/auto.master.d/rd.audiostore.autofs /etc/auto.master.d/rd.audiostore.autofs
@LOCAL_PREFIX@/share/rivendell/opsguide.pdf
@LOCAL_PREFIX@/share/rivendell/html/*
%files webapi %files webapi