Merge branch 'master' into el6
Conflicts: znc.spec
This commit is contained in:
commit
a715998d18
1
.gitignore
vendored
1
.gitignore
vendored
@ -21,3 +21,4 @@
|
||||
/znc-0.202.tar.gz
|
||||
/znc-0.204.tar.gz
|
||||
/znc-0.206.tar.gz
|
||||
/znc-1.0-alpha1.tar.gz
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
b7d3f21da81abaeb553066b0e10beb53 znc-0.206.tar.gz
|
||||
c2287115826d2e226ae60f437de69833 znc-1.0-alpha1.tar.gz
|
||||
|
71
znc.spec
71
znc.spec
@ -9,20 +9,20 @@
|
||||
|
||||
Summary: An advanced IRC bouncer
|
||||
Name: znc
|
||||
Version: 0.206
|
||||
Version: 1.0
|
||||
#Release: 0.1.20110801git%{?dist}
|
||||
Release: 1%{?dist}
|
||||
Release: 0.1.alpha1%{?dist}
|
||||
License: GPLv2 with exceptions
|
||||
Group: System Environment/Daemons
|
||||
URL: http://znc.in
|
||||
Source0: http://znc.in/releases/znc-0.206.tar.gz
|
||||
Source0: http://znc.in/releases/znc-1.0-alpha1.tar.gz
|
||||
|
||||
%if %{use_systemd}
|
||||
Source1: znc.service
|
||||
%endif
|
||||
|
||||
%if !%{use_systemd}
|
||||
Source1: znc.init
|
||||
Source1: znc.init
|
||||
%endif
|
||||
|
||||
# git clone https://github.com/znc/znc.git
|
||||
@ -35,6 +35,8 @@ BuildRequires: openssl-devel >= 0.9.8
|
||||
BuildRequires: cyrus-sasl-devel
|
||||
BuildRequires: c-ares-devel automake
|
||||
BuildRequires: perl(ExtUtils::Embed) swig tcl-devel
|
||||
Obsoletes: znc-extra <= %{version}-%{release}
|
||||
|
||||
%if %{use_systemd}
|
||||
BuildRequires: systemd-units
|
||||
%endif
|
||||
@ -69,14 +71,6 @@ BuildRequires: pkgconfig
|
||||
All includes and program files you need to compile your own znc
|
||||
modules.
|
||||
|
||||
%package extra
|
||||
Summary: Extra modules for ZNC
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description extra
|
||||
Extra modules for ZNC
|
||||
|
||||
%package modtcl
|
||||
Summary: TCL module for ZNC
|
||||
Group: Development/Libraries
|
||||
@ -97,7 +91,8 @@ Provides: perl(ZNC::Module) = %{version}-%{release}
|
||||
perl module for ZNC
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
#%setup -q -n %{name}-%{version}
|
||||
%setup -q -n znc-1.0-alpha1
|
||||
#%patch0 -p1
|
||||
%__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
|
||||
chmod -x modules/q.cpp
|
||||
@ -106,7 +101,7 @@ chmod -x modules/q.cpp
|
||||
./autogen.sh
|
||||
%configure \
|
||||
--with-module-prefix=%{_libdir}/znc \
|
||||
--enable-ipv6 --enable-extra --enable-sasl --enable-perl --enable-tcl
|
||||
--enable-ipv6 --enable-sasl --enable-python --enable-perl --enable-tcl
|
||||
%__make %{?_smp_mflags}
|
||||
|
||||
%pre
|
||||
@ -187,36 +182,50 @@ fi
|
||||
%doc AUTHORS LICENSE LICENSE.OpenSSL README.md
|
||||
%{_bindir}/znc
|
||||
%{_mandir}/man1/*
|
||||
%{_libdir}/znc/admin.so
|
||||
%{_libdir}/znc/adminlog.so
|
||||
%{_libdir}/znc/autoattach.so
|
||||
%{_libdir}/znc/autocycle.so
|
||||
%{_libdir}/znc/autoop.so
|
||||
%{_libdir}/znc/autoreply.so
|
||||
%{_libdir}/znc/away.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/charset.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/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/sasl.so
|
||||
%{_libdir}/znc/savebuff.so
|
||||
%{_libdir}/znc/schat.so
|
||||
%{_libdir}/znc/send_raw.so
|
||||
@ -236,32 +245,10 @@ fi
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/znc-buildmod
|
||||
%{_bindir}/znc-config
|
||||
#%{_bindir}/znc-config
|
||||
%{_libdir}/pkgconfig/%{name}.pc
|
||||
%{_includedir}/znc/
|
||||
|
||||
%files extra
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/znc/antiidle.so
|
||||
%{_libdir}/znc/autovoice.so
|
||||
%{_libdir}/znc/block_motd.so
|
||||
%{_libdir}/znc/charset.so
|
||||
%{_libdir}/znc/clearbufferonmsg.so
|
||||
%{_libdir}/znc/ctcpflood.so
|
||||
%{_libdir}/znc/dcc.so
|
||||
%{_libdir}/znc/droproot.so
|
||||
%{_libdir}/znc/email.so
|
||||
%{_libdir}/znc/fakeonline.so
|
||||
%{_libdir}/znc/flooddetach.so
|
||||
%{_libdir}/znc/imapauth.so
|
||||
%{_libdir}/znc/listsockets.so
|
||||
%{_libdir}/znc/log.so
|
||||
%{_libdir}/znc/motdfile.so
|
||||
%{_libdir}/znc/notify_connect.so
|
||||
%{_libdir}/znc/saslauth.so
|
||||
%{_libdir}/znc/send_raw.so
|
||||
%{_libdir}/znc/shell.so
|
||||
|
||||
%files modtcl
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/znc/modtcl.so
|
||||
@ -273,6 +260,12 @@ fi
|
||||
%{_libdir}/znc/perleval.pm
|
||||
|
||||
%changelog
|
||||
* Thu Sep 13 2012 Nick Bebout <nb@fedoraproject.org> - 1.0-0.1.alpha1
|
||||
- Update to 1.0-alpha1
|
||||
|
||||
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.206-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Mon Apr 16 2012 Nick Bebout <nb@fedoraproject.org> - 0.206-1
|
||||
- Upgrade to 0.206
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user