rpms/ircd-hybrid/FC-3 ircd-hybrid-7.2.0-help.diff, NONE, 1.1 ircd-hybrid.spec, 1.5, 1.6

Eric Tanguy (tanguy) fedora-extras-commits at redhat.com
Mon Dec 12 15:16:38 UTC 2005


Author: tanguy

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

Modified Files:
	ircd-hybrid.spec 
Added Files:
	ircd-hybrid-7.2.0-help.diff 
Log Message:
auto-import ircd-hybrid-7.2.0-4 on branch FC-3 from ircd-hybrid-7.2.0-4.src.rpm

ircd-hybrid-7.2.0-help.diff:

--- NEW FILE ircd-hybrid-7.2.0-help.diff ---
--- ircd-hybrid-7.2.0/help/Makefile.old	2005-12-09 06:52:54.000000000 +0100
+++ ircd-hybrid-7.2.0/help/Makefile.in	2005-12-12 15:26:05.000000000 +0100
@@ -41,7 +41,8 @@
 	done
 	@for link in $(SYMLINKS); do \
 		rm -f $(uhelpdir)/$$link; \
-		ln -s $(ohelpdir)/$$link $(uhelpdir); \
+		cd $(uhelpdir); \
+		ln -s ../opers/$$link .; \
 	done
 
 distclean:


Index: ircd-hybrid.spec
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/FC-3/ircd-hybrid.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ircd-hybrid.spec	9 Dec 2005 22:08:50 -0000	1.5
+++ ircd-hybrid.spec	12 Dec 2005 15:16:36 -0000	1.6
@@ -10,12 +10,13 @@
 Summary: Internet Relay Chat Server
 Name: ircd-hybrid
 Version: 7.2.0
-Release: 2%{?dist}
+Release: 4%{?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.2.0-help.diff
 URL: http://www.ircd-hybrid.org/
 BuildRequires: openssl-devel 
 Requires(pre): fedora-usermgmt
@@ -32,24 +33,23 @@
 
 %prep
 %setup -q
+%patch0 -p1
 # 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' \
+                  s|(^#define LOGPATH) .*|$1 "%{_var}/log/ircd"|g' \
    include/defaults.h
 #Added for x86_64 arch support
 sed -i 's/__unused/__my_unused/g' src/lex.yy.c
 
-
 %build
 %configure \
+    --prefix=%{_libdir}/ircd \
     --sysconfdir=%{_sysconfdir}/ircd \
-   --with-nicklen=%{nicklen} \
+    --with-nicklen=%{nicklen} \
     --with-topiclen=%{topiclen} \
     --with-maxconn=%{maxconn}
 %{__make} %{?_smp_mflags}
@@ -57,8 +57,10 @@
 
 %install
 %{__rm} -rf %{buildroot}
+
 %makeinstall \
-    sysconfdir=%{buildroot}%{_sysconfdir}/ircd
+   prefix=%{buildroot}%{_libdir}/ircd \
+   sysconfdir=%{buildroot}%{_sysconfdir}/ircd
 
 %{__install} -m 0755 -D %{SOURCE1} %{buildroot}%{_initrddir}/ircd
 %{__install} -m 0640 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/ircd
@@ -77,13 +79,9 @@
 %{__rm} -r   %{buildroot}%{_localstatedir}/logs/
 %{__mkdir_p} %{buildroot}%{_var}/log/ircd/
 
-chmod 755 %{buildroot}%{_prefix}/modules/*.so
-chmod 755 %{buildroot}%{_prefix}/modules/autoload/*.so
+chmod 755 %{buildroot}%{_libdir}/ircd/modules/*.so
+chmod 755 %{buildroot}%{_libdir}/ircd/modules/autoload/*.so
 
-# Move modules directory which we changed previously (same remark as above)
-%{__mkdir_p} %{buildroot}%{_libdir}/ircd/modules/
-%{__mv}      %{buildroot}%{_prefix}/modules/* \
-             %{buildroot}%{_libdir}/ircd/modules/.
 %{__mkdir_p} %{buildroot}%{_var}/lib/ircd
 
 %clean
@@ -120,15 +118,20 @@
 %{_sysconfdir}/rc.d/init.d/ircd
 %{_bindir}/ircd
 %{_bindir}/servlink
-%{_libdir}/ircd/
+%{_libdir}/ircd
 %{_libexecdir}/ircd/
 %attr(770,root,ircd) %dir %{_var}/log/ircd/
 %attr(770,ircd,ircd) %dir %{_var}/lib/ircd/
 %{_mandir}/man8/ircd.8*
-%exclude %{_prefix}/help
 
 
 %changelog
+* Fri Dec 09 2005 Eric Tanguy 7.2.0-4
+- Modify spec file to help files
+
+* Fri Dec 09 2005 Eric Tanguy 7.2.0-3
+- Modify spec file to use configure correctly 
+
 * Fri Dec 09 2005 Eric Tanguy 7.2.0-2
 - Modify spec file to take into account the 7.2.0 update
 




More information about the scm-commits mailing list