diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 817ac34..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -vbetool_0.7-1.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index 9310e25..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: vbetool -# $Id$ -NAME := vbetool -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 $$/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),) -# attept 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) diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..a55506a --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Suspend not supported under UMS. Not installed by default since F13. diff --git a/sources b/sources deleted file mode 100644 index c0dad7c..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -1756f2e71ceaef217220e8e482fce835 vbetool_0.7-1.tar.gz diff --git a/vbetool-0.3-fix-gcc4bug.patch b/vbetool-0.3-fix-gcc4bug.patch deleted file mode 100644 index cb77681..0000000 --- a/vbetool-0.3-fix-gcc4bug.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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) diff --git a/vbetool-0.7-CFLAGS.patch b/vbetool-0.7-CFLAGS.patch deleted file mode 100644 index 253cd2c..0000000 --- a/vbetool-0.7-CFLAGS.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 diff --git a/vbetool-libz.patch b/vbetool-libz.patch deleted file mode 100644 index 3fbec5a..0000000 --- a/vbetool-libz.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- 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) diff --git a/vbetool.spec b/vbetool.spec deleted file mode 100644 index e9cf1cb..0000000 --- a/vbetool.spec +++ /dev/null @@ -1,76 +0,0 @@ -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 - 0.7-6 -- remove overriding of CFLAGS for x86emu - -* Wed Feb 20 2008 Fedora Release Engineering - 0.7-5 -- Autorebuild for GCC 4.3 - -* Sun Dec 02 2007 Till Maas - 0.7-4 -- libz.a is now in a -static subpackage, add to BR - -* Tue Nov 13 2007 Adam Jackson 0.7-3 -- Build with x86emu everywhere for uniformity of bugs and consistency with X. - -* Fri Sep 07 2007 Till Maas 0.7-2 -- ExcludeArch: ppc and ppc64 (does not build there) -- add Conflicts with old pm-utils package - -* Fri Aug 31 2007 Till Maas - 0.7-1 -- initial release for Fedora with patches from the pm-utils package