rpms/vbetool/F-7 vbetool-0.3-fix-gcc4bug.patch, NONE, 1.1 vbetool-libz.patch, NONE, 1.1 vbetool.spec, NONE, 1.1 sources, 1.1, 1.2

[Till Maas (till)]

Author: till

Update of /cvs/pkgs/rpms/vbetool/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3862

Modified Files:
	sources 
Added Files:
	vbetool-0.3-fix-gcc4bug.patch vbetool-libz.patch vbetool.spec 
Log Message:
sync with devel


vbetool-0.3-fix-gcc4bug.patch:

--- NEW FILE vbetool-0.3-fix-gcc4bug.patch ---
--- vbetool-0.7/vbetool.c.gcc4	2006-07-25 21:27:21.000000000 -0400
+++ vbetool-0.7/vbetool.c	2007-02-20 13:29:22.000000000 -0500
@@ -345,9 +345,10 @@
 {
 	int size;
 	char *buffer = __save_state(&size);
+	ssize_t num_written;
 
 	if (buffer)
-		write(1, buffer, size);	/* FIXME: should retry on short write); */
+		num_written = write(1, buffer, size);	/* FIXME: should retry on short write); */
 }
 
 int do_blank(int state)

vbetool-libz.patch:

--- NEW FILE vbetool-libz.patch ---
--- vbetool-0.7/Makefile.am.zlib	2006-07-25 21:21:31.000000000 -0400
+++ vbetool-0.7/Makefile.am	2007-04-26 00:18:40.000000000 -0400
@@ -6,11 +6,11 @@
 
 if WITH_X86EMU
 x86 = thunk.c x86-common.c
-vbetool_LDADD = x86emu/libx86emu.a $(libdir)/libpci.a
+vbetool_LDADD = x86emu/libx86emu.a $(libdir)/libpci.a $(libdir)/libz.a
 else
 x86 = lrmi.c x86-common.c
 x86lib = ""
-vbetool_LDADD = $(libdir)/libpci.a
+vbetool_LDADD = $(libdir)/libpci.a $(libdir)/libz.a
 endif
 
 man_MANS = vbetool.1
--- vbetool-0.7/Makefile.in.zlib	2006-07-25 21:26:30.000000000 -0400
+++ vbetool-0.7/Makefile.in	2007-04-26 00:20:34.000000000 -0400
@@ -57,9 +57,9 @@
 @WITH_X86EMU_TRUE at am__objects_1 = thunk.$(OBJEXT) x86-common.$(OBJEXT)
 am_vbetool_OBJECTS = vbetool.$(OBJEXT) $(am__objects_1)
 vbetool_OBJECTS = $(am_vbetool_OBJECTS)
- at WITH_X86EMU_FALSE@vbetool_DEPENDENCIES = $(libdir)/libpci.a
+ at WITH_X86EMU_FALSE@vbetool_DEPENDENCIES = $(libdir)/libpci.a $(libdir)/libz.a
 @WITH_X86EMU_TRUE at vbetool_DEPENDENCIES = x86emu/libx86emu.a \
- at WITH_X86EMU_TRUE@	$(libdir)/libpci.a
+ at WITH_X86EMU_TRUE@	$(libdir)/libpci.a $(libdir)/libz.a
 DEFAULT_INCLUDES = -I. -I$(srcdir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -174,8 +174,8 @@
 SUBDIRS = x86emu
 @WITH_X86EMU_FALSE at x86 = lrmi.c x86-common.c
 @WITH_X86EMU_TRUE at x86 = thunk.c x86-common.c
- at WITH_X86EMU_FALSE@vbetool_LDADD = $(libdir)/libpci.a
- at WITH_X86EMU_TRUE@vbetool_LDADD = x86emu/libx86emu.a $(libdir)/libpci.a
+ at WITH_X86EMU_FALSE@vbetool_LDADD = $(libdir)/libpci.a $(libdir)/libz.a
+ at WITH_X86EMU_TRUE@vbetool_LDADD = x86emu/libx86emu.a $(libdir)/libpci.a $(libdir)/libz.a
 @WITH_X86EMU_FALSE at x86lib = ""
 man_MANS = vbetool.1
 vbetool_SOURCES = vbetool.c $(x86)


--- NEW FILE vbetool.spec ---
Name:           vbetool
Version:        0.7
Release:        2%{?dist}
Summary:        Run real-mode video BIOS code to alter hardware state

Group:          System Environment/Base
License:        GPLv2
URL:            http://www.srcf.ucam.org/~mjg59/vbetool/
Source0:        http://www.srcf.ucam.org/~mjg59/vbetool/vbetool_%{version}-1.tar.gz
Patch10:        vbetool-0.3-fix-gcc4bug.patch
Patch11:        vbetool-libz.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  zlib-devel pciutils-devel
# does not build on ppc and ppc64
ExcludeArch:    ppc ppc64
# vbetool is included in (some of) these pm-utils releases
Conflicts:      pm-utils <= 0.99.3-11


%description
vbetool uses lrmi in order to run code from the video BIOS. Currently, it is
able to alter DPMS states, save/restore video card state and attempt to
initialize the video card from scratch.


%prep
%setup -q
%patch10 -p1 -b .gcc4
%patch11 -p1 -b .zlib


%build
%ifarch x86_64
%configure --with-x86emu
%else
%configure
%endif
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING
%{_sbindir}/vbetool
%{_mandir}/man1/vbetool.1.gz


%changelog
* Fri Sep 07 2007 Till Maas <opensource till name> 0.7-2
- ExcludeArch: ppc and ppc64 (does not build there)
- add Conflicts with old pm-utils package

* Fri Aug 31 2007 Till Maas <opensource till name> - 0.7-1
- initial release for Fedora with patches from the pm-utils package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vbetool/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:33:51 -0000	1.1
+++ sources	11 Sep 2007 14:15:00 -0000	1.2
@@ -0,0 +1 @@
+1756f2e71ceaef217220e8e482fce835  vbetool_0.7-1.tar.gz