Update to 0.097.svn2197 which also adds modpython
This commit is contained in:
Nick Bebout
parent
6b214a13cf
commit
38cff24207
|
|
@ -1,2 +1,4 @@
|
|||
znc-0.094.tar.gz
|
||||
/znc-0.096.tar.gz
|
||||
/znc-0.097.svn2196.tar.bz2
|
||||
/znc-0.097.svn2197.tar.bz2
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
38eec4f1911a68b4d2fc704170e7cbf6 znc-0.096.tar.gz
|
||||
7da9ce26c0853257610d86c8f8cc9a70 znc-0.097.svn2197.tar.bz2
|
||||
|
|
|
|||
|
|
@ -0,0 +1,41 @@
|
|||
--- znc-0.097.svn2197-original/modules/Makefile.in 2010-12-22 19:35:56.464484000 -0600
|
||||
+++ znc-0.097.svn2197/modules/Makefile.in 2010-12-22 20:06:45.859414524 -0600
|
||||
@@ -180,15 +180,15 @@
|
||||
$(Q)$(PERL) $(srcdir)/modpython/codegen.pl $< $@
|
||||
|
||||
modperl_install: create_install_dir install_metadirs
|
||||
- +for i in $(srcdir)/*.pm; do \
|
||||
- test -r $$i && $(INSTALL_DATA) $$i $(DESTDIR)$(MODDIR); \
|
||||
+ for i in $(srcdir)/*.pm; do \
|
||||
+ test -r $$i && $(INSTALL_DATA) $$i $(DESTDIR)$(MODDIR); true; \
|
||||
done
|
||||
for a in $(srcdir)/*; do \
|
||||
if [ -d $$a ] && [ -f $${a}.pm ]; then \
|
||||
cp -Rp $$a $(DESTDIR)$(DATADIR); \
|
||||
fi \
|
||||
done
|
||||
- +test -r $(srcdir)/modperl/ZNC.pm && cp -p $(srcdir)/modperl/ZNC.pm modperl/
|
||||
+ test -r $(srcdir)/modperl/ZNC.pm && cp -p $(srcdir)/modperl/ZNC.pm modperl/; true
|
||||
rm -rf $(DESTDIR)$(DATADIR)/modperl
|
||||
mkdir -p $(DESTDIR)$(MODDIR)/modperl
|
||||
$(INSTALL_PROGRAM) modperl/ZNC.so $(DESTDIR)$(MODDIR)/modperl
|
||||
@@ -199,14 +199,14 @@
|
||||
$(CXX) $(PYTHONCOMMON) -o $@ $<
|
||||
|
||||
modpython_compilepyc: modpython/compiler
|
||||
- +cp -p $(srcdir)/*.py ./
|
||||
- +cp -p $(srcdir)/*.pyc ./
|
||||
- +cp -p $(srcdir)/modpython/znc*.py modpython/
|
||||
+ cp -p $(srcdir)/*.py ./; true
|
||||
+ cp -p $(srcdir)/*.pyc ./; true
|
||||
+ cp -p $(srcdir)/modpython/znc*.py modpython/; true
|
||||
$<
|
||||
|
||||
modpython_install: create_install_dir install_metadirs modpython_compilepyc
|
||||
- +for i in *.pyc; do \
|
||||
- test -r $$i && $(INSTALL_DATA) $$i $(DESTDIR)$(MODDIR); \
|
||||
+ for i in *.pyc; do \
|
||||
+ test -r $$i && $(INSTALL_DATA) $$i $(DESTDIR)$(MODDIR); true; \
|
||||
done
|
||||
for a in $(srcdir)/*; do \
|
||||
if [ -d $$a ]; then \
|
||||
44
znc.spec
44
znc.spec
|
|
@ -1,24 +1,25 @@
|
|||
Summary: An advanced IRC bouncer
|
||||
Name: znc
|
||||
Version: 0.096
|
||||
#Release: 2.svn2101%{?dist}
|
||||
Version: 0.097
|
||||
Release: 1.svn2197%{?dist}
|
||||
#Release: 0.1.rc1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
#Release: 2%{?dist}
|
||||
License: GPLv2 with exceptions
|
||||
Group: System Environment/Daemons
|
||||
URL: http://znc.sf.net/
|
||||
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
|
||||
#Source0: znc-0.093.svn2101.tar.bz2
|
||||
# svn export -r 2101 https://znc.svn.sourceforge.net/svnroot/znc/trunk
|
||||
# mv trunk znc-0.093.svn2101
|
||||
# tar jcvf znc-0.093.svn2101.tar.bz2 znc-0.093.svn2101/
|
||||
#Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
|
||||
Source0: znc-0.097.svn2197.tar.bz2
|
||||
# svn export -r 2197 https://znc.svn.sourceforge.net/svnroot/znc/trunk
|
||||
# mv trunk znc-0.097.svn2197
|
||||
# tar jcvf znc-0.097.svn2197.tar.bz2 znc-0.097.svn2197/
|
||||
#Patch0: znc-trafficstats.patch
|
||||
Patch0: znc-0.097.svn2197-modules.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||
BuildRequires: perl gcc-c++
|
||||
BuildRequires: openssl-devel >= 0.9.8
|
||||
BuildRequires: cyrus-sasl-devel
|
||||
BuildRequires: c-ares-devel
|
||||
BuildRequires: c-ares-devel python3-devel
|
||||
BuildRequires: perl(ExtUtils::Embed) swig tcl-devel
|
||||
|
||||
%description
|
||||
|
|
@ -62,15 +63,28 @@ Requires: perl
|
|||
%description modperl
|
||||
perl module for ZNC
|
||||
|
||||
%package modpython
|
||||
Summary: python module for ZNC
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: python3
|
||||
|
||||
%description modpython
|
||||
python module for ZNC
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
#%setup -q
|
||||
%setup -q -n znc-0.097.svn2197
|
||||
%patch0 -p1
|
||||
%__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
|
||||
chmod -x modules/q.cpp
|
||||
|
||||
%build
|
||||
%configure \
|
||||
--with-module-prefix=%{_libdir}/znc \
|
||||
--enable-ipv6 --enable-extra --enable-sasl --enable-perl --enable-tcl
|
||||
--enable-ipv6 --enable-extra --enable-sasl --enable-perl --enable-tcl \
|
||||
--enable-python
|
||||
%__make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
|
|
@ -160,7 +174,15 @@ chmod -x modules/q.cpp
|
|||
%{_libdir}/znc/modperl/
|
||||
%{_libdir}/znc/modperl.so
|
||||
|
||||
%files modpython
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/znc/modpython/
|
||||
%{_libdir}/znc/modpython.so
|
||||
|
||||
%changelog
|
||||
* Wed Dec 22 2010 Nick Bebout <nb@fedoraproject.org> - 0.097-1.svn2197
|
||||
- Update to znc 0.097-svn2197 which also adds modpython
|
||||
|
||||
* Sun Nov 7 2010 Nick Bebout <nb@fedoraproject.org> - 0.096-2
|
||||
- Build TCL module, move modperl and modtcl to separate subpackages
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue