rpms/redhat-lsb/devel redhat-lsb.spec,1.17,1.18

[fedora-cvs-commits at redhat.com]

Author: llim

Update of /cvs/dist/rpms/redhat-lsb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12023

Modified Files:
	redhat-lsb.spec 
Log Message:
working version for LSB3.1, yet tested with test suite


Index: redhat-lsb.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-lsb/devel/redhat-lsb.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- redhat-lsb.spec	5 Jul 2006 05:57:43 -0000	1.17
+++ redhat-lsb.spec	5 Jul 2006 07:59:47 -0000	1.18
@@ -42,15 +42,17 @@
 %define qual %{nil}
 %endif
 
-%define lsbrelver 2.0
+%define upstreamlsbrelver 2.0
+%define lsbrelver 3.0
 %define srcrelease 2
 
 Summary: LSB support for Red Hat Linux
 Name: redhat-lsb
 Version: 3.0
-Release: 10
+Release: 10.1
 URL: http://www.linuxbase.org/
 Source0: %{name}-%{version}-%{srcrelease}.tar.bz2
+Source1: http://prdownloads.sourceforge.net/lsb/lsb-release-%{upstreamlsbrelver}.tar.gz
 Patch0: lsb-release-2.0-disable-etc-lsb-release.patch
 License: GPL
 Group: System Environment/Base
@@ -203,10 +205,6 @@
 Requires: libICE.so.6%{qual}
 Requires: libGL.so.1%{qual}
 
-#@GLSB_UTILLIB@
-
-#@GLSB_GRAPHLIB@
-
 # gLSB Command and Utilities
 Requires: /bin/awk
 Requires: /bin/basename
@@ -354,7 +352,7 @@
 %patch0 -p 0
 
 %build
-cd lsb-release-%{lsbrelver}
+cd lsb-release-%{upstreamlsbrelver}
 make
 
 %install
@@ -363,7 +361,7 @@
          $RPM_BUILD_ROOT/%{_bindir} $RPM_BUILD_ROOT/usr/lib/lsb \
          $RPM_BUILD_ROOT/etc/lsb-release.d/ $RPM_BUILD_ROOT/usr/sbin/
 make DESTDIR=$RPM_BUILD_ROOT install
-cd lsb-release-%{lsbrelver}
+cd lsb-release-%{upstreamlsbrelver}
 make mandir=$RPM_BUILD_ROOT/%{_mandir} prefix=$RPM_BUILD_ROOT/%{_prefix} install
 cd ..
 touch $RPM_BUILD_ROOT/etc/lsb-release.d/core-3.1-%{archname}
@@ -421,8 +419,8 @@
 %files
 %defattr(-,root,root)
 /etc/redhat-lsb
-%config /etc/lsb-release
-/etc/redhat-lsb
+#%config /etc/lsb-release
+#/etc/redhat-lsb
 %dir /etc/lsb-release.d
 /etc/lsb-release.d/*
 %{_mandir}/*/*
@@ -434,9 +432,9 @@
 /usr/sbin/redhat_lsb_trigger.%{_target_cpu}
 
 %changelog
-* Thu Jun 22 2006 Lawrence Lim <llim at redhat.com> - 3.1-10
-- Rewrite most part of the mkredhat-lsb to obtain information directly via specdb 
-  rather than sniffing through sgml
+* Thu Jun 22 2006 Lawrence Lim <llim at redhat.com> - 3.0-10.1
+- Attempt to rewrite most part of the mkredhat-lsb to obtain information directly via 
+  specdb rather than sniffing through sgml
 - remove redundent script and bump up tarball version
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.0-9.2