Changeset 1664 for branches/fc13-dev

Timestamp:

Sep 19, 2010, 10:11:54 PM (14 years ago)

Author:

andersk

Message:

Split zephyr into subpackages, and install 32-bit zephyr-libs

Location:

branches/fc13-dev/server/fedora

Files:

• Makefile (modified) (1 diff)
• specs/zephyr.spec (modified) (7 diffs)

branches/fc13-dev/server/fedora/Makefile

@@ -22 +22 @@
 hackage         = MonadCatchIO-mtl-0.3.0.1 cgi-3001.1.8.1 unix-handle-0.0.0
 upstream_hackage = ghc-MonadCatchIO-mtl ghc-cgi ghc-unix-handle
-upstream        = openafs $(upstream_yum) $(upstream_hackage) moira cluster-glue heartbeat pacemaker zephyr
+upstream        = openafs $(upstream_yum) $(upstream_hackage) moira cluster-glue heartbeat pacemaker zephyr zephyr.i686
 oursrc          = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i686 whoisd athrun php_scripts scripts-wizard scripts-base scripts-static-cat
 allsrc          = $(upstream) $(oursrc)

branches/fc13-dev/server/fedora/specs/zephyr.spec

@@ -1 +1 @@
 Name:           zephyr
 Version:        3.0
-Release:        1.%{scriptsversion}%{?dist}
-Summary:        Zephyr allows users to send messages to other users or to groups of users.
+Release:        0.%{scriptsversion}%{?dist}
+Summary:        Client programs for the Zephyr real-time messaging system
 
 Group:          Applications/Communications
@@ -12 +12 @@
 
 BuildRequires:  krb5-devel hesiod-devel libss-devel readline-devel bison
+Requires:       %{name}-libs = %{version}-%{release}
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -24 +25 @@
 
 
+%package        server
+Summary:        Server for the Zephyr real-time messaging system
+Group:          System Environment/Daemons
+
+Requires:       %{name}-libs = %{version}-%{release}
+
+%description    server
+The %{name}-server package contains the server daemon for the Zephyr
+messaging service.  It maintains a location and subscription database
+for all the receiving clients, and routes all zephyrgrams to the
+intended recipients.
+
+
+%package        libs
+Summary:        Shared libraries for Zephyr real-time messaging system
+Group:          System Environment/Libraries
+
+%description    libs
+The %{name}-libs package contains shared libraries for applications
+that use %{name}.
+
+
+%package        devel
+Summary:        Development files for Zephyr real-time messaging system
+Group:          Development/Libraries
+
+Requires:       %{name}-libs = %{version}-%{release}
+
+%description    devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
 %prep
 %setup -q
@@ -32 +66 @@
 # Mitch wants to make an awesome specfile which makes hesiod/krb5 and friends
 # all fully configurable.  This configure line will have to do for now.
-%configure --with-hesiod --with-krb5
+%configure --with-hesiod --with-krb5 --disable-static
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -41 +75 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir}
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 mkdir -p $RPM_BUILD_ROOT%{_initddir}
@@ -64 +99 @@
 
 
+%post           libs -p /sbin/ldconfig
+
+%postun         libs -p /sbin/ldconfig
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -70 +110 @@
 %files
 %defattr(-,root,root,-)
-%doc README NOTES OPERATING USING
+%doc README USING
 %{_bindir}/*
-%{_sbindir}/*
-%{_includedir}/%{name}/
-%{_libdir}/*
+%{_sbindir}/zhm
+%{_sbindir}/zshutdown_notify
 %{_mandir}/man1/*
-%{_mandir}/man8/*
-%{_datadir}/%{name}/
-%{_sysconfdir}/%{name}/
+%{_mandir}/man8/zhm.8*
+%{_mandir}/man8/zstat.8*
+%{_mandir}/man8/zshutdown_notify.8*
+%{_datadir}/zephyr
 %{_initddir}/zhm
 
 
+%files          server
+%doc OPERATING
+%{_sysconfdir}/zephyr
+%{_sbindir}/zephyrd
+%{_mandir}/man8/zephyrd.8*
+
+
+%files          libs
+%{_libdir}/*.so.*
+
+
+%files          devel
+%{_libdir}/*.so
+%{_includedir}/*
+
+
 %changelog
+* Sun Sep 19 2010 Anders Kaseorg <andersk@mit.edu> - 3.0-0
+- Decrease version below a hypothetical Fedora package.
+- Split out -server, -libs, and -devel into subpackages.
+- Disable the static library and remove the libtool archive.
+
 * Thu Sep 09 2010 Edward Z. Yang <ezyang@mit.edu> 3.0-1
 - Initial packaging release, superseding mit-zephyr.