commit bochs

28 May 2007

Hello community,

here is the log from the commit of package bochs
checked in at Mon May 28 23:22:25 CEST 2007.

--------

--- bochs/bochs.changes	2007-01-24 15:06:13.000000000 +0100
+++ /mounts/work_src_done/STABLE/bochs/bochs.changes	2007-05-28 17:13:19.000000000 +0200
@@ -1,0 +2,6 @@
+Mon May 28 17:13:04 CEST 2007 - dmueller@suse.de
+
+- don't build versioned modules, doesn't work anyway
+  and rpmlint doesn't like it
+
+-------------------------------------------------------------------

New:
----
  fix-module-building.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ bochs.spec ++++++
--- /var/tmp/diff_new_pack.i20732/_old	2007-05-28 23:15:26.000000000 +0200
+++ /var/tmp/diff_new_pack.i20732/_new	2007-05-28 23:15:26.000000000 +0200
@@ -16,10 +16,11 @@
 Group:          System/Emulators/PC
 Autoreqprov:    on
 Version:        2.2.1
-Release:        52
+Release:        79
 Summary:        Cross-Platform IA32 Emulator
 Source:         bochs-%{version}.tar.bz2
 Patch2:         bochs-2.1.1-nonvoid.patch
+Patch3:         fix-module-building.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -39,6 +40,7 @@
 %prep
 %setup
 %patch2
+%patch3
 
 %build
 %{?suse_update_config:%{suse_update_config}}
@@ -117,7 +119,10 @@
 %endif
 %{_libdir}/bochs
 
-%changelog -n bochs
+%changelog
+* Mon May 28 2007 - dmueller@suse.de
+- don't build versioned modules, doesn't work anyway
+  and rpmlint doesn't like it
 * Wed Jan 24 2007 - ro@suse.de
 - move from /usr/X11R6 to /usr
 * Mon Jan 30 2006 - coolo@suse.de

++++++ fix-module-building.diff ++++++
--- iodev/Makefile.in
+++ iodev/Makefile.in
@@ -129,32 +129,32 @@ pcidev.lo : pcidev.@CPP_SUFFIX@
 	$(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $(PCIDEV_CXXFLAGS) $< -o $@
 
 libbx_%.la: %.lo
-	$(LIBTOOL) --mode=link $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH)
+	$(LIBTOOL) --mode=link $(CXX) -avoid-version -module $< -o $@ -rpath $(PLUGIN_PATH)
 
 # special link rules for plugins that require more than one object file
 libbx_harddrv.la: harddrv.lo vmware3.lo $(CDROM_OBJS:.o=.lo)
-	$(LIBTOOL) --mode=link $(CXX) -module harddrv.lo vmware3.lo $(CDROM_OBJS:.o=.lo) -o libbx_harddrv.la -rpath $(PLUGIN_PATH)
+	$(LIBTOOL) --mode=link $(CXX) -avoid-version -module harddrv.lo vmware3.lo $(CDROM_OBJS:.o=.lo) -o libbx_harddrv.la -rpath $(PLUGIN_PATH)
 
 libbx_keyboard.la: keyboard.lo scancodes.lo
-	$(LIBTOOL) --mode=link $(CXX) -module keyboard.lo scancodes.lo -o libbx_keyboard.la -rpath $(PLUGIN_PATH)
+	$(LIBTOOL) --mode=link $(CXX) -avoid-version -module keyboard.lo scancodes.lo -o libbx_keyboard.la -rpath $(PLUGIN_PATH)
 
 libbx_pit.la: pit.lo pit82c54.lo pit_wrap.lo
-	$(LIBTOOL) --mode=link $(CXX) -module pit.lo pit82c54.lo pit_wrap.lo -o libbx_pit.la -rpath $(PLUGIN_PATH)
+	$(LIBTOOL) --mode=link $(CXX) -avoid-version -module pit.lo pit82c54.lo pit_wrap.lo -o libbx_pit.la -rpath $(PLUGIN_PATH)
 
 libbx_sb16.la: sb16.lo $(SOUNDLOW_OBJS:.o=.lo)
-	$(LIBTOOL) --mode=link $(CXX) -module sb16.lo $(SOUNDLOW_OBJS:.o=.lo) -o libbx_sb16.la -rpath $(PLUGIN_PATH)
+	$(LIBTOOL) --mode=link $(CXX) -avoid-version -module sb16.lo $(SOUNDLOW_OBJS:.o=.lo) -o libbx_sb16.la -rpath $(PLUGIN_PATH)
 
 libbx_ne2k.la: ne2k.lo $(NETLOW_OBJS:.o=.lo)
-	$(LIBTOOL) --mode=link $(CXX) -module ne2k.lo $(NETLOW_OBJS:.o=.lo) -o libbx_ne2k.la -rpath $(PLUGIN_PATH)
+	$(LIBTOOL) --mode=link $(CXX) -avoid-version -module ne2k.lo $(NETLOW_OBJS:.o=.lo) -o libbx_ne2k.la -rpath $(PLUGIN_PATH)
 
 libbx_pcipnic.la: pcipnic.lo $(NETLOW_OBJS:.o=.lo)
-	$(LIBTOOL) --mode=link $(CXX) -module pcipnic.lo $(NETLOW_OBJS:.o=.lo) -o libbx_pcipnic.la -rpath $(PLUGIN_PATH)
+	$(LIBTOOL) --mode=link $(CXX) -avoid-version -module pcipnic.lo $(NETLOW_OBJS:.o=.lo) -o libbx_pcipnic.la -rpath $(PLUGIN_PATH)
 
 libbx_serial.la: serial.lo serial_raw.lo
-	$(LIBTOOL) --mode=link $(CXX) -module serial.lo serial_raw.lo -o libbx_serial.la -rpath $(PLUGIN_PATH)
+	$(LIBTOOL) --mode=link $(CXX) -avoid-version -module serial.lo serial_raw.lo -o libbx_serial.la -rpath $(PLUGIN_PATH)
 
 libbx_vga.la: vga.lo svga_cirrus.lo
-	$(LIBTOOL) --mode=link $(CXX) -module vga.lo svga_cirrus.lo -o libbx_vga.la -rpath $(PLUGIN_PATH)
+	$(LIBTOOL) --mode=link $(CXX) -avoid-version -module vga.lo svga_cirrus.lo -o libbx_vga.la -rpath $(PLUGIN_PATH)
 
 #### building DLLs for win32  (tested on cygwin only)
 bx_%.dll: %.o

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)