rpms/hula/devel .cvsignore, 1.5, 1.6 hula.spec, 1.6, 1.7 sources, 1.5, 1.6

Tue Jun 6 19:39:40 UTC 2006

Author: toshio

Update of /cvs/extras/rpms/hula/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19225

Modified Files:
	.cvsignore hula.spec sources 
Log Message:
- Note: Do not build this version.  These sources are uploaded to share with
  other maintainers looking at mono issues but should not be considered
  suitable for building and pushing to endusers.

- Update to r1572.
- Change the Source URL to reflect the official nightly snapshot location.
- Change the version and release to reflect the package naming guidelines.
  The old way may not have caused problems because it started with an "r" but
  the possibility of problems exist.  Switching shouldn't cause any problems
  because there were no builds of hula in FE prior to this.
- Consolidated all includes into one line.
- Consolidate all programs into two lines.
- Disable building of static libraries.
- Hula now includes Mono apps.  Rework the hula directory to place these files
  in different locations.
- Change %{makeinstall} to make install DESTDIR



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hula/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6

--- .cvsignore	22 Jul 2005 05:23:35 -0000	1.5
+++ .cvsignore	6 Jun 2006 19:39:39 -0000	1.6
@@ -1 +1 @@
-hula-r261.tgz
+hula-r1572.tgz


Index: hula.spec
===================================================================
RCS file: /cvs/extras/rpms/hula/devel/hula.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- hula.spec	2 Mar 2006 22:17:11 -0000	1.6
+++ hula.spec	6 Jun 2006 19:39:39 -0000	1.7
@@ -1,8 +1,9 @@
+%define upstreamVer r1572
 Name:		hula
 Summary:	A calendar and mail server
-Version:	r261
-Release:	1
-Source0:	http://www.kelley.ca/hulaTar/tars/%{name}-%{version}.tgz
+Version:	0
+Release:	0.0.20060605svn
+Source0:	http://live.hula-project.org:8080/tarballs/%{name}-%{upstreamVer}.tgz
 Source1:	hula.init
 URL:		http://www.hula-project.org
 Group:		System Environment/Daemons
@@ -29,23 +30,19 @@
 for hula.
 
 %prep 
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
-%setup -q
+%setup -q -n %{name}-%{upstreamVer}
 
 %build 
 ./autogen.sh --with-user=hula
-%configure
+%configure --enable-static=no
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
+
+mv  $RPM_BUILD_ROOT%{_prefix}/%{_lib}/hula/hulamonohelper $RPM_BUILD_ROOT%{_libexecdir}
 
 # remove all .la files
 /bin/rm -rf $RPM_BUILD_ROOT%{_libdir}/connmgr/*.la \
@@ -85,33 +82,18 @@
 %defattr(-,root,root,0755)
 %doc HACKING TODO AUTHORS README style-guide.html
 %{_sysconfdir}/rc.d/init.d/hula
-%{_bindir}/hulasqlite
-%{_bindir}/mwcomp
-%{_sbindir}/hulaavirus
-%{_sbindir}/hulaantispam
-%{_sbindir}/hulacalagent
-%{_sbindir}/hulaconnmgr
-%{_sbindir}/huladmc
-%{_sbindir}/hulaforward
-%{_sbindir}/hulageneric
-%{_sbindir}/hulaimap
-%{_sbindir}/hulamailprox
-%{_sbindir}/hulamanager
-%{_sbindir}/hulamodweb
-%{_sbindir}/hulanmap
-%{_sbindir}/hulapluspack
-%{_sbindir}/hulapop3
-%{_sbindir}/hularules
-%{_sbindir}/hulasendmail
-%{_sbindir}/hulasetup
-%{_sbindir}/hulasmtp
-%{_sbindir}/hulastats
-%{_sbindir}/hulawebadmin
+%{_bindir}/*
+%{_sbindir}/*
+# Some pieces of hula are writen for Mono
+%{_prefix}/%{_lib}/hula
+%{_libexecdir}/hulamonohelper
 %dir %{_libdir}/connmgr
 %{_libdir}/connmgr/libcmlists.so
 %{_libdir}/connmgr/libcmrbl.so
 %{_libdir}/connmgr/libcmrdns.so
 %{_libdir}/connmgr/libcmuser.so
+%dir %{_libdir}/hula
+%{_libdir}/hula/hulamonohelper
 %dir %{_libdir}/hulamdb
 %{_libdir}/hulamdb/libmdbfile.so
 %dir %{_libdir}/modweb
@@ -134,10 +116,12 @@
 %{_libdir}/webadmin/8certgen.wat
 %{_libdir}/webadmin/chooser.wat
 %{_libdir}/webadmin/webadmin.wat
+%{_libdir}/libhulacalcmd.so.0.0.0
 %{_libdir}/libhulaconnio.so.0.0.0
 %{_libdir}/libhulaconnmgr.so.0.0.0
 %{_libdir}/libhulaical.so.0.0.0
 %{_libdir}/libhulaical2.so.0.0.0
+%{_libdir}/libhulalog4c.so.0.0.0
 %{_libdir}/libhulalogger.so.0
 %{_libdir}/libhulalogger.so.0.0.0
 %{_libdir}/libhulamanagement.so.0.0.0
@@ -152,6 +136,9 @@
 %{_libdir}/libhulautil.so.0.0.0
 %{_libdir}/libhulaxpl.so.0
 %{_libdir}/libhulaxpl.so.0.0.0
+%{_libdir}/libical-hula.so.0.0.0
+%{_libdir}/libicalss-hula.so.0.0.0
+%{_libdir}/libicalvcal-hula.so.0.0.0
 %{_libdir}/libwacert.so
 %{_libdir}/libwacert.so.0
 %{_libdir}/libwacert.so.0.0.0
@@ -162,67 +149,19 @@
 %{_libdir}/libwastdobj.so
 %{_libdir}/libwastdobj.so.0
 %{_libdir}/libwastdobj.so.0.0.0
+%dir /usr/share/hula/zoneinfo
+/usr/share/hula/zoneinfo/*
 
 
 %files -n %{name}-devel
 %defattr(-,root,root,0755)
-%dir %{_includedir}/hula
-%{_includedir}/hula/calendar.ary
-%{_includedir}/hula/calendar.tok
-%{_includedir}/hula/cmlib.h
-%{_includedir}/hula/connmgr.h
-%{_includedir}/hula/connio.h
-%{_includedir}/hula/hulautil.h
-%{_includedir}/hula/libical.h
-%{_includedir}/hula/logger.h
-%{_includedir}/hula/management.h
-%{_includedir}/hula/mdb.h
-%{_includedir}/hula/memmgr.h
-%{_includedir}/hula/modweb.ary
-%{_includedir}/hula/modweb.h
-%{_includedir}/hula/modweb.tok
-%{_includedir}/hula/msgaddr.h
-%{_includedir}/hula/msgapi.h
-%{_includedir}/hula/msgdate.h
-%{_includedir}/hula/msgftrs.h
-%{_includedir}/hula/mwmail.ary
-%{_includedir}/hula/mwmail.tok
-%{_includedir}/hula/mwpfsave.c
-%{_includedir}/hula/mwpfsave.h
-%{_includedir}/hula/mwpref.ary
-%{_includedir}/hula/mwpref.tok
-%{_includedir}/hula/mwsignup.ary
-%{_includedir}/hula/mwsignup.tok
-%{_includedir}/hula/mwtempl.h
-%{_includedir}/hula/mwtom.ary
-%{_includedir}/hula/mwtom.tok
-%{_includedir}/hula/nmap.h
-%{_includedir}/hula/nmlib.h
-%{_includedir}/hula/rfc2231.h
-%{_includedir}/hula/rulesrv.h
-%{_includedir}/hula/streamio.h
-%{_includedir}/hula/wacert.ary
-%{_includedir}/hula/wacert.tok
-%{_includedir}/hula/wanmail.ary
-%{_includedir}/hula/wanmail.tok
-%{_includedir}/hula/wastats.ary
-%{_includedir}/hula/wastats.tok
-%{_includedir}/hula/wastdobj.ary
-%{_includedir}/hula/wastdobj.tok
-%{_includedir}/hula/webadmin.ary
-%{_includedir}/hula/webadmin.h
-%{_includedir}/hula/webadmin.tok
-%{_includedir}/hula/xpl.h
-%{_includedir}/hula/xplold.h
-%{_includedir}/hula/xplresolve.h
-%{_includedir}/hula/xplschema.h
-%{_includedir}/hula/xplservice.h
-%{_includedir}/hula/xplthread.h
-%{_includedir}/hula/xplutil.h
+%{_includedir}/hula
+%{_libdir}/libhulacalcmd.a
 %{_libdir}/libhulaconnio.a
 %{_libdir}/libhulaconnmgr.a
 %{_libdir}/libhulaical.a
 %{_libdir}/libhulaical2.a
+%{_libdir}/libhulalog4c.a
 %{_libdir}/libhulalogger.a
 %{_libdir}/libhulalogger.so
 %{_libdir}/libhulamanagement.a
@@ -256,6 +195,20 @@
 %{_libdir}/webadmin/9stats.wat
 
 %changelog
+* Mon Jun 05 2005 Toshio Kuratomi <toshio-tiki-lounge-com> 0-0.0.20060605svn
+- Update to r1572.
+- Change the Source URL to reflect the official nightly snapshot location.
+- Change the version and release to reflect the package naming guidelines.
+  The old way may not have caused problems because it started with an "r" but
+  the possibility of problems exist.  Switching shouldn't cause any problems
+  because there were no builds of hula in FE prior to this.
+- Consolidated all includes into one line.
+- Consolidate all programs into two lines.
+- Disable building of static libraries.
+- Hula now includes Mono apps.  Rework the hula directory to place these files
+  in different locations.
+- Change %%{makeinstall} to make install DESTDIR
+
 * Thu Apr 14 2005 Kevin Gray <hula-kevin at iprone.com> r178-2
 - Made updates per Michael Schwendt to bring further into spec compliance
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hula/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Jul 2005 05:23:35 -0000	1.5
+++ sources	6 Jun 2006 19:39:40 -0000	1.6
@@ -1 +1 @@
-b35ff06992eb18a03df4fb3d438be811  hula-r261.tgz
+fcf1beb9ecc807b591518848d5e22b48  hula-r1572.tgz


