| |
@@ -13,26 +13,31 @@
|
| |
|
| |
Name: znc
|
| |
Version: 1.7.1
|
| |
- Release: 2%{?dist}
|
| |
+ Release: 3%{?dist}
|
| |
Summary: An advanced IRC bouncer
|
| |
- Group: System Environment/Daemons
|
| |
|
| |
License: ASL 2.0
|
| |
- URL: http://znc.in
|
| |
+ URL: https://znc.in
|
| |
Source0: %{url}/releases/%{name}-%{version}.tar.gz
|
| |
+ Source1: %{url}/releases/%{name}-%{version}.tar.gz.sig
|
| |
+ Source2: gpgkey-5AE420CC0209989E.asc
|
| |
+ # Use system-wide crypto policy
|
| |
+ # https://fedoraproject.org/wiki/Packaging:CryptoPolicies
|
| |
+ Patch0: 0001-Use-system-wide-crypto-policy.patch
|
| |
|
| |
BuildRequires: automake
|
| |
BuildRequires: c-ares-devel
|
| |
BuildRequires: cyrus-sasl-devel
|
| |
BuildRequires: gcc-c++
|
| |
BuildRequires: gettext-devel
|
| |
+ BuildRequires: gnupg2
|
| |
BuildRequires: libicu-devel
|
| |
BuildRequires: openssl-devel >= 0.9.8
|
| |
BuildRequires: perl(ExtUtils::Embed)
|
| |
|
| |
- %if (0%{?fedora} && 0%{?fedora} <= 24) || (0%{?rhel} && 0%{?rhel} <= 9)
|
| |
+ %if 0%{?rhel} && 0%{?rhel} <= 9
|
| |
Obsoletes: znc-extra <= %{version}-%{release}
|
| |
- %endif # (0%{?fedora} && 0%{?fedora} <= 24) || (0%{?rhel} && 0%{?rhel} <= 9)
|
| |
+ %endif # 0%{?rhel} && 0%{?rhel} <= 9
|
| |
|
| |
Requires(pre): shadow-utils
|
| |
BuildRequires: systemd
|
| |
@@ -45,7 +50,6 @@
|
| |
|
| |
%package devel
|
| |
Summary: Development files needed to compile ZNC modules
|
| |
- Group: Development/Libraries
|
| |
Requires: %{name} = %{version}-%{release} pkgconfig
|
| |
Requires: openssl-devel c-ares-devel glibc-devel libicu-devel%{?_isa}
|
| |
BuildRequires: pkgconfig
|
| |
@@ -57,7 +61,6 @@
|
| |
|
| |
%package modtcl
|
| |
Summary: TCL module for ZNC
|
| |
- Group: Development/Libraries
|
| |
|
| |
BuildRequires: tcl-devel
|
| |
|
| |
@@ -65,12 +68,11 @@
|
| |
Requires: tcl
|
| |
|
| |
%description modtcl
|
| |
- TCL module for ZNC
|
| |
+ %{summary}.
|
| |
|
| |
%if 0%{?with_modperl}
|
| |
%package modperl
|
| |
- Summary: perl module for ZNC
|
| |
- Group: Development/Libraries
|
| |
+ Summary: Perl module for ZNC
|
| |
|
| |
BuildRequires: perl-devel
|
| |
BuildRequires: perl-generators
|
| |
@@ -82,14 +84,13 @@
|
| |
Provides: perl(ZNC::Module) = %{version}-%{release}
|
| |
|
| |
%description modperl
|
| |
- perl module for ZNC
|
| |
+ %{summary}.
|
| |
%endif # 0%{?with_modperl}
|
| |
|
| |
|
| |
%if 0%{?with_modpython}
|
| |
%package modpython
|
| |
- Summary: python3 module for ZNC
|
| |
- Group: Development/Libraries
|
| |
+ Summary: Python3 module for ZNC
|
| |
|
| |
%if 0%{?rhel}
|
| |
BuildRequires: python34-devel
|
| |
@@ -106,14 +107,19 @@
|
| |
%endif # 0%{?rhel}
|
| |
|
| |
%description modpython
|
| |
- python3 module for ZNC
|
| |
+ %{summary}.
|
| |
%endif # 0%{?with_modpython}
|
| |
|
| |
|
| |
%prep
|
| |
- %setup -q
|
| |
- %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
|
| |
- chmod -x modules/q.cpp
|
| |
+ # Verify GPG signature
|
| |
+ gpghome="$(mktemp -qd)" # Ensure we don't use any existing gpg keyrings
|
| |
+ key="%{SOURCE2}"
|
| |
+ gpg2 --dearmor --quiet --batch --yes $key >/dev/null
|
| |
+ gpgv2 --homedir "$gpghome" --quiet --keyring $key.gpg %{SOURCE1} %{SOURCE0}
|
| |
+ rm -rf "$gpghome" $key.gpg # Cleanup tmp gpg home dir and dearmored key
|
| |
+
|
| |
+ %autosetup -p1
|
| |
|
| |
|
| |
%build
|
| |
@@ -130,26 +136,15 @@
|
| |
%else # 0%{?with_modpython}
|
| |
--disable-python \
|
| |
%endif # 0%{?with_modpython}
|
| |
- --enable-ipv6 --enable-cyrus --enable-tcl
|
| |
- %__make %{?_smp_mflags}
|
| |
+ --enable-ipv6 --enable-cyrus --enable-tcl --with-tcl=%{_libdir}
|
| |
+ %make_build V=1
|
| |
|
| |
|
| |
%install
|
| |
- %if 0%{?rhel} && 0%{?rhel} <= 5
|
| |
- %__rm -Rf "%{buildroot}"
|
| |
- %endif # 0%{?rhel} && 0%{?rhel} <= 5
|
| |
- %__make install DESTDIR="%{buildroot}"
|
| |
- mkdir -p %buildroot%{_unitdir}
|
| |
- #install -m 0644 %{SOURCE1} %buildroot%{_unitdir}/znc.service
|
| |
+ %make_install
|
| |
install -d "%{buildroot}%{_sharedstatedir}/znc"
|
| |
|
| |
|
| |
- %if 0%{?rhel} && 0%{?rhel} <= 5
|
| |
- %clean
|
| |
- %__rm -Rf "%{buildroot}"
|
| |
- %endif # 0%{?rhel} && 0%{?rhel} <= 5
|
| |
-
|
| |
-
|
| |
%pre
|
| |
getent group znc >/dev/null || groupadd -r znc
|
| |
getent passwd znc >/dev/null || \
|
| |
@@ -170,67 +165,25 @@
|
| |
|
| |
|
| |
%files
|
| |
- %doc LICENSE README.md
|
| |
+ %doc ChangeLog.md NOTICE README.md
|
| |
+ %license LICENSE
|
| |
%{_bindir}/znc
|
| |
- %{_mandir}/man1/*
|
| |
- %dir %{_libdir}/znc
|
| |
- %{_libdir}/znc/admindebug.so
|
| |
- %{_libdir}/znc/adminlog.so
|
| |
- %{_libdir}/znc/alias.so
|
| |
- %{_libdir}/znc/autoattach.so
|
| |
- %{_libdir}/znc/autocycle.so
|
| |
- %{_libdir}/znc/autoop.so
|
| |
- %{_libdir}/znc/autoreply.so
|
| |
- %{_libdir}/znc/autovoice.so
|
| |
- %{_libdir}/znc/awaynick.so
|
| |
- %{_libdir}/znc/awaystore.so
|
| |
- %{_libdir}/znc/block_motd.so
|
| |
- %{_libdir}/znc/blockuser.so
|
| |
- %{_libdir}/znc/bouncedcc.so
|
| |
- %{_libdir}/znc/buffextras.so
|
| |
- %{_libdir}/znc/cert.so
|
| |
- %{_libdir}/znc/certauth.so
|
| |
- %{_libdir}/znc/chansaver.so
|
| |
- %{_libdir}/znc/clearbufferonmsg.so
|
| |
- %{_libdir}/znc/clientnotify.so
|
| |
- %{_libdir}/znc/controlpanel.so
|
| |
- %{_libdir}/znc/crypt.so
|
| |
- %{_libdir}/znc/ctcpflood.so
|
| |
- %{_libdir}/znc/cyrusauth.so
|
| |
- %{_libdir}/znc/dcc.so
|
| |
- %{_libdir}/znc/disconkick.so
|
| |
- %{_libdir}/znc/fail2ban.so
|
| |
- %{_libdir}/znc/flooddetach.so
|
| |
- %{_libdir}/znc/identfile.so
|
| |
- %{_libdir}/znc/imapauth.so
|
| |
- %{_libdir}/znc/keepnick.so
|
| |
- %{_libdir}/znc/kickrejoin.so
|
| |
- %{_libdir}/znc/lastseen.so
|
| |
- %{_libdir}/znc/listsockets.so
|
| |
- %{_libdir}/znc/log.so
|
| |
- %{_libdir}/znc/missingmotd.so
|
| |
- %{_libdir}/znc/modules_online.so
|
| |
- %{_libdir}/znc/nickserv.so
|
| |
- %{_libdir}/znc/notes.so
|
| |
- %{_libdir}/znc/notify_connect.so
|
| |
- %{_libdir}/znc/partyline.so
|
| |
- %{_libdir}/znc/perform.so
|
| |
- %{_libdir}/znc/q.so
|
| |
- %{_libdir}/znc/raw.so
|
| |
- %{_libdir}/znc/route_replies.so
|
| |
- %{_libdir}/znc/sample.so
|
| |
- %{_libdir}/znc/samplewebapi.so
|
| |
- %{_libdir}/znc/sasl.so
|
| |
- %{_libdir}/znc/savebuff.so
|
| |
- %{_libdir}/znc/schat.so
|
| |
- %{_libdir}/znc/send_raw.so
|
| |
- %{_libdir}/znc/shell.so
|
| |
- %{_libdir}/znc/simple_away.so
|
| |
- %{_libdir}/znc/stickychan.so
|
| |
- %{_libdir}/znc/stripcontrols.so
|
| |
- %{_libdir}/znc/watch.so
|
| |
- %{_libdir}/znc/webadmin.so
|
| |
+ %{_mandir}/man1/znc.1*
|
| |
+ %{_libdir}/znc
|
| |
+ # exclude modperl, modpython, and modtcl files
|
| |
+ %exclude %{_libdir}/znc/modperl/
|
| |
+ %exclude %{_libdir}/znc/modperl.so
|
| |
+ %exclude %{_libdir}/znc/perleval.pm
|
| |
+ %if 0%{?with_modpython}
|
| |
+ %exclude %{_libdir}/znc/__pycache__/
|
| |
+ %exclude %{_libdir}/znc/modpython/
|
| |
+ %exclude %{_libdir}/znc/modpython.so
|
| |
+ %exclude %{_libdir}/znc/pyeval.py
|
| |
+ %endif # 0%{?with_modpython}
|
| |
+ %exclude %{_libdir}/znc/modtcl.so
|
| |
%{_datadir}/znc/
|
| |
+ # exclude modtcl files
|
| |
+ %exclude %{_datadir}/znc/modtcl/
|
| |
%{_unitdir}/znc.service
|
| |
%attr(-,znc,znc) %{_sharedstatedir}/znc/
|
| |
|
| |
@@ -238,9 +191,11 @@
|
| |
%{_bindir}/znc-buildmod
|
| |
%{_libdir}/pkgconfig/%{name}.pc
|
| |
%{_includedir}/znc/
|
| |
+ %{_mandir}/man1/znc-buildmod.1*
|
| |
|
| |
%files modtcl
|
| |
%{_libdir}/znc/modtcl.so
|
| |
+ %{_datadir}/znc/modtcl/
|
| |
|
| |
%if 0%{?with_modperl}
|
| |
%files modperl
|
| |
@@ -259,6 +214,21 @@
|
| |
|
| |
|
| |
%changelog
|
| |
+ * Fri Aug 24 2018 Todd Zullinger <tmz@pobox.com> - 1.7.1-3
|
| |
+ - Clean up ancient Fedora and RHEL conditionals
|
| |
+ - Remove cruft from %%prep
|
| |
+ - Use %%autosetup, %%make_build, and %%make_install macros
|
| |
+ - Use https for URL and SOURCE tags
|
| |
+ - Check upstream GPG signature in %%prep
|
| |
+ - Simplify %%{_libdir}/znc/ file list
|
| |
+ - Enable verbose make
|
| |
+ - Pass --with-tcl to ensure tclConfig.sh is found
|
| |
+ - Remove Group tag
|
| |
+ - Use system-wide crypto policy
|
| |
+ - Use %%license tag for LICENSE file
|
| |
+ - Add ChangeLog.md and NOTICE files to %%doc
|
| |
+ - Move znc-buildmod.1 to znc-devel
|
| |
+
|
| |
* Mon Jul 23 2018 Nick Bebout <nb@fedoraproject.org> - 1.7.1-2
|
| |
- Add gcc-c++ and redhat-rpm-config to znc-devel's dependencies
|
| |
|
| |
tmz
commented 5 years ago
This is a rather large set of (what I hope are) various cleanups and improvements to the znc packaging. I worked on this a few months back and then got sidetracked before filing the PR.
I'd be grateful for comments on any of the changes. Hopefully these changes are helpful. I can slice them up into multiple PR's if needed as well.
Thanks!