packages: grub2/grub-shelllib.patch, grub2/grub2.spec - up to final 1.99; p...

[arekm]

Author: arekm                        Date: Thu Sep  8 11:38:54 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to final 1.99; patch3 needs fix (otherwise without it it builds)

---- Files affected:
packages/grub2:
   grub-shelllib.patch (1.2 -> 1.3) , grub2.spec (1.100 -> 1.101) 

---- Diffs:

================================================================
Index: packages/grub2/grub-shelllib.patch
diff -u packages/grub2/grub-shelllib.patch:1.2 packages/grub2/grub-shelllib.patch:1.3
--- packages/grub2/grub-shelllib.patch:1.2	Fri May 21 23:14:03 2010
+++ packages/grub2/grub-shelllib.patch	Thu Sep  8 13:38:49 2011
@@ -1,31 +1,3 @@
---- grub-1.97.1/Makefile.in~	2009-11-09 17:48:15.000000000 +0200
-+++ grub-1.97.1/Makefile.in	2009-11-17 12:33:36.678701742 +0200
-@@ -293,12 +293,12 @@
- 	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
- 	  $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \
- 	done
--	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(libdir)/grub
-+	$(SHELL) $(mkinstalldirs) $(DESTDIR)/lib
- 	@list='$(lib_SCRIPTS)'; \
- 	for file in $$list; do \
- 	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
- 	  dest="`echo $$file | sed 's,.*/,,'`"; \
--	  $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(libdir)/grub/$$dest; \
-+	  $(INSTALL_DATA) $$dir$$file $(DESTDIR)/lib/$$dest; \
- 	done
- 	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(infodir)
- 	@list='$(info_INFOS)'; \
-@@ -343,8 +343,8 @@
- 	@list='$(lib_SCRIPTS)'; \
- 	for file in $$list; do \
- 	  dest="`echo $$file | sed 's,.*/,,'`"; \
--	  echo rm -f $(DESTDIR)$(libdir)/$$dest; \
--	  rm -f $(DESTDIR)$(libdir)/grub/$$dest; \
-+	  echo rm -f $(DESTDIR)/lib/$$dest; \
-+	  rm -f $(DESTDIR)/lib/$$dest; \
- 	done
- 	@list='$(info_INFOS)'; \
- 	for file in $$list; do \
 --- grub-1.97.1.shelllib/util/grub.d/00_header.in	2009-11-09 17:48:16.000000000 +0200
 +++ grub-1.97.1/util/grub.d/00_header.in	2009-11-17 12:34:23.164322142 +0200
 @@ -23,7 +23,7 @@

================================================================
Index: packages/grub2/grub2.spec
diff -u packages/grub2/grub2.spec:1.100 packages/grub2/grub2.spec:1.101
--- packages/grub2/grub2.spec:1.100	Thu Sep  8 13:21:08 2011
+++ packages/grub2/grub2.spec	Thu Sep  8 13:38:49 2011
@@ -30,14 +30,13 @@
 Summary(hu.UTF-8):	GRUB2 - rendszerbetöltő x86 és ppc gépekhez
 Summary(pl.UTF-8):	GRUB2 - bootloader dla x86 i ppc
 Summary(pt_BR.UTF-8):	Gerenciador de inicialização GRUB2
-%define	rcver	rc2
 Name:		grub2
 Version:	1.99
-Release:	0.%{rcver}.1
+Release:	0.1
 License:	GPL v2
 Group:		Base
-Source0:	http://alpha.gnu.org/gnu/grub/grub-%{version}~%{rcver}.tar.gz
-# Source0-md5:	bfdc87ece4fd9ec1c4104e97e5094382
+Source0:	http://ftp.gnu.org/gnu/grub/grub-%{version}.tar.xz
+# Source0-md5:	27e360b951f006c464299d06bbd63442
 Source1:	update-grub
 Source2:	update-grub.8
 Source3:	grub.sysconfig
@@ -184,11 +183,11 @@
 avançados e que querem mais recursos de seu boot loader.
 
 %prep
-%setup -q -n grub-%{version}~%{rcver}
+%setup -q -n grub-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-#%patch3 -p1
+%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
@@ -243,6 +242,8 @@
 	pkglibdir=%{_libexecdir} \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%find_lang grub
+
 # this must be after 'make install'
 install -d $RPM_BUILD_ROOT%{_libexecdir}/locale
 
@@ -282,7 +283,7 @@
 echo "Grub was upgraded, trying to setup it to boot sector"
 /sbin/grub-install '(hd0)' || :
 
-%files
+%files -f grub.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README THANKS TODO
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/grub
@@ -388,6 +389,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.101  2011/09/08 11:38:49  arekm
+- up to final 1.99; patch3 needs fix (otherwise without it it builds)
+
 Revision 1.100  2011/09/08 11:21:08  arekm
 - up to 1.99 rc2 (1.98 on GRUB2_1_98)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grub2/grub-shelllib.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grub2/grub2.spec?r1=1.100&r2=1.101&f=u