dist-git conversion

- Fix duplicate files issue as reported in bodhi testing for 4.0-4

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: redhat-lsb
-# $Id: Makefile,v 1.2 2007/10/15 19:20:22 notting Exp $
-NAME := redhat-lsb
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

redhat-lsb.spec

@@ -49,16 +49,15 @@
 Summary: LSB base libraries support for Red Hat Enterprise Linux
 Name: redhat-lsb
 Version: 4.0
-Release: 2%{?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
 Patch0: lsb-release-3.1-update-init-functions.patch
 Patch1: redhat-lsb-lsb_start_daemon-fix.patch
 Patch2: redhat-lsb-trigger.patch
-License: GPL
+License: GPLv2
 Group: System Environment/Base
-BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: glibc-static
 # dependency for primary LSB application for v1.3
 Provides: lsb = %{version}
@@ -350,13 +349,6 @@ installed on the system.
 Group: System Environment/Base
 Summary: LSB graphics libraries support for Red Hat Enterprise Linux
 
-Provides: lsb-graphics-%{archname} = %{version}
-Provides: lsb-graphics-noarch = %{version}
-
-%description graphics
-The Linux Standard Base (LSB) Graphics Specifications define components that are required
- to be present on an LSB conforming system.
-
 %ifarch %{ix86}
 # archLSB IA32 Graphics Libraries
 Requires: libatk-1.0.so.0
@@ -582,19 +574,20 @@ 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}
+
+%description graphics
+The Linux Standard Base (LSB) Graphics Specifications define components that are required
+ to be present on an LSB conforming system.
 
 %package printing
 Group: System Environment/Base
 Summary: LSB printing libraries support for Red Hat Enterprise Linux
 
-Provides: lsb-printing-%{archname} = %{version}
-Provides: lsb-printing-noarch = %{version}
-
-%description printing
-The Linux Standard Base (LSB) Printing Specifications define components that are required
- to be present on an LSB conforming system.
-
 # gLSB Printing Libraries
 Requires: libcups.so.2%{qual}
 Requires: libcupsimage.so.2%{qual}
@@ -605,6 +598,15 @@ 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}
+
+%description printing
+The Linux Standard Base (LSB) Printing Specifications define components that are required
+ to be present on an LSB conforming system.
 
 %prep
 %setup -q
@@ -626,31 +628,20 @@ fi
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 # LSB uses /usr/lib rather than /usr/lib64 even for 64bit OS
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} $RPM_BUILD_ROOT/%{_lib} $RPM_BUILD_ROOT%{_mandir} \
          $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT/usr/lib/lsb \
          $RPM_BUILD_ROOT%{_sysconfdir}/lsb-release.d/ $RPM_BUILD_ROOT%{_sbindir}
-make DESTDIR=$RPM_BUILD_ROOT install
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 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
@@ -680,9 +671,6 @@ install -m 700 redhat_lsb_trigger.%{_target_cpu} \
 
 cp -p redhat_lsb_init $RPM_BUILD_ROOT/bin/redhat_lsb_init
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %triggerpostun -- glibc
 if [ -x /usr/sbin/redhat_lsb_trigger.%{_target_cpu} ]; then
   /usr/sbin/redhat_lsb_trigger.%{_target_cpu}
@@ -713,12 +701,12 @@ fi
 %endif
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_sysconfdir}/redhat-lsb
 %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
@@ -729,15 +717,25 @@ fi
 %{_sbindir}/redhat_lsb_trigger.%{_target_cpu}
 
 %files graphics
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_sysconfdir}/lsb-release.d/graphics*
 
 %files printing
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_sysconfdir}/lsb-release.d/printing*
 
 
 %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
+
+* Thu Jun 24 2010 Parag <pnemade AT redhat.com> - 4.0-3
+- Resolves:rh#585858:-redhat-lsb-graphics broken
+
 * Fri Jan 15 2010 Lawrence Lim <llim@redhat.com> - 4.0-2
 - update spec file to split package into core, desktop and printing (Curtis Doty, #472633)