rpms/coda/F-13 coda.spec,1.20,1.21

Adam Goode agoode at fedoraproject.org
Wed May 19 14:58:50 UTC 2010


Author: agoode

Update of /cvs/pkgs/rpms/coda/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25362

Modified Files:
	coda.spec 
Log Message:
* Wed May 19 2010 Adam Goode <adam at spicenitz.org> - 6.9.5-3
- Split out gcodacon
- Macroize /usr stuff



Index: coda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coda/F-13/coda.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- coda.spec	18 May 2010 19:51:15 -0000	1.20
+++ coda.spec	19 May 2010 14:58:50 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           coda
 Version:        6.9.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Coda distributed file system
 Group:          System Environment/Daemons
 License:        GPLv2
@@ -70,6 +70,18 @@ This package contains the backup softwar
 well as the volume utilities.
 
 
+%package gcodacon
+Summary:	Graphical tray monitor for the Coda distributed file system
+Group:          System Environment/Daemons
+Requires:       coda-client = %{version}-%{release}
+Requires:	pygtk2 notify-python
+Obsoletes:	coda-client < 6.9.5-3
+
+%description gcodacon
+This package contains gcodacon, a graphical tray monitor for the Coda
+distributed file system client.
+
+
 %package vcodacon
 Summary:        Graphical console for the Coda distributed file system
 Group:          System Environment/Daemons
@@ -94,9 +106,9 @@ system client.
 
 %build
 # note: remove the -I and -l here when upstream releases fix for krb5 building
-export CFLAGS="$RPM_OPT_FLAGS -I/usr/include/et -I/usr/include/readline5"
-export CXXFLAGS="$RPM_OPT_FLAGS -I/usr/include/et -I/usr/include/readline5"
-export LDFLAGS="-L/usr/%{_lib}/readline5"
+export CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/et -I%{_includedir}/readline5"
+export CXXFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/et -I%{_includedir}/readline5"
+export LDFLAGS="-L%{_libdir}/readline5"
 export LIBS="-lkrb5 -lcom_err -lstdc++"
 %configure --with-vcodacon --with-krb5
 make %{?_smp_mflags}
@@ -114,8 +126,8 @@ install -p -m 755 %{SOURCE3} $RPM_BUILD_
 install -p -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/update
 
 # rename venus-setup to coda-client-setup
-mv $RPM_BUILD_ROOT/usr/sbin/venus-setup $RPM_BUILD_ROOT/usr/sbin/coda-client-setup
-mv $RPM_BUILD_ROOT/usr/share/man/man8/venus-setup.8 $RPM_BUILD_ROOT/usr/share/man/man8/coda-client-setup.8
+mv $RPM_BUILD_ROOT%{_sbindir}/venus-setup $RPM_BUILD_ROOT%{_sbindir}/coda-client-setup
+mv $RPM_BUILD_ROOT%{_mandir}/man8/venus-setup.8 $RPM_BUILD_ROOT%{_mandir}/man8/coda-client-setup.8
 
 # coda mount point for the client
 mkdir -p $RPM_BUILD_ROOT/coda
@@ -171,47 +183,46 @@ fi
 %config(noreplace) %{_sysconfdir}/coda/venus.conf.ex
 %config(noreplace) %{_sysconfdir}/coda/realms
 %{_sysconfdir}/rc.d/init.d/coda-client
-/usr/sbin/asrlauncher
-/usr/sbin/codaconfedit
-/usr/sbin/venus
-/usr/sbin/coda-client-setup
-/usr/sbin/volmunge
-/usr/sbin/vutil
-/usr/bin/au
-/usr/bin/cfs
-/usr/bin/clog
-/usr/bin/cmon
-/usr/bin/codacon
-/usr/bin/cpasswd
-/usr/bin/ctokens
-/usr/bin/cunlog
-/usr/bin/filerepair
-/usr/bin/gcodacon
-/usr/bin/hoard
-/usr/bin/mkcodabf
-/usr/bin/mklka
-/usr/bin/removeinc
-/usr/bin/repair
-/usr/bin/coda_replay
-/usr/bin/spy
-/usr/bin/xaskuser
-/usr/bin/xfrepair
-/usr/share/man/man1/au.1.gz
-/usr/share/man/man1/cfs.1.gz
-/usr/share/man/man1/clog.1.gz
-/usr/share/man/man1/cmon.1.gz
-/usr/share/man/man1/coda_replay.1.gz
-/usr/share/man/man1/cpasswd.1.gz
-/usr/share/man/man1/ctokens.1.gz
-/usr/share/man/man1/cunlog.1.gz
-/usr/share/man/man1/hoard.1.gz
-/usr/share/man/man1/mkcodabf.1.gz
-/usr/share/man/man1/repair.1.gz
-/usr/share/man/man1/spy.1.gz
-/usr/share/man/man8/venus.8.gz
-/usr/share/man/man8/coda-client-setup.8.gz
-/usr/share/man/man8/volmunge.8.gz
-/usr/share/man/man8/vutil.8.gz
+%{_sbindir}/asrlauncher
+%{_sbindir}/codaconfedit
+%{_sbindir}/venus
+%{_sbindir}/coda-client-setup
+%{_sbindir}/volmunge
+%{_sbindir}/vutil
+%{_bindir}/au
+%{_bindir}/cfs
+%{_bindir}/clog
+%{_bindir}/cmon
+%{_bindir}/codacon
+%{_bindir}/cpasswd
+%{_bindir}/ctokens
+%{_bindir}/cunlog
+%{_bindir}/filerepair
+%{_bindir}/hoard
+%{_bindir}/mkcodabf
+%{_bindir}/mklka
+%{_bindir}/removeinc
+%{_bindir}/repair
+%{_bindir}/coda_replay
+%{_bindir}/spy
+%{_bindir}/xaskuser
+%{_bindir}/xfrepair
+%{_mandir}/man1/au.1.gz
+%{_mandir}/man1/cfs.1.gz
+%{_mandir}/man1/clog.1.gz
+%{_mandir}/man1/cmon.1.gz
+%{_mandir}/man1/coda_replay.1.gz
+%{_mandir}/man1/cpasswd.1.gz
+%{_mandir}/man1/ctokens.1.gz
+%{_mandir}/man1/cunlog.1.gz
+%{_mandir}/man1/hoard.1.gz
+%{_mandir}/man1/mkcodabf.1.gz
+%{_mandir}/man1/repair.1.gz
+%{_mandir}/man1/spy.1.gz
+%{_mandir}/man8/venus.8.gz
+%{_mandir}/man8/coda-client-setup.8.gz
+%{_mandir}/man8/volmunge.8.gz
+%{_mandir}/man8/vutil.8.gz
 %ghost %dir /coda
 %ghost /coda/NOT_REALLY_CODA
 %dir %{_var}/lib/coda
@@ -228,84 +239,94 @@ fi
 %{_sysconfdir}/rc.d/init.d/codasrv
 %{_sysconfdir}/rc.d/init.d/auth2
 %{_sysconfdir}/rc.d/init.d/update
-/usr/sbin/auth2
-/usr/sbin/bldvldb.sh
-/usr/sbin/coda-server-logrotate
-/usr/sbin/codaconfedit
-/usr/sbin/codadump2tar
-/usr/sbin/codasrv
-/usr/sbin/codastart
-/usr/sbin/createvol_rep
-/usr/sbin/initpw
-/usr/sbin/inoder
-/usr/sbin/norton
-/usr/sbin/norton-reinit
-/usr/sbin/parserecdump
-/usr/sbin/partial-reinit.sh
-/usr/sbin/pdbtool
-/usr/sbin/printvrdb
-/usr/sbin/purgevol_rep
-/usr/sbin/startserver
-/usr/sbin/tokentool
-/usr/sbin/updatesrv
-/usr/sbin/updateclnt
-/usr/sbin/updatefetch
-/usr/sbin/vice-killvolumes
-/usr/sbin/vice-setup
-/usr/sbin/vice-setup-rvm
-/usr/sbin/vice-setup-srvdir
-/usr/sbin/vice-setup-user
-/usr/sbin/vice-setup-scm
-/usr/sbin/volutil
-/usr/bin/getvolinfo
-/usr/bin/reinit
-/usr/bin/rpc2ping
-/usr/bin/rvmsizer
-/usr/bin/smon2
-/usr/share/man/man5/maxgroupid.5.gz
-/usr/share/man/man5/passwd.coda.5.gz
-/usr/share/man/man5/servers.5.gz
-/usr/share/man/man5/vicetab.5.gz
-/usr/share/man/man5/volumelist.5.gz
-/usr/share/man/man5/vrdb.5.gz
-/usr/share/man/man8/auth2.8.gz
-/usr/share/man/man8/bldvldb.sh.8.gz
-/usr/share/man/man8/codasrv.8.gz
-/usr/share/man/man8/createvol_rep.8.gz
-/usr/share/man/man8/initpw.8.gz
-/usr/share/man/man8/norton.8.gz
-/usr/share/man/man8/pdbtool.8.gz
-/usr/share/man/man8/purgevol_rep.8.gz
-/usr/share/man/man8/startserver.8.gz
-/usr/share/man/man8/updateclnt.8.gz
-/usr/share/man/man8/updatesrv.8.gz
-/usr/share/man/man8/vice-setup.8.gz
-/usr/share/man/man8/volutil.8.gz
+%{_sbindir}/auth2
+%{_sbindir}/bldvldb.sh
+%{_sbindir}/coda-server-logrotate
+%{_sbindir}/codaconfedit
+%{_sbindir}/codadump2tar
+%{_sbindir}/codasrv
+%{_sbindir}/codastart
+%{_sbindir}/createvol_rep
+%{_sbindir}/initpw
+%{_sbindir}/inoder
+%{_sbindir}/norton
+%{_sbindir}/norton-reinit
+%{_sbindir}/parserecdump
+%{_sbindir}/partial-reinit.sh
+%{_sbindir}/pdbtool
+%{_sbindir}/printvrdb
+%{_sbindir}/purgevol_rep
+%{_sbindir}/startserver
+%{_sbindir}/tokentool
+%{_sbindir}/updatesrv
+%{_sbindir}/updateclnt
+%{_sbindir}/updatefetch
+%{_sbindir}/vice-killvolumes
+%{_sbindir}/vice-setup
+%{_sbindir}/vice-setup-rvm
+%{_sbindir}/vice-setup-srvdir
+%{_sbindir}/vice-setup-user
+%{_sbindir}/vice-setup-scm
+%{_sbindir}/volutil
+%{_bindir}/getvolinfo
+%{_bindir}/reinit
+%{_bindir}/rpc2ping
+%{_bindir}/rvmsizer
+%{_bindir}/smon2
+%{_mandir}/man5/maxgroupid.5.gz
+%{_mandir}/man5/passwd.coda.5.gz
+%{_mandir}/man5/servers.5.gz
+%{_mandir}/man5/vicetab.5.gz
+%{_mandir}/man5/volumelist.5.gz
+%{_mandir}/man5/vrdb.5.gz
+%{_mandir}/man8/auth2.8.gz
+%{_mandir}/man8/bldvldb.sh.8.gz
+%{_mandir}/man8/codasrv.8.gz
+%{_mandir}/man8/createvol_rep.8.gz
+%{_mandir}/man8/initpw.8.gz
+%{_mandir}/man8/norton.8.gz
+%{_mandir}/man8/pdbtool.8.gz
+%{_mandir}/man8/purgevol_rep.8.gz
+%{_mandir}/man8/startserver.8.gz
+%{_mandir}/man8/updateclnt.8.gz
+%{_mandir}/man8/updatesrv.8.gz
+%{_mandir}/man8/vice-setup.8.gz
+%{_mandir}/man8/volutil.8.gz
 
 %files backup
 %defattr(-,root,root,-)
-/usr/sbin/auth2
-/usr/sbin/backup
-/usr/sbin/backup.sh
-/usr/sbin/merge
-/usr/sbin/readdump
-/usr/sbin/tape.pl
-/usr/sbin/updateclnt
-/usr/sbin/updatefetch
-/usr/sbin/volutil
-/usr/share/man/man5/backuplogs.5.gz
-/usr/share/man/man5/dumpfile.5.gz
-/usr/share/man/man5/dumplist.5.gz
-/usr/share/man/man8/backup.8.gz
-/usr/share/man/man8/merge.8.gz
-/usr/share/man/man8/readdump.8.gz
+%{_sbindir}/auth2
+%{_sbindir}/backup
+%{_sbindir}/backup.sh
+%{_sbindir}/merge
+%{_sbindir}/readdump
+%{_sbindir}/tape.pl
+%{_sbindir}/updateclnt
+%{_sbindir}/updatefetch
+%{_sbindir}/volutil
+%{_mandir}/man5/backuplogs.5.gz
+%{_mandir}/man5/dumpfile.5.gz
+%{_mandir}/man5/dumplist.5.gz
+%{_mandir}/man8/backup.8.gz
+%{_mandir}/man8/merge.8.gz
+%{_mandir}/man8/readdump.8.gz
+
+
+%files gcodacon
+%defattr(-,root,root,-)
+%{_bindir}/gcodacon
+
 
 %files vcodacon
 %defattr(-,root,root,-)
-/usr/bin/vcodacon
+%{_bindir}/vcodacon
 
 
 %changelog
+* Wed May 19 2010 Adam Goode <adam at spicenitz.org> - 6.9.5-3
+- Split out gcodacon
+- Macroize /usr stuff
+
 * Tue May 18 2010 Adam Goode <adam at spicenitz.org> - 6.9.5-2
 - Relax the build requires versions for the coda libraries
 



More information about the scm-commits mailing list