[Apcupsd-commits] apcupsd/platforms/redhat apcupsd.in, 1.5, 1.6 apcupsd.spec.in, 1.53, 1.54

[Adam K. <ad...@us...>]

Update of /cvsroot/apcupsd/apcupsd/platforms/redhat
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4067/platforms/redhat

Modified Files:
	apcupsd.in apcupsd.spec.in 
Log Message:
Merge Branch-3_14:2008-06-31 thru Branch-3_14:2009-05-25
Changes from releases 3.14.5 and 3.14.6.


Index: apcupsd.in
===================================================================
RCS file: /cvsroot/apcupsd/apcupsd/platforms/redhat/apcupsd.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- apcupsd.in	30 Sep 2007 19:49:42 -0000	1.5
+++ apcupsd.in	25 May 2009 22:18:09 -0000	1.6
@@ -8,20 +8,6 @@
 #
 APCPID=@PIDDIR@/apcupsd.pid
 
-if test -f /etc/whitebox-release ; then
-   f=/etc/whitebox-release
-else
-   f=/etc/redhat-release
-fi
-if test `cat $f | grep release |\
-     cut -f 3 -d ' '`x = "Enterprise"x ; then
-   DISTVER="Enterprise "`cat $f | grep release |\
-     cut -f 6 -d ' '`
-else
-   DISTVER=`cat /etc/redhat-release | grep release |\
-     cut -f 5 -d ' '`
-fi
-
 # Source function libarary
 . /etc/rc.d/init.d/functions
 

Index: apcupsd.spec.in
===================================================================
RCS file: /cvsroot/apcupsd/apcupsd/platforms/redhat/apcupsd.spec.in,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- apcupsd.spec.in	29 Jun 2008 15:36:52 -0000	1.53
+++ apcupsd.spec.in	25 May 2009 22:18:09 -0000	1.54
@@ -120,28 +120,6 @@
 %else
 BuildRequires: glibc-devel >= 2.3
 %endif
-%if ! %{suse} && ! %{mdk}
-BuildRequires: tetex
-BuildRequires: tetex-latex
-%endif
-%if %{suse_version} == 900 || %{suse_version} == 910 || %{suse_version} == 920 || %{suse_version} == 930 || %{suse_version} == 1000 || %{suse_version} == 1010 || %{suse_version} == 1020 
-BuildRequires: tetex
-BuildRequires: latex2html
-%endif
-%if %{suse_version} == 1030
-BuildRequires: texlive-latex
-BuildRequires: texlive-bin-latex
-BuildRequires: latex2html
-%endif
-%if %{mdk}
-BuildRequires: tetex
-BuildRequires: latex2html
-BuildRequires: tetex-dvips
-BuildRequires: ghostscript-dvipdf
-%endif
-%if %{fedora_core} || %{rhel5}
-BuildRequires: latex2html
-%endif
 %if %{gapcmon}
 BuildRequires: glibc-devel, gtk2-devel >= 2.4, glib2-devel, atk-devel
 BuildRequires: ORBit2, pango-devel, pkgconfig
@@ -284,9 +262,9 @@
 cd ../
 
 # build pdf manual
-cd doc/latex
-make
-cd ../../
+#cd doc/latex
+#make
+#cd ../../
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -335,7 +313,7 @@
 %{_sysconfdir}/apcupsd/make-hiddev
 %{_sysconfdir}/apcupsd/hid-ups
 %{halpolicydir}/80-apcupsd-ups-policy.fdi
-%doc COPYING DISCLAIMER ReleaseNotes ChangeLog ../Release_Notes-%{version}-%{release}.txt doc/latex/apcupsd.pdf
+%doc COPYING DISCLAIMER ReleaseNotes ChangeLog ../Release_Notes-%{version}-%{release}.txt doc/manual/manual.html doc/manual/*.png
 %dir %{_sysconfdir}/apcupsd
 %{initdir}/apcupsd
 %config(noreplace) %{_sysconfdir}/apcupsd/apccontrol
@@ -454,6 +432,10 @@
 fi
 
 %changelog
+* Sat May 16 2009 D. Scott Barninger <barninger at fairfieldcomputers.com>
+- comment out latex build
+* Fri May 15 2009 Adam Kropelin <akropel1 at rochester.rr.com>
+- changes for new user manual location and format
 * Sat May 31 2008 D. Scott Barninger <barninger at fairfieldcomputers.com>
 - add check for upgrade and restart daemon
 * Sun May 11 2008 Adam Kropelin <akropel1 at rochester.rr.com>