rpms/svgalib/devel sources, 1.3, 1.4 svgalib-1.9.21-makefiles.patch, 1.1, 1.2 svgalib.spec, 1.7, 1.8
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Sat Jul 15 15:01:27 UTC 2006
Author: jwrdegoede
Update of /cvs/extras/rpms/svgalib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11285
Modified Files:
sources svgalib-1.9.21-makefiles.patch svgalib.spec
Log Message:
* Sat Jul 15 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.9.25-1
- New upstream release 1.9.25
- Drop ancient Provides: libvga
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/svgalib/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 5 Jan 2006 20:16:05 -0000 1.3
+++ sources 15 Jul 2006 15:01:27 -0000 1.4
@@ -1 +1 @@
-3be376c08462caf88cfc150239481110 svgalib-1.9.24.tar.gz
+4dda7e779e550b7404cfe118f1d74222 svgalib-1.9.25.tar.gz
svgalib-1.9.21-makefiles.patch:
Index: svgalib-1.9.21-makefiles.patch
===================================================================
RCS file: /cvs/extras/rpms/svgalib/devel/svgalib-1.9.21-makefiles.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- svgalib-1.9.21-makefiles.patch 5 Aug 2005 09:37:40 -0000 1.1
+++ svgalib-1.9.21-makefiles.patch 15 Jul 2006 15:01:27 -0000 1.2
@@ -1,77 +1,5 @@
---- svgalib-1.9.21/utils/Makefile.makefiles 2005-03-18 11:59:49.000000000 +0100
-+++ svgalib-1.9.21/utils/Makefile 2005-07-08 21:16:12.000000000 +0200
-@@ -35,7 +35,6 @@
-
- .o:
- $(CC) $(CFLAGS) $(LDFLAGS) -o $* $*.o $(LIBS)
-- chmod 4755 $*
-
- all: $(UTILPROGS)
- .PHONY: all clean cleanbin dep
--- svgalib-1.9.21/Makefile.makefiles 2005-03-18 14:49:10.000000000 +0100
+++ svgalib-1.9.21/Makefile 2005-07-08 21:16:12.000000000 +0200
-@@ -78,10 +78,6 @@
-
- installheaders:
- @echo Installing header files in $(includedir).
-- @if [ -f /usr/include/vga.h ]; then \
-- rm -f /usr/include/vga.h /usr/include/vgagl.h; \
-- echo Old header files in /usr/include removed.; \
-- fi
- @mkdir -p $(includedir)
- @cp $(SRCDIR)/src/vga.h $(includedir)/vga.h
- @chmod a+r $(includedir)/vga.h
-@@ -95,33 +91,19 @@
- @chmod a+r $(includedir)/vgakeyboard.h
-
- installsharedlib: $(SHAREDLIBS) $(SVGALIBSHAREDSTUBS)
-- @if [ -f /usr/lib/libvga.sa ]; then \
-- rm -f /usr/lib/libvga.sa /usr/lib/libvgagl.sa; \
-- echo Old stubs in /usr/lib removed.; \
-- fi
--ifndef KEEPSHAREDLIBS
-- @echo "Removing shared library images (old & current)..."
-- @for i in $(OBSOLETELDIRS); do \
-- rm -f `echo $(OBSOLETESHAREDIMAGES) | sed s?/lib/?$$i?g`; \
-- done
--endif
- @echo Installing shared library image as \
- $(addprefix $(sharedlibdir)/,$(notdir $(SHAREDLIBS))).
- @for foo in $(notdir $(SHAREDLIBS)); do \
- $(INSTALL_SHLIB) sharedlib/$$foo $(sharedlibdir)/$$foo; \
-- (cd $(sharedlibdir); \
-- ln -sf $$foo `echo $$foo | sed 's/\.so\..*/.so/'` ); \
-+ cp -d sharedlib/`echo $$foo | sed 's/\.so\..*/.so/'` $(sharedlibdir); \
-+ cp -d sharedlib/`echo $$foo | sed 's/\.so\..*/.so/'`.$(MAJOR_VER) $(sharedlibdir); \
- done
-- @./fixldsoconf
-- @ldconfig
-
- installstaticlib: static
- @echo Installing static libraries in $(libdir).
- @mkdir -p $(libdir)
-- @rm -f /usr/lib/libvga.a
- @$(INSTALL_DATA) staticlib/libvga.a $(libdir)/libvga.a
- @chmod a+r $(libdir)/libvga.a
-- @rm -f /usr/lib/libvgagl.a
- @$(INSTALL_DATA) staticlib/libvgagl.a $(libdir)/libvgagl.a
- @chmod a+r $(libdir)/libvgagl.a
-
-@@ -130,14 +112,6 @@
- echo No $(bindir) directory, creating it.; \
- mkdir -p $(bindir); \
- fi
-- @if [ -f /usr/bin/restorefont ]; then \
-- echo Removing old utilities in /usr/bin.; \
-- for x in $(UTILS); do rm -f /usr/bin/$$x; done; \
-- fi
-- @if [ -f /usr/bin/convfont ]; then \
-- echo Removing inappropriate utilities in /usr/bin.; \
-- rm -f /usr/bin/convfont /usr/bin/setmclk; \
-- fi
- @echo Installing textmode utilities in $(bindir):
- @echo "restorefont: Save/restore textmode font."
- @$(INSTALL_PROGRAM) utils/restorefont $(bindir)
@@ -152,8 +126,10 @@
@echo "savetextmode: Script that saves textmode information used by 'textmode'."
@$(INSTALL_SCRIPT) utils/savetextmode $(bindir)
@@ -84,90 +12,8 @@
endif
@echo "Installing keymap utilities in $(bindir):"
@echo "svgakeymap: Perl script that generates scancode conversion maps."
-@@ -222,34 +198,6 @@
- @echo demos/ and threedkit/.
-
- uninstall:
-- @echo "Removing textmode utilities..."
-- @for i in $(OBSOLETEBDIRS); do \
-- for prog in $(UTILS); do \
-- rm -f $$i$$prog ; \
-- done ; \
-- done
-- @echo "Removing shared library stubs (old & current)..."
-- @for i in $(OBSOLETELDIRS); do \
-- rm -f `echo /lib/libvga.so.$(VERSION) /lib/libvgagl.so.$(VERSION) \
-- $(OBSOLETELIBLINKS) /lib/libvga.sa /lib/libvgagl.sa \
-- | sed s?/lib/?$$i?g`; \
-- done
--ifndef KEEPSHAREDLIBS
-- @echo "Removing shared library images (old & current)..."
-- @for i in $(OBSOLETELDIRS); do \
-- rm -f `echo $(OBSOLETESHAREDIMAGES) | sed s?/lib/?$$i?g`; \
-- done
--endif
-- @echo "Removing static libraries..."
-- @for i in $(OBSOLETELDIRS); do \
-- rm -f `echo /lib/libvga.a /lib/libvgagl.a | sed s?/lib/?$$i?g`; \
-- done
-- @echo "Removing header files..."
-- @for i in $(OBSOLETEHDIRS); do \
-- rm -f `echo $(OBSOLETEHEADERS) | sed s?/inc/?$$i?g`; \
-- done
-- (cd doc; $(MAKE) -f $(SRCDIR)/doc/Makefile SRCDIR="$(SRCDIR)" uninstall)
--
-
- SHAREDDIRS0 = sharedlib/mouse sharedlib/keyboard sharedlib/ramdac \
- sharedlib/clockchip sharedlib/joystick \
-@@ -335,7 +283,6 @@
-
- distclean:
- (cd $(SRCDIR)/doc; $(MAKE) clean)
-- (cd $(SRCDIR)/doc; $(MAKE) ../0-README)
- (cd $(SRCDIR)/src; $(MAKE) clean)
- (cd $(SRCDIR)/gl; $(MAKE) clean)
- (cd $(SRCDIR)/utils; $(MAKE) clean)
---- svgalib-1.9.21/threeDKit/Makefile.makefiles 2004-09-16 19:54:17.000000000 +0200
-+++ svgalib-1.9.21/threeDKit/Makefile 2005-07-08 21:16:12.000000000 +0200
-@@ -14,7 +14,7 @@
- # Compiler Section (overrides Makefile.cfg)
- #----------------------------------------------------------------------
-
--INCLUDES += -I$(srcdir)/src
-+INCLUDES += -I$(srcdir)/src -I$(srcdir)/gl
-
- #----------------------------------------------------------------------
- # Rules Section
-@@ -58,7 +58,7 @@
- $(sharedlibdir)/lib3dkit.so.$(VERSION): lib3dkit.so.$(VERSION)
- $(INSTALL_SHLIB) $< $(sharedlibdir)/$<
- (cd $(sharedlibdir); ln -sf lib3dkit.so.$(VERSION) `echo lib3dkit.so.$(VERSION) | sed 's/\.so\..*/.so/'` )
-- ldconfig
-+ (cd $(sharedlibdir); ln -sf lib3dkit.so.$(VERSION) `echo lib3dkit.so.$(VERSION) | sed 's/\.so\..*/.so/'`.$(MAJOR_VER) )
-
- install: $(sharedlibdir)/lib3dkit.so.$(VERSION) installheaders
-
--- svgalib-1.9.21/src/Makefile.makefiles 2005-02-03 12:31:43.000000000 +0100
+++ svgalib-1.9.21/src/Makefile 2005-07-08 21:16:12.000000000 +0200
-@@ -448,13 +445,16 @@
- libvga.so.$(VERSION): $(ALLOBJS)
- $(CC) -shared -Wl,-soname,libvga.so.$(MAJOR_VER) \
- -Xlinker --retain-symbols-file -Xlinker ../src/exports \
-- -Wl,-Bsymbolic -o libvga.so.$(VERSION) $(ALLOBJS) -lm
-+ -Wl,-Bsymbolic -o libvga.so.$(VERSION) $(ALLOBJS) $(SHLIBLIBS) -lm
-+ ln -sf libvga.so.$(VERSION) libvga.so
-+ ln -sf libvga.so.$(VERSION) libvga.so.$(MAJOR_VER)
-
- $(sharedlibdir)/libvga.so.$(VERSION): libvga.so.$(VERSION)
- $(INSTALL_SHLIB) $< $(sharedlibdir)/$<
-- ldconfig
-
- install: $(sharedlibdir)/libvga.so.$(VERSION)
-+ cp -df sharedlib/libvga.so $(sharedlibdir)/
-+ cp -df sharedlib/libvga.so.$(MAJOR_VER) $(sharedlibdir)/
-
- endif
-
@@ -471,9 +471,11 @@
vga.o: vga.c
$(CC) $(CFLAGS) $(VGA_DEFINES) -c -o $@ $<
@@ -182,29 +28,3 @@
$(RAMDAC): %.o: %.c
$(CC) $(CFLAGS) $(RAMDAC_DEFINES) -c -o $@ $<
---- svgalib-1.9.21/gl/Makefile.makefiles 1999-07-18 10:14:45.000000000 +0200
-+++ svgalib-1.9.21/gl/Makefile 2005-07-08 21:43:10.000000000 +0200
-@@ -28,9 +28,12 @@
- all: libvgagl.a
- .PHONY: all clean dep
-
-+libvgagl.so: libvgagl.so.$(VERSION)
- libvgagl.so.$(VERSION): $(MODULES)
-- $(CC) -s -shared -Wl,-soname,libvgagl.so.$(MAJOR_VER) -o libvgagl.so.$(VERSION) \
-- $(MODULES)
-+ $(CC) -shared -Wl,-soname,libvgagl.so.$(MAJOR_VER) -o libvgagl.so.$(VERSION) \
-+ $(MODULES) $(SHLIBLIBS) -L$(srcdir)/sharedlib -lvga
-+ ln -sf libvgagl.so.$(VERSION) libvgagl.so
-+ ln -sf libvgagl.so.$(VERSION) libvgagl.so.$(MAJOR_VER)
-
- libvgagl.a: $(MODULES)
- rm -f libvgagl.a
-@@ -63,7 +66,7 @@
- $(CC) $(INCLUDES) -MM $(patsubst %.o,$(srcdir)/gl/%.c,$(MODULES)) >>.depend.gl
-
- clean:
-- rm -f .depend.gl *.bak *.o *~ libvgagl.a libvgagl.so.$(VERSION)
-+ rm -f .depend.gl *.bak *.o *~ libvgagl.a libvgagl.so*
-
- #
- # include a dependency file if one exists
Index: svgalib.spec
===================================================================
RCS file: /cvs/extras/rpms/svgalib/devel/svgalib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- svgalib.spec 13 Feb 2006 15:46:06 -0000 1.7
+++ svgalib.spec 15 Jul 2006 15:01:27 -0000 1.8
@@ -1,9 +1,7 @@
Name: svgalib
-Version: 1.9.24
-Release: 2%{?dist}
-Exclusivearch: %{ix86} x86_64
+Version: 1.9.25
+Release: 1%{?dist}
Summary: Low-level fullscreen SVGA graphics library
-
Group: System Environment/Libraries
License: Public Domain
URL: http://www.svgalib.org/
@@ -15,7 +13,7 @@
Patch3: svgalib-1.9.21-cfg.patch
Patch4: svgalib-1.9.21-x86_64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides: libvga = %{version}-%{release}
+Exclusivearch: %{ix86} x86_64
%description
The svgalib package provides the SVGAlib low-level graphics library
@@ -24,6 +22,7 @@
utilities use SVGAlib for their graphics. For details on
supported chipsets, see man 7 svgalib (when svgalib is installed).
+
%package devel
Summary: Development tools for the SVGAlib graphics library
Group: Development/Libraries
@@ -35,6 +34,7 @@
needed to build programs which will use the SVGAlib low-level graphics
library.
+
%prep
%setup -q
%patch0 -p1 -b .makefiles
@@ -49,10 +49,11 @@
#demo dir
cp src/libvga.h demos
+
%build
#%{?_smp_mflags} doesn't work on x86_64 chances are it will fail on
#some i386 machines too.
-make OPTIMIZE="-Wno-pointer-sign $RPM_OPT_FLAGS" LDFLAGS= \
+make OPTIMIZE="$RPM_OPT_FLAGS -Wno-pointer-sign" LDFLAGS= \
prefix=%{_prefix} \
NO_HELPER=y \
INCLUDE_ET4000_DRIVER=y \
@@ -67,14 +68,15 @@
INCLUDE_VESA_DRIVER_TEST=y \
shared
cd utils
-make OPTIMIZE="-Wno-pointer-sign $RPM_OPT_FLAGS" LDFLAGS= \
+make OPTIMIZE="$RPM_OPT_FLAGS -Wno-pointer-sign" LDFLAGS= \
prefix=%{_prefix}
cd ..
cd threeDKit
-make OPTIMIZE="-Wno-pointer-sign $RPM_OPT_FLAGS" LDFLAGS= \
+make OPTIMIZE="$RPM_OPT_FLAGS -Wno-pointer-sign -I../gl" LDFLAGS= \
prefix=%{_prefix} lib3dkit.so.%{version}
cd ..
+
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/etc/vga
@@ -91,17 +93,23 @@
"INSTALL_SHLIB=install -p -m 755" \
"INSTALL_DATA=install -p -m 644" \
install
+ln -s libvga.so.%{version} $RPM_BUILD_ROOT/%{_libdir}/libvga.so.1
+ln -s libvgagl.so.%{version} $RPM_BUILD_ROOT/%{_libdir}/libvgagl.so.1
+ln -s lib3dkit.so.%{version} $RPM_BUILD_ROOT/%{_libdir}/lib3dkit.so.1
#for %ghost
touch $RPM_BUILD_ROOT/etc/vga/fontdata
touch $RPM_BUILD_ROOT/etc/vga/textregs
+
%clean
rm -fr $RPM_BUILD_ROOT
+
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
+
%files
%defattr(-,root,root,-)
%doc doc/CHANGES doc/README.joystick doc/README.keymap lrmi-0.6m/README
@@ -124,7 +132,12 @@
%{_libdir}/*.so
%{_mandir}/man3/*
+
%changelog
+* Sat Jul 15 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.9.25-1
+- New upstream release 1.9.25
+- Drop ancient Provides: libvga
+
* Mon Feb 13 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.9.24-2
- Bump release and rebuild for new gcc4.1 and glibc.
- add %%{?dist} for consistency with my other packages
More information about the fedora-extras-commits
mailing list