0.9.3a: New upstream release.

.gitignore

@@ -9,3 +9,4 @@ lirc-0.8.7pre2.tar.bz2
 /lirc-0.9.2.tar.gz
 /lirc-0.9.2a.tar.gz
 /lirc-0.9.3.tar.gz
+/lirc-0.9.3a.tar.gz

lirc.spec

@@ -1,43 +1,29 @@
-%global commit 228db97ccb454932a69deb6685b15e9fca9c6967
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
 %global _hardened_build 1
 
 %global released 1
-%define tag     devel
+#define tag     devel
 
 Name:           lirc
-Version:        0.9.3
+Version:        0.9.3a
-%global         src_vers  %(echo %{version} | sed 's/_/-/g' )
+Release:        1%{?tag:.}%{?tag}%{?dist}
-%if 0%{?released}
-Release:        5%{?dist}
-%else
-Release:        0.7.pre3%{tag}
-%endif
-
 Summary:        The Linux Infrared Remote Control package
 
+%global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}/
+
 Group:          System Environment/Daemons
                 # lib/ciniparser* and lib/dictionary* are BSD, others GPLv2
 License:        GPLv2 and BSD
 URL:            http://www.lirc.org/
-%if 0%{?released}
+Source0:        %{?released:%{repo}}%{name}-%{version}%{?tag:-}%{?tag}.tar.gz
-Source0:        http://downloads.sourceforge.net/lirc/%{version}/%{name}-%{src_vers}.tar.gz
+Source1:        README.fedora
-%else
+Source2:        99-remote-control-lirc.rules
-Source0:        ./lirc-%{src_vers}-%{tag}.tar.gz
-#Source0:        http://leamas.fedorapeople.org/lirc/lirc-%%{src_vers}.tar.gz
-%endif
-Source6:        README.fedora
-Source7:        99-remote-control-lirc.rules
                 # Config only, cannot be upstreamed.
 Patch1:         0001-Changing-effective-user-default.patch
-                # Already in upstream release branch.
-Patch2:         0002-irrecord-Fix-crash-when-invoked-without-arguments.patch
-Patch3:         0003-lib-Fix-missing-lirc-flag.patch
 
 BuildRequires:  alsa-lib-devel
 Buildrequires:  autoconf
 BuildRequires:  automake
+BuildRequires:  checkpolicy
 BuildRequires:  doxygen
 BuildRequires:  iguanaIR-devel
 BuildRequires:  kernel-headers
@@ -61,7 +47,9 @@ Requires(pre):     shadow-utils
 Requires(post):    systemd
                    #for triggerun
 Requires(post):    systemd-sysv
+Requires(post):    policycoreutils
 Requires(postun):  systemd
+Requires(postun):  policycoreutils
 Requires(preun):   systemd
 
 %description
@@ -117,6 +105,8 @@ that applications use to interface with LIRC.
 %package        config
 Summary:        LIRC Configuration Tools and Data
 Requires:       lirc-core = %{version}-%{release}
+Requires:       lirc-doc = %{version}-%{release}
+Requires:       gnome-icon-theme
 BuildArch:      noarch
 
 %description    config
@@ -214,14 +204,10 @@ full support for the ftdi device.
 
 
 %prep
-%if 0%{?released}
+%setup -qn %{name}-%{version}%{?tag:-}%{?tag}
-%setup -qn %{name}-%{src_vers}
-%else
-%setup -qn %{name}-%{src_vers}-%{tag}
-%endif
 %patch1 -p1
-%patch2 -p1
+sed -i -e 's|gtk-go-forward<|gtk-go-forward-ltr<|g' \
-%patch3 -p1
+    tools/lirc-setup/lirc-setup.ui
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 
 
@@ -232,39 +218,41 @@ CFLAGS="%{optflags}" %configure --libdir=%{_libdir}
 make %{?_smp_mflags}
 
 
+
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 cd $RPM_BUILD_ROOT%{_datadir}/lirc/contrib
 chmod 755 irman2lirc devinput.sh
 rm -f lirc.debian lirc.redhat lircs lirc.suse*
 cd $OLDPWD
-rm $RPM_BUILD_ROOT%{_libdir}/*.la
+find $RPM_BUILD_ROOT%{_libdir} -name \*.la -delete
-rm $RPM_BUILD_ROOT%{_libdir}/lirc/plugins/*.la
 
 install -pm 755 contrib/irman2lirc $RPM_BUILD_ROOT%{_bindir}
 install -Dpm 644 doc/lirc.hwdb $RPM_BUILD_ROOT%{_datadir}/lirc/lirc.hwdb
 install -Dpm 644 contrib/60-lirc.rules \
     $RPM_BUILD_ROOT%{_udevrulesdir}/60-lirc.rules
-install -Dpm 644 %{SOURCE7} \
+install -Dpm 644 %{SOURCE2} \
     $RPM_BUILD_ROOT%{_udevrulesdir}/99-remote-control-lirc.rules
-cp -a %{SOURCE6} README.fedora
+cp -a %{SOURCE1} README.fedora
 
 mkdir -p $RPM_BUILD_ROOT/%{_tmpfilesdir}
 echo "d /var/run/lirc  0755  lirc  lirc  10d" \
     > $RPM_BUILD_ROOT%{_tmpfilesdir}/lirc.conf
 
+
 %pre core
 getent group lirc >/dev/null || groupadd -r lirc
 getent passwd lirc >/dev/null || \
     useradd -r -g lirc -d /var/log/lirc -s /sbin/nologin \
         -c "LIRC daemon user, runs lircd." lirc
+usermod -a -G dialout lirc &> /dev/null || :
+usermod -a -G lock lirc &> /dev/null || :
+usermod -a -G input lirc &> /dev/null || :
 exit 0
 
 %post core
 %systemd_post lircd.service lircmd.service
 systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
-# Remove stale links after service name change lirc -> lircd:
-find /etc/systemd -name lirc.service -xtype l -delete || :
 
 %preun core
 %systemd_preun lircd.service lircmd.service
@@ -381,6 +369,14 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Wed Oct 14 2015 Alec Leamas <leamas.alec@gmail.com> - 0.9.3a-1
+  - Upstream update
+  - Added missing icons dependency.
+  - Some patches upstreamed.
+
+* Mon Sep 14 2015 Alec Leamas <leamas.alec@gmail.com> 0.9.3-6
+- Clean up some macros.
+
 * Wed Sep 09 2015 Alec Leamas <leamas.alec@gmail.com> - 0.9.3-5
 - Move scriptles to lirc-core (#1261289).
 - Adjust deps between lib, core, and devel (also #1261289).

lircd.te

@@ -0,0 +1,11 @@
+policy_module(lircd, 2)
+
+gen_require(`
+  type lircd_t;
+  type passwd_file_t;
+')
+
+
+#============= lircd_t ==============
+allow lircd_t passwd_file_t:file { read getattr open };
+allow lircd_t self:capability { setuid setgid dac_override };

sources

@@ -1 +1 @@
-1f7e13d664726ad2d685bc4bdebb8bba  lirc-0.9.3.tar.gz
+05627803238dedcba1225506b7143f69  lirc-0.9.3a.tar.gz