Revert "Move modperl and modtcl to separate subpackages"
This reverts commit 6b214a13cf
.
Conflicts:
znc.spec
This commit is contained in:
parent
1880cbb260
commit
eda4c45211
|
@ -1,11 +1,2 @@
|
|||
znc-0.094.tar.gz
|
||||
/znc-0.096.tar.gz
|
||||
/znc-0.097.svn2196.tar.bz2
|
||||
/znc-0.097.svn2197.tar.bz2
|
||||
/znc-0.097.svn2202.tar.bz2
|
||||
/znc-0.097.svn2213.tar.bz2
|
||||
/znc-0.097.svn2214.tar.bz2
|
||||
/znc-0.097.svn2255.tar.bz2
|
||||
/znc-0.097.svn2269.tar.bz2
|
||||
/znc-0.097.svn2272.tar.xz
|
||||
/znc-0.097.svn2277.tar.xz
|
||||
|
|
2
sources
2
sources
|
@ -1 +1 @@
|
|||
9a1ee24e4d38c5adabb761fa586c3830 znc-0.097.svn2277.tar.xz
|
||||
38eec4f1911a68b4d2fc704170e7cbf6 znc-0.096.tar.gz
|
||||
|
|
64
znc.spec
64
znc.spec
|
@ -1,23 +1,24 @@
|
|||
Summary: An advanced IRC bouncer
|
||||
Name: znc
|
||||
Version: 0.097
|
||||
Release: 7.svn2277%{?dist}
|
||||
Version: 0.096
|
||||
#Release: 2.svn2101%{?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.097.svn2277.tar.xz
|
||||
# svn export -r 2277 https://znc.svn.sourceforge.net/svnroot/znc/trunk
|
||||
# mv trunk znc-0.097.svn2277
|
||||
# tar Jcvf znc-0.097.svn2277.tar.xz znc-0.097.svn2277/
|
||||
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/
|
||||
#Patch0: znc-trafficstats.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||
BuildRequires: perl gcc-c++ automake
|
||||
BuildRequires: perl gcc-c++
|
||||
BuildRequires: openssl-devel >= 0.9.8
|
||||
BuildRequires: cyrus-sasl-devel
|
||||
BuildRequires: c-ares-devel python3-devel
|
||||
BuildRequires: c-ares-devel
|
||||
BuildRequires: perl(ExtUtils::Embed) swig tcl-devel
|
||||
|
||||
%description
|
||||
|
@ -61,28 +62,15 @@ 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 -n znc-0.097.svn2277
|
||||
%setup -q
|
||||
%__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
|
||||
chmod -x modules/q.cpp
|
||||
|
||||
%build
|
||||
./autogen.sh
|
||||
%configure \
|
||||
--with-module-prefix=%{_libdir}/znc \
|
||||
--enable-ipv6 --enable-extra --enable-sasl --enable-perl --enable-tcl \
|
||||
--enable-python
|
||||
--enable-ipv6 --enable-extra --enable-sasl --enable-perl --enable-tcl
|
||||
%__make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
|
@ -172,33 +160,7 @@ 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 Feb 09 2011 Nick Bebout <nb@fedoraproject.org> - 0.097-7.svn2277
|
||||
- Update to svn2277
|
||||
|
||||
* Mon Jan 24 2011 Nick Bebout <nb@fedoraproject.org> - 0.097-6.svn2272
|
||||
- Update to svn2272
|
||||
|
||||
* Mon Jan 17 2011 Nick Bebout <nb@fedoraproject.org> - 0.097-5.svn2269
|
||||
- Update to svn2269
|
||||
|
||||
* Fri Jan 7 2011 Nick Bebout <nb@fedoraproject.org> - 0.097-4.svn2255
|
||||
- Update to svn2255
|
||||
|
||||
* Mon Jan 3 2011 David Malcolm <dmalcolm@redhat.com> - 0.097-3.svn2214
|
||||
- rebuild for newer python3 (see rhbz#666429)
|
||||
|
||||
* Fri Dec 24 2010 Nick Bebout <nb@fedoraproject.org> - 0.097-2.svn2214
|
||||
- Patch has been upstreamed, update to svn2214
|
||||
|
||||
* Wed Dec 22 2010 Nick Bebout <nb@fedoraproject.org> - 0.097-1.svn2213
|
||||
- Update to znc 0.097-svn2213 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