rpms/nx/FC-5 nx.spec,1.2,1.3

[Richard A. Stout (zipsonic)]

Author: zipsonic

Update of /cvs/extras/rpms/nx/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2963

Modified Files:
	nx.spec 
Log Message:

Updated spec for macro/variable consistecies.
Added Dist Tag, and Requires(post) and (postun)



Index: nx.spec
===================================================================
RCS file: /cvs/extras/rpms/nx/FC-5/nx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nx.spec	7 Jun 2006 05:29:25 -0000	1.2
+++ nx.spec	8 Jun 2006 06:39:28 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           nx
 Version:        1.5.0
-Release:        8
+Release:        9%{?dist}
 Summary:        Proxy system for X11
 
 Group:          Applications/Internet
@@ -27,7 +27,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  expat-devel audiofile-devel openssl-devel libjpeg-devel libpng-devel libX11-devel libXp-devel imake
-Requires:	xorg-x11-server-Xorg xorg-x11-apps xorg-x11-utils policycoreutils
+Requires:	xorg-x11-server-Xorg xorg-x11-apps xorg-x11-utils
+Requires(post): policycoreutils
+Requires(postun): policycoreutils
 Excludearch:	x86_64
 
 %description
@@ -91,55 +93,55 @@
 %endif
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{_bindir}
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/NX/lib
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/%{_bindir}
+mkdir -p %{buildroot}/%{_libdir}/NX/lib
+mkdir -p %{buildroot}/%{_mandir}/man1
 # install X11 Support Libraries and Agents
 cp -a nx-X11/lib/X11/libX11.so.* \
       nx-X11/lib/Xext/libXext.so.* \
       nx-X11/lib/Xrender/libXrender.so.* \
-      $RPM_BUILD_ROOT/%{_libdir}/NX/lib
+      %{buildroot}/%{_libdir}/NX/lib
 install -m 755 nx-X11/programs/Xserver/nxagent \
-  $RPM_BUILD_ROOT/%{_libdir}/NX
-install -m 755 %{SOURCE9} $RPM_BUILD_ROOT/%{_bindir}
+  %{buildroot}/%{_libdir}/NX
+install -m 755 %{SOURCE9} %{buildroot}/%{_bindir}
 # install Compression Libraries and Proxy
-cp -a nxcomp/libXcomp.so.* $RPM_BUILD_ROOT/%{_libdir}/NX/lib
-cp -a nxcompext/libXcompext.so.* $RPM_BUILD_ROOT/%{_libdir}/NX/lib
-install -m 755 nxproxy/nxproxy $RPM_BUILD_ROOT/%{_libdir}/NX
-ln -snf nxagent $RPM_BUILD_ROOT/%{_bindir}/nxproxy
+cp -a nxcomp/libXcomp.so.* %{buildroot}/%{_libdir}/NX/lib
+cp -a nxcompext/libXcompext.so.* %{buildroot}/%{_libdir}/NX/lib
+install -m 755 nxproxy/nxproxy %{buildroot}/%{_libdir}/NX
+ln -snf nxagent %{buildroot}/%{_bindir}/nxproxy
 # install RFB Agent
 pushd nxviewer
-  make install DESTDIR=$RPM_BUILD_ROOT
-  mv $RPM_BUILD_ROOT/%{_bindir}/nxviewer $RPM_BUILD_ROOT/%{_libdir}/NX
-  ln -snf nxagent $RPM_BUILD_ROOT/%{_bindir}/nxviewer
-  chmod 755 $RPM_BUILD_ROOT/%{_bindir}/nxviewer
+  make install DESTDIR=%{buildroot}
+  mv %{buildroot}/%{_bindir}/nxviewer %{buildroot}/%{_libdir}/NX
+  ln -snf nxagent %{buildroot}/%{_bindir}/nxviewer
+  chmod 755 %{buildroot}/%{_bindir}/nxviewer
 popd
 # install RDP Agent
 %ifnarch ppc ppc64 s390 s390x
 pushd nxdesktop
-  make install DESTDIR=$RPM_BUILD_ROOT
-  mv $RPM_BUILD_ROOT/%{_bindir}/nxdesktop $RPM_BUILD_ROOT/%{_libdir}/NX
-  ln -snf nxagent $RPM_BUILD_ROOT/%{_bindir}/nxdesktop
-  chmod 755 $RPM_BUILD_ROOT/%{_bindir}/nxdesktop
-  mv $RPM_BUILD_ROOT/usr/man/man1/nxdesktop.1 \
-     $RPM_BUILD_ROOT/%{_mandir}/man1/nxdesktop.1
-  rm -rf $RPM_BUILD_ROOT/usr/man
+  make install DESTDIR=%{buildroot}
+  mv %{buildroot}/%{_bindir}/nxdesktop %{buildroot}/%{_libdir}/NX
+  ln -snf nxagent %{buildroot}/%{_bindir}/nxdesktop
+  chmod 755 %{buildroot}/%{_bindir}/nxdesktop
+  mv %{buildroot}/usr/man/man1/nxdesktop.1 \
+     %{buildroot}/%{_mandir}/man1/nxdesktop.1
+  rm -rf %{buildroot}/usr/man
 popd
 %endif
 # install scripts
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/packages/NX
-cp -r nxscripts $RPM_BUILD_ROOT/%{_datadir}/doc/packages/NX
+mkdir -p %{buildroot}/%{_datadir}/doc/packages/NX
+cp -r nxscripts %{buildroot}/%{_datadir}/doc/packages/NX
 # documentation and license
-tar xjf %{SOURCE10} -C $RPM_BUILD_ROOT/%{_datadir}/doc/packages/NX
-install -m 644 nxcomp/LICENSE   $RPM_BUILD_ROOT/%{_datadir}/doc/packages/NX
+tar xjf %{SOURCE10} -C %{buildroot}/%{_datadir}/doc/packages/NX
+install -m 644 nxcomp/LICENSE   %{buildroot}/%{_datadir}/doc/packages/NX
 for i in nxcomp nxdesktop; do
-  mkdir $RPM_BUILD_ROOT/%{_datadir}/doc/packages/NX/$i
+  mkdir %{buildroot}/%{_datadir}/doc/packages/NX/$i
 done
-install -m 644 nxcomp/README    $RPM_BUILD_ROOT/%{_datadir}/doc/packages/NX/nxcomp
-install -m 644 nxdesktop/README $RPM_BUILD_ROOT/%{_datadir}/doc/packages/NX/nxdesktop
+install -m 644 nxcomp/README    %{buildroot}/%{_datadir}/doc/packages/NX/nxcomp
+install -m 644 nxdesktop/README %{buildroot}/%{_datadir}/doc/packages/NX/nxdesktop
 rm -rf nxdesktop/doc/CVS
-cp -r nxdesktop/doc $RPM_BUILD_ROOT/%{_datadir}/doc/packages/NX/nxdesktop
+cp -r nxdesktop/doc %{buildroot}/%{_datadir}/doc/packages/NX/nxdesktop
 
 %post
 %{_sbindir}/semanage fcontext -f -- -a -t textrel_shlib_t '%{_libdir}/NX/lib/libXcomp.so.1.5.0' 2>/dev/null || :
@@ -159,7 +161,7 @@
 fi
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
@@ -175,6 +177,10 @@
 %endif
 
 %changelog
+* Wed Jun 07 2006 Rick Stout <zipsonic[AT]gmail.com> - 1.5.0-9
+- added Dist tag
+- fixed macro/variable inconsistencies
+- added requires: post and postun for policycoreutils
 * Tue Jun 06 2006 Rick Stout <zipsonic[AT]gmail.com> - 1.5.0-8
 - adapting spec for fedora-extras
 - excluding x86_64 arch at this time. nxagent causes segfaults