dist-git conversion

#2781)

.gitignore

@@ -0,0 +1 @@
+vbetool_0.7-1.tar.gz

dead.package

@@ -1 +0,0 @@
-Suspend not supported under UMS. Not installed by default since F13.

sources

@@ -0,0 +1 @@
+1756f2e71ceaef217220e8e482fce835  vbetool_0.7-1.tar.gz

vbetool-0.3-fix-gcc4bug.patch

@@ -0,0 +1,14 @@
+--- 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-0.7-CFLAGS.patch

@@ -0,0 +1,12 @@
+diff -up vbetool-0.7/x86emu/makefile.linux.CFLAGS vbetool-0.7/x86emu/makefile.linux
+--- vbetool-0.7/x86emu/makefile.linux.CFLAGS	2005-07-21 19:14:56.000000000 +0200
++++ vbetool-0.7/x86emu/makefile.linux	2008-03-25 20:31:27.000000000 +0100
+@@ -47,7 +47,7 @@ $(TARGETLIB): $(OBJS)
+ 	ar rv $(TARGETLIB) $(OBJS)
+ 
+ INCS   = -I. -Ix86emu -I../../include -I../x86emu_include
+-CFLAGS = -D__DRIVER__ -DFORCE_POST -D_CEXPORT= -DNO_LONG_LONG -DDEBUG
++CFLAGS += -D__DRIVER__ -DFORCE_POST -D_CEXPORT= -DNO_LONG_LONG -DDEBUG
+ 
+ .c.o:
+ 	gcc -g -O -Wall -c $(CFLAGS) $(INCS) $*.c

vbetool-libz.patch

@@ -0,0 +1,41 @@
+--- 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@am__objects_1 = thunk.$(OBJEXT) x86-common.$(OBJEXT)
+ am_vbetool_OBJECTS = vbetool.$(OBJEXT) $(am__objects_1)
+ vbetool_OBJECTS = $(am_vbetool_OBJECTS)
+-@WITH_X86EMU_FALSE@vbetool_DEPENDENCIES = $(libdir)/libpci.a
++@WITH_X86EMU_FALSE@vbetool_DEPENDENCIES = $(libdir)/libpci.a $(libdir)/libz.a
+ @WITH_X86EMU_TRUE@vbetool_DEPENDENCIES = x86emu/libx86emu.a \
+-@WITH_X86EMU_TRUE@	$(libdir)/libpci.a
++@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@x86 = lrmi.c x86-common.c
+ @WITH_X86EMU_TRUE@x86 = thunk.c x86-common.c
+-@WITH_X86EMU_FALSE@vbetool_LDADD = $(libdir)/libpci.a
+-@WITH_X86EMU_TRUE@vbetool_LDADD = x86emu/libx86emu.a $(libdir)/libpci.a
++@WITH_X86EMU_FALSE@vbetool_LDADD = $(libdir)/libpci.a $(libdir)/libz.a
++@WITH_X86EMU_TRUE@vbetool_LDADD = x86emu/libx86emu.a $(libdir)/libpci.a $(libdir)/libz.a
+ @WITH_X86EMU_FALSE@x86lib = ""
+ man_MANS = vbetool.1
+ vbetool_SOURCES = vbetool.c $(x86)

vbetool.spec

@@ -0,0 +1,76 @@
+Name:           vbetool
+Version:        0.7
+Release:        6%{?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
+Patch1:         vbetool-0.7-CFLAGS.patch
+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 zlib-static
+# does not build on ppc and ppc64, see #285361 (RedHat Bugzilla)
+# on ppc sys/io.h is missing, on ppc64 there are more complaints
+# build.logs are attached in the bug report
+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
+%patch1 -p1 -b .CFLAGS
+%patch10 -p1 -b .gcc4
+%patch11 -p1 -b .zlib
+
+
+%build
+%configure --with-x86emu
+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
+* Tue Mar 25 2008 Till Maas <opensource till name> - 0.7-6
+- remove overriding of CFLAGS for x86emu
+
+* Wed Feb 20 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.7-5
+- Autorebuild for GCC 4.3
+
+* Sun Dec 02 2007 Till Maas <opensource till name> - 0.7-4
+- libz.a is now in a -static subpackage, add to BR
+
+* Tue Nov 13 2007 Adam Jackson <ajax@redhat.com> 0.7-3
+- Build with x86emu everywhere for uniformity of bugs and consistency with X.
+
+* 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