diff --git a/ncid-mythtv.patch b/ncid-mythtv.patch new file mode 100644 index 0000000..19b1fcc --- /dev/null +++ b/ncid-mythtv.patch @@ -0,0 +1,30 @@ + +Index: ncid/modules/Makefile +=================================================================== +--- ncid.orig/modules/Makefile 2018-03-27 15:34:26.000000000 -0400 ++++ ncid/modules/Makefile 2019-02-02 11:24:13.427100297 -0500 +@@ -1,10 +1,10 @@ + SHMOD = ncid-page.sh ncid-samba.sh ncid-speak.sh \ + ncid-alert.sh ncid-initmodem.sh ncid-kpopup.sh ncid-mysql.sh \ +- ncid-mythtv.sh ncid-notify.sh ncid-skel.sh ncid-wakeup.sh \ ++ ncid-notify.sh ncid-skel.sh ncid-wakeup.sh \ + ncid-yac.sh + PLMOD = + DIST = ncid-alert.conf-in ncid-kpopup.conf-in ncid-mysql.conf-in \ +- ncid-mythtv.conf-in ncid-notify.conf-in ncid-page.conf-in \ ++ ncid-notify.conf-in ncid-page.conf-in \ + ncid-samba.conf-in ncid-skel.conf-in ncid-speak.conf-in \ + ncid-yac.conf-in + CONF = +Index: ncid/systemd/Makefile +=================================================================== +--- ncid.orig/systemd/Makefile 2018-09-10 13:25:10.000000000 -0400 ++++ ncid/systemd/Makefile 2019-02-02 11:27:01.666320533 -0500 +@@ -7,7 +7,6 @@ + wc2ncid.service \ + yac2ncid.service \ + ncid-mysql.service \ +- ncid-mythtv.service \ + ncid-notify.service \ + ncid-page.service \ + ncid-samba.service \ diff --git a/ncid.spec b/ncid.spec index 2df7e32..06168f7 100644 --- a/ncid.spec +++ b/ncid.spec @@ -7,6 +7,7 @@ License: GPLv3+ Url: http://ncid.sourceforge.net Source0: https://sourceforge.net/projects/ncid/files/%{name}/%{version}/%{name}-%{version}-src.tar.gz Patch0: ncid-makefiles.patch +Patch1: ncid-mythtv.patch BuildRequires: gcc, libpcap-devel, pcre-devel, libappstream-glib BuildRequires: perl-generators, perl-podlators @@ -72,14 +73,6 @@ Requires: %{name}-client = %{version}-%{release}, mysql The NCID mysql module inputs NCID Caller information into a SQL database using either MariaDB or a MySQL database. -%package mythtv -Summary: NCID mythtv module sends Caller ID information to MythTV -BuildArch: noarch -Requires: %{name}-client = %{version}-%{release}, mythtv-frontend - -%description mythtv -The NCID MythTV module displays Caller ID information using mythutil - %package samba Summary: NCID samba module sends Caller ID information to windows machines BuildArch: noarch @@ -286,6 +279,7 @@ make install install-fedora prefix=%{buildroot}/%{_prefix} \ %{_mandir}/man1/ncid-yac.1* %{_mandir}/man5/ncid.conf.5* %{_mandir}/man7/ncid_modules.7* +%{_mandir}/man1/ncid-mythtv.1* %files kpopup %defattr(-,root,root) @@ -304,14 +298,6 @@ make install install-fedora prefix=%{buildroot}/%{_prefix} \ %{_mandir}/man1/ncid-mysql.1* %{_mandir}/man8/ncid-mysql-setup.8* -%files mythtv -%defattr(-,root,root) -%doc VERSION modules/README.modules -%{_datadir}/ncid/modules/ncid-mythtv -%config(noreplace) %{_sysconfdir}/ncid/conf.d/ncid-mythtv.conf -%{_unitdir}/ncid-mythtv.service -%{_mandir}/man1/ncid-mythtv.1* - %files samba %defattr(-,root,root) %doc VERSION modules/README.modules @@ -335,10 +321,7 @@ make install install-fedora prefix=%{buildroot}/%{_prefix} \ %systemd_post ncid2ncid.service obi2ncid.service rn2ncid.service sip2ncid.service wc2ncid.service xdmf2ncid.service yac2ncid.service %post client -%systemd_post ncid-initmodem.service ncid-mysql.service ncid-mythtv.service ncid-notify.service ncid-page.service ncid-yac.service - -%post mythtv -%systemd_post ncid-mythtv.service +%systemd_post ncid-initmodem.service ncid-mysql.service ncid-notify.service ncid-page.service ncid-yac.service %post mysql %systemd_post ncid-mysql.service @@ -354,7 +337,7 @@ make install install-fedora prefix=%{buildroot}/%{_prefix} \ %preun client # stop all modules even from other packages -%systemd_preun ncid-alert ncid-initmodem.service systemd/ncid-mysql.service systemd/ncid-mythtv.service systemd/ncid-notify.service systemd/ncid-page.service systemd/ncid-samba.service systemd/ncid-speak.service systemd/ncid-yac.service +%systemd_preun ncid-alert ncid-initmodem.service ncid-mysql.service ncid-notify.service ncid-page.service ncid-samba.service ncid-speak.service ncid-yac.service # stop ncid GUI client and any user started modules if [ $1 -eq 0 ] ; then pkill -f 'wish.*ncid ' || true @@ -364,9 +347,6 @@ fi %preun mysql %systemd_preun ncid-mysql.service -%preun mythtv -%systemd_preun ncid-mythtv.service - %preun samba %systemd_preun ncid-samba.service @@ -403,9 +383,6 @@ fi %postun mysql %systemd_postun_with_restart ncid-mysql.service -%postun mythtv -%systemd_postun_with_restart ncid-mythtv.service - %postun samba %systemd_postun_with_restart ncid-samba.service @@ -418,6 +395,9 @@ touch --no-create %{_datadir}/icons/hicolor &>/dev/null gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sat Feb 02 2019 John Chmielewski - 1.10.1-5 +- added ncid-mythtv.patch + * Fri Feb 01 2019 Fedora Release Engineering - 1.10.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild