commit pcsc-acr38

31 May 2007

Hello community,

here is the log from the commit of package pcsc-acr38
checked in at Thu May 31 21:09:14 CEST 2007.

--------

--- pcsc-acr38/pcsc-acr38.changes	2007-05-25 11:53:29.000000000 +0200
+++ /mounts/work_src_done/STABLE/pcsc-acr38/pcsc-acr38.changes	2007-05-31 13:10:16.000000000 +0200
@@ -1,0 +2,7 @@
+Thu May 31 13:09:39 CEST 2007 - sbrabec@suse.cz
+
+- Fixed module path.
+- Removed broken patch changing PCSCLITE_USB_PATH to /dev/bus/usb.
+  (#259973).
+
+-------------------------------------------------------------------

Old:
----
  ACR38_LINUX_100705_P-usb.diff

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

Other differences:
------------------
++++++ pcsc-acr38.spec ++++++
--- /var/tmp/diff_new_pack.I14084/_old	2007-05-31 21:09:07.000000000 +0200
+++ /var/tmp/diff_new_pack.I14084/_new	2007-05-31 21:09:07.000000000 +0200
@@ -13,16 +13,15 @@
 Name:           pcsc-acr38
 BuildRequires:  pcsc-lite-devel pkg-config
 Version:        1.7.9
-Release:        1
+Release:        3
 %define _version 100709_P
 Provides:       locale(MozillaFirefox:de_BE;en_BE;fr_BE;nl_BE;wa_BE)
 Group:          System/Libraries
-License:        GNU General Public License (GPL)
+License:        GNU General Public License (GPL), individual distribution permission.
 URL:            http://www.linuxnet.com/
 Summary:        PC/SC IFD Handler for the ACR38 Smart Card Reader
 Source0:        ACR38_LINUX_%{_version}.tar.bz2
 Patch1:         ACR38_LINUX_100705_P-ucread.diff
-Patch2:         ACR38_LINUX_100705_P-usb.diff
 Patch3:         ACR38_LINUX_100709-automake-cleanup.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define ifddir %(pkg-config libpcsclite --variable=usbdropdir)
@@ -58,8 +57,8 @@
 
 %prep
 %setup -q -n ACR38_LINUX_%{_version}
+mv src/driver/Info.plist src/driver/Info.plist.in
 %patch1
-%patch2
 %patch3
 
 %build
@@ -95,6 +94,10 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu May 31 2007 - sbrabec@suse.cz
+- Fixed module path.
+- Removed broken patch changing PCSCLITE_USB_PATH to /dev/bus/usb.
+  (#259973).
 * Fri May 25 2007 - sbrabec@suse.cz
 - Updated to version 1.7.9:
   * Fixed an error in the target location of libacr38ucontrol.pc

++++++ ACR38_LINUX_100709-automake-cleanup.patch ++++++
--- /var/tmp/diff_new_pack.I14084/_old	2007-05-31 21:09:07.000000000 +0200
+++ /var/tmp/diff_new_pack.I14084/_new	2007-05-31 21:09:07.000000000 +0200
@@ -1,3 +1,11 @@
+--- Makefile.am
++++ Makefile.am
+@@ -6,3 +6,5 @@
+ 
+ # -- Top-level Makefile.am --
+ SUBDIRS = src/controllib src/driver
++
++DISTCHECK_CONFIGURE_FLAGS = --enable-usbdropdir=$$dc_install_base/pcsc/drivers
 --- configure.ac
 +++ configure.ac
 @@ -2,7 +2,7 @@
@@ -95,6 +103,15 @@
  # Select OS specific versions of source files.
  AC_SUBST(BUNDLE_HOST)
  AC_SUBST(DYN_LIB_EXT)
+@@ -205,6 +151,7 @@
+ AC_CONFIG_FILES([Makefile
+                  src/driver/Makefile
+                  src/controllib/Makefile
+-                 src/controllib/libacr38ucontrol.pc])
++                 src/controllib/libacr38ucontrol.pc
++                 src/driver/Info.plist])
+ 
+ AC_OUTPUT
 --- src/controllib/Makefile.am
 +++ src/controllib/Makefile.am
 @@ -4,9 +4,7 @@
@@ -119,9 +136,20 @@
 -pc_DATA = libacr38ucontrol.pc
 +pkgconfigdir= $(libdir)/pkgconfig
 +pkgconfig_DATA = libacr38ucontrol.pc
+--- src/driver/Info.plist.in
++++ src/driver/Info.plist.in
+@@ -5,7 +5,7 @@
+ 	<key>CFBundleDevelopmentRegion</key>
+ 	<string>English</string>
+ 	<key>CFBundleExecutable</key>
+-	<string>ACR38UDriver</string>
++	<string>ACR38UDriver.@DYN_LIB_EXT@</string>
+ 	<key>CFBundleInfoDictionaryVersion</key>
+ 	<string>6.0</string>
+ 	<key>CFBundlePackageType</key>
 --- src/driver/Makefile.am
 +++ src/driver/Makefile.am
-@@ -5,15 +5,18 @@
+@@ -5,15 +5,16 @@
  # Process this file with automake to produce a Makefile.in script.
  
  DRIVER_NAME = ACR38UDriver
@@ -132,19 +160,18 @@
 -AM_CPPFLAGS = `pkg-config libpcsclite --cflags`
 +driverdir=$(usbdropdir)/$(DRIVER_BUNDLE_DIR)/Contents/$(BUNDLE_HOST)
  
- EXTRA_DIST = Info.plist
+-EXTRA_DIST = Info.plist
++AM_CPPFLAGS = $(PCSCLITE_CFLAGS)
  
 -lib_LTLIBRARIES = libACR38UDriver.la
-+AM_CPPFLAGS = $(PCSCLITE_CFLAGS)
-+
 +plistdir=$(usbdropdir)/$(DRIVER_BUNDLE_DIR)/Contents
 +plist_DATA=Info.plist
 +
-+driver_LTLIBRARIES = libACR38UDriver.la
++driver_LTLIBRARIES = ACR38UDriver.la
  
  SRC_DRV = ACR38IOCtrl.h		\
  		AdmHndlr.c			\
-@@ -21,6 +24,7 @@
+@@ -21,6 +22,7 @@
  		ctapi.h				\
  		MCU_ATR.c			\
  		SysConfig.c			\
@@ -152,10 +179,11 @@
  		usbserial_linux.c	\
  		usbserial_linux.h	\
  		AdmHndlr.h			\
-@@ -38,13 +42,4 @@
+@@ -37,14 +39,6 @@
+ SRC_USB = usblinux.c		\
  		usblinux.h
  
- libACR38UDriver_la_SOURCES = $(SRC_DRV) $(SRC_USB)
+-libACR38UDriver_la_SOURCES = $(SRC_DRV) $(SRC_USB)
 -libACR38UDriver_la_LIBADD = @LIBPCSCLITE@ @COREFOUNDATION@ @IOKIT@
 -
 -install: libACR38UDriver.la
@@ -166,4 +194,6 @@
 -
 -uninstall:
 -	rm -rf $(usbdropdir)/$(DRIVER_BUNDLE_DIR)
-+libACR38UDriver_la_LIBADD = $(PCSCLITE_LIBS) $(COREFOUNDATION) $(IOKIT)
++ACR38UDriver_la_SOURCES = $(SRC_DRV) $(SRC_USB)
++ACR38UDriver_la_LIBADD = $(PCSCLITE_LIBS) $(COREFOUNDATION) $(IOKIT)
++ACR38UDriver_la_LDFLAGS = -module -avoid-version


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



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)