rpms/redhat-lsb/F-12 redhat-lsb.spec,1.50,1.51

[pnemade]

Author: pnemade

Update of /cvs/pkgs/rpms/redhat-lsb/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5006

Modified Files:
	redhat-lsb.spec 
Log Message:
* Fri Jul 09 2010 Parag <pnemade AT redhat.com> - 4.0-5
- Fix directory ownership issue for %%{_sysconfdir}/lsb-release.d
- Fix duplicate files issue as reported in bodhi testing for 4.0-4




Index: redhat-lsb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-lsb/F-12/redhat-lsb.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- redhat-lsb.spec	25 Jun 2010 09:27:33 -0000	1.50
+++ redhat-lsb.spec	9 Jul 2010 07:24:55 -0000	1.51
@@ -49,7 +49,7 @@
 Summary: LSB base libraries support for Red Hat Enterprise Linux
 Name: redhat-lsb
 Version: 4.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.linuxfoundation.org/collaborate/workgroups/lsb
 Source0: %{name}-%{version}-%{srcrelease}.tar.bz2
 #Source1: http://prdownloads.sourceforge.net/lsb/lsb-release-%{upstreamlsbrelver}.tar.gz
@@ -574,6 +574,9 @@ Requires: /usr/bin/fc-cache
 Requires: /usr/bin/fc-list
 Requires: /usr/bin/fc-match
 
+#for directory ownership
+Requires:       %{name} = %{version}-%{release}
+
 Provides: lsb-graphics-%{archname} = %{version}
 Provides: lsb-graphics-noarch = %{version}
 
@@ -594,6 +597,9 @@ Requires: /usr/bin/foomatic-rip
 Requires: /usr/bin/gs
 Requires: /usr/bin/lp
 Requires: /usr/bin/lpr
+   
+#for directory ownership
+Requires:       %{name} = %{version}-%{release}
 
 Provides: lsb-printing-%{archname} = %{version}
 Provides: lsb-printing-noarch = %{version}
@@ -631,22 +637,12 @@ make DESTDIR=$RPM_BUILD_ROOT install
 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-4.0-%{archname}
-touch $RPM_BUILD_ROOT/etc/lsb-release.d/core-4.0-noarch
-touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-4.0-%{archname}
-touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-4.0-noarch
-touch $RPM_BUILD_ROOT/etc/lsb-release.d/printing-4.0-%{archname}
-touch $RPM_BUILD_ROOT/etc/lsb-release.d/printing-4.0-noarch
-
-#touch $RPM_BUILD_ROOT/etc/lsb-release.d/core-3.2-%{archname}
-#touch $RPM_BUILD_ROOT/etc/lsb-release.d/core-3.2-noarch
-#touch $RPM_BUILD_ROOT/etc/lsb-release.d/desktop-3.2-%{archname}
-#touch $RPM_BUILD_ROOT/etc/lsb-release.d/desktop-3.2-noarch
-# and claim LSB 3.1 is supported as well
-#touch $RPM_BUILD_ROOT/etc/lsb-release.d/core-3.1-%{archname}
-#touch $RPM_BUILD_ROOT/etc/lsb-release.d/core-3.1-noarch
-#touch $RPM_BUILD_ROOT/etc/lsb-release.d/desktop-3.1-%{archname}
-#touch $RPM_BUILD_ROOT/etc/lsb-release.d/desktop-3.1-noarch
+touch $RPM_BUILD_ROOT%{_sysconfdir}/lsb-release.d/core-4.0-%{archname}
+touch $RPM_BUILD_ROOT%{_sysconfdir}/lsb-release.d/core-4.0-noarch
+touch $RPM_BUILD_ROOT%{_sysconfdir}/lsb-release.d/graphics-4.0-%{archname}
+touch $RPM_BUILD_ROOT%{_sysconfdir}/lsb-release.d/graphics-4.0-noarch
+touch $RPM_BUILD_ROOT%{_sysconfdir}/lsb-release.d/printing-4.0-%{archname}
+touch $RPM_BUILD_ROOT%{_sysconfdir}/lsb-release.d/printing-4.0-noarch
 
 for LSBVER in %{lsbsover}; do
   ln -s %{ldso} $RPM_BUILD_ROOT/%{_lib}/%{lsbldso}.$LSBVER
@@ -714,7 +710,7 @@ fi
 %dir %{_sysconfdir}/lsb-release.d
 # These files are needed because they shows which LSB we're supporting now, 
 # for example, if core-3.1-noarch exists, it means we are supporting LSB3.1 now
-%{_sysconfdir}/lsb-release.d/*
+%{_sysconfdir}/lsb-release.d/core*
 %{_mandir}/*/*
 %{_bindir}/*
 #/bin/mailx
@@ -734,6 +730,10 @@ fi
 
 
 %changelog
+* Fri Jul 09 2010 Parag <pnemade AT redhat.com> - 4.0-5
+- Fix directory ownership issue for %%{_sysconfdir}/lsb-release.d
+- Fix duplicate files issue as reported in bodhi testing for 4.0-4
+
 * Fri Jun 25 2010 Parag <pnemade AT redhat.com> - 4.0-4
 - Revert license back to GPLv2