rpms/ircd-hybrid/FC-3 .cvsignore, 1.2, 1.3 ircd-hybrid.spec, 1.4, 1.5 sources, 1.2, 1.3 ircd-hybrid-7.1.3-openssl.diff, 1.1, NONE

[Eric Tanguy (tanguy)]

Author: tanguy

Update of /cvs/extras/rpms/ircd-hybrid/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4916/FC-3

Modified Files:
	.cvsignore ircd-hybrid.spec sources 
Removed Files:
	ircd-hybrid-7.1.3-openssl.diff 
Log Message:
auto-import ircd-hybrid-7.2.0-2 on branch FC-3 from ircd-hybrid-7.2.0-2.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Nov 2005 18:50:08 -0000	1.2
+++ .cvsignore	9 Dec 2005 22:08:50 -0000	1.3
@@ -1 +1 @@
-ircd-hybrid-7.1.3.tgz
+ircd-hybrid-7.2.0.tgz


Index: ircd-hybrid.spec
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/FC-3/ircd-hybrid.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ircd-hybrid.spec	19 Nov 2005 12:38:40 -0000	1.4
+++ ircd-hybrid.spec	9 Dec 2005 22:08:50 -0000	1.5
@@ -9,14 +9,13 @@
 
 Summary: Internet Relay Chat Server
 Name: ircd-hybrid
-Version: 7.1.3
-Release: 11%{?dist}
+Version: 7.2.0
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://voxel.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz
 Source1: ircd-hybrid.init
 Source2: ircd-hybrid.sysconfig
-Patch0:	ircd-hybrid-7.1.3-openssl.diff
 URL: http://www.ircd-hybrid.org/
 BuildRequires: openssl-devel 
 Requires(pre): fedora-usermgmt
@@ -33,16 +32,16 @@
 
 %prep
 %setup -q
-%patch0 -p1
-sed -i 's?\r??' doc/Tao-of-IRC.940110
 # These can't be overridden by configure :-(
 # Change config path (IRCD_PREFIX "/etc" - by default)
 # Change log path (IRCD_PREFIX "/logs" - by default)
+# Change modules/autoload path (IRCD_PREFIX "/modules/autoload/" - by default)
 # Change modules path (IRCD_PREFIX "/modules/" - by default)
 %{__perl} -pi -e 's|(^#define ETCPATH) .*|$1 "%{_sysconfdir}/ircd"|g;
                   s|(^#define LOGPATH) .*|$1 "%{_var}/log/ircd"|g;
+		   s|(^#define AUTOMODPATH IRCD_PREFIX) .*|#define AUTOMODPATH "%{_libdir}/ircd/modules/autoload/"|g;
                   s|(^#define MODPATH) .*|$1 "%{_libdir}/ircd/modules/"|g' \
-    include/defaults.h
+   include/defaults.h
 #Added for x86_64 arch support
 sed -i 's/__unused/__my_unused/g' src/lex.yy.c
 
@@ -50,7 +49,7 @@
 %build
 %configure \
     --sysconfdir=%{_sysconfdir}/ircd \
-    --with-nicklen=%{nicklen} \
+   --with-nicklen=%{nicklen} \
     --with-topiclen=%{topiclen} \
     --with-maxconn=%{maxconn}
 %{__make} %{?_smp_mflags}
@@ -70,7 +69,7 @@
 
 # Move binaries with generic and potentially conflicting names ouf of the way
 %{__mkdir_p} %{buildroot}%{_libexecdir}/ircd/
-%{__mv} %{buildroot}%{_bindir}/{conv*,encspeed,mkpasswd,vi*} \
+%{__mv} %{buildroot}%{_bindir}/{encspeed,mkpasswd} \
         %{buildroot}%{_libexecdir}/ircd/
 
 # Move empty directory which we changed previously (src/Makefile.in would need
@@ -113,7 +112,7 @@
 %files
 %defattr(-, root, root, -)
 %doc BUGS ChangeLog Hybrid-team LICENSE README.FIRST RELNOTES TODO
-%doc doc/{*.txt,server-version-info,Tao-of-IRC.940110,technical/}
+%doc doc/{*.txt,server-version-info,technical/}
 %doc etc/*.conf*
 %attr(770,ircd,ircd) %dir %{_sysconfdir}/ircd/
 %attr(640,ircd,ircd) %config(noreplace) %{_sysconfdir}/ircd/*
@@ -126,10 +125,16 @@
 %attr(770,root,ircd) %dir %{_var}/log/ircd/
 %attr(770,ircd,ircd) %dir %{_var}/lib/ircd/
 %{_mandir}/man8/ircd.8*
-%exclude %{_includedir}
+%exclude %{_prefix}/help
 
 
 %changelog
+* Fri Dec 09 2005 Eric Tanguy 7.2.0-2
+- Modify spec file to take into account the 7.2.0 update
+
+* Fri Dec 09 2005 Eric Tanguy 7.2.0-1
+- Update to 7.2.0
+
 * Fri Nov 18 2005 Eric Tanguy 7.1.3-11
 - modify changelog
 - modify abslolute path to relative one for doc/Tao-of-IRC.940110


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Nov 2005 18:50:08 -0000	1.2
+++ sources	9 Dec 2005 22:08:50 -0000	1.3
@@ -1 +1 @@
-4f3a69eed68b00bf72bfede35fffb70d  ircd-hybrid-7.1.3.tgz
+e3c716fef0c62eaba147df06f32ea87d  ircd-hybrid-7.2.0.tgz


--- ircd-hybrid-7.1.3-openssl.diff DELETED ---