Hello community,
here is the log from the commit of package sbig_x86_64
checked in at Wed Apr 9 00:52:31 CEST 2008.
--------
--- arch/x86_64/sbig_x86_64/sbig_x86_64.changes 2007-07-23 10:01:34.000000000 +0200
+++ sbig_x86_64/sbig_x86_64.changes 2008-04-08 16:10:12.000000000 +0200
@@ -1,0 +2,12 @@
+Tue Apr 8 16:06:43 CEST 2008 - lmichnovic@suse.cz
+
+- update to latest version 20080304
+ * support for more cameras
+ * cfitsio library support is disabled
+ * needs fxload
+ * new udev rules file 50-usb-serial.rules
+- removed cfitsio-devel from BuildReq
+- added Requires on fxload and sbig-firmware packages
+- calling ldconfig in %post, %postun
+
+-------------------------------------------------------------------
Old:
----
sbig_x86_64-directory.patch
sbig_x86_64_linux_2.6_I86_64.tar.gz
New:
----
sbig_linux_release_64bit.tar.bz2
sbig_x86_64-declaration.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sbig_x86_64.spec ++++++
--- /var/tmp/diff_new_pack.i13164/_old 2008-04-09 00:52:14.000000000 +0200
+++ /var/tmp/diff_new_pack.i13164/_new 2008-04-09 00:52:14.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package sbig_x86_64 (Version 1.2)
+# spec file for package sbig_x86_64 (Version 1.3)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -9,26 +9,27 @@
#
+
Name: sbig_x86_64
-BuildRequires: gcc-c++ libcfitsio-devel libusb-devel
-License: LGPL v2 or later, Other uncritical OpenSource License, individual distribution permission.
+BuildRequires: gcc-c++ libusb-devel
+License: Other uncritical OpenSource License
Group: Hardware/Other
-Autoreqprov: on
-Version: 1.2
-Release: 2
-Source: sbig_x86_64_linux_2.6_I86_64.tar.gz
+AutoReqProv: on
+Version: 1.3
+Release: 1
+Source: sbig_linux_release_64bit.tar.bz2
Source1: LICENSE.txt
-URL: http://www.sbig.com
-Patch: %{name}-directory.patch
+Url: http://www.sbig.com
Patch1: %{name}-makefile.patch
-Enhances: sbig-firmware
+Patch2: %{name}-declaration.patch
+Requires: sbig-firmware fxload
ExclusiveArch: x86_64
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Summary: Non kernel shared library for USB SBIG CCD cameras for x86_64 arch
+Summary: Non Kernel Shared Library for USB SBIG CCD Cameras for x86_64 Arch
%description
-Non kernel shared library compiled for x86_64 architecture for USB SBIG
-CCD cameras.
+Non kernel shared library compiled for an x86_64 architecture for USB
+SBIG CCD cameras.
@@ -37,13 +38,12 @@
Jan Soldan
%prep
-%setup -n sbig_linux_2.6_I86_64
-%patch
+%setup -n sbig_linux_release_64bit
%patch1
-rm testapp/testapp
+%patch2
%build
-cd testapp
+cd app
make
%install
@@ -53,17 +53,22 @@
mkdir -p $RPM_BUILD_ROOT/usr/%{_lib}
mkdir -p $RPM_BUILD_ROOT/usr/bin
cp -a %{S:1} $RPM_BUILD_ROOT/usr/share/doc/packages/sbig/
-cd testapp
-cp -a Makefile README.txt *.h *.cpp $RPM_BUILD_ROOT/usr/share/doc/packages/sbig/
+cd app
+cp -a Makefile *.h *.cpp $RPM_BUILD_ROOT/usr/share/doc/packages/sbig/
cp -a testapp $RPM_BUILD_ROOT/usr/bin/sbig_testapp
-cd ../install
+cd ../drv
cp -a 10-sbig.rules $RPM_BUILD_ROOT/etc/udev/rules.d/10-sbig.rules
+cp -a 50-usb-serial.rules $RPM_BUILD_ROOT/etc/udev/rules.d/50-usb-serial.rules
cp -a sbig_dev_permission.py $RPM_BUILD_ROOT/%{_lib}/sbig_dev_permission.py
cp -a *.so *.a $RPM_BUILD_ROOT/usr/%{_lib}/
%clean
rm -rf $RPM_BUILD_ROOT
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
%files
%defattr(-, root, root)
%dir /etc/udev
@@ -75,13 +80,23 @@
%attr(755, root, root) /usr/bin/sbig_testapp
%attr(755, root, root) /%{_lib}/sbig_dev_permission.py
/etc/udev/rules.d/10-sbig.rules
+/etc/udev/rules.d/50-usb-serial.rules
%changelog
-* Mon Jul 23 2007 - lmichnovic@suse.cz
+* Tue Apr 08 2008 lmichnovic@suse.cz
+- update to latest version 20080304
+ * support for more cameras
+ * cfitsio library support is disabled
+ * needs fxload
+ * new udev rules file 50-usb-serial.rules
+- removed cfitsio-devel from BuildReq
+- added Requires on fxload and sbig-firmware packages
+- calling ldconfig in %%post, %%postun
+* Mon Jul 23 2007 lmichnovic@suse.cz
- fixed Buildrequires
-* Wed Jul 18 2007 - lmichnovic@suse.cz
+* Wed Jul 18 2007 lmichnovic@suse.cz
- adjusted include dir of cfitsio lib in *makefile.patch
-* Tue Jul 17 2007 - lmichnovic@suse.cz
+* Tue Jul 17 2007 lmichnovic@suse.cz
- new package for x86_64 arch.
- Build requires cfitsio library; package libcfitsio0-devel
- fixed Makefile for testapp (*makefile.patch)
++++++ sbig_x86_64-declaration.patch ++++++
--- app/csbigcam.cpp
+++ app/csbigcam.cpp
@@ -37,6 +37,7 @@
#include "csbigimg.h"
#include <string>
#include
+#include
using namespace std;
++++++ sbig_x86_64-makefile.patch ++++++
--- /var/tmp/diff_new_pack.i13164/_old 2008-04-09 00:52:15.000000000 +0200
+++ /var/tmp/diff_new_pack.i13164/_new 2008-04-09 00:52:15.000000000 +0200
@@ -1,15 +1,31 @@
---- testapp/Makefile
-+++ testapp/Makefile
-@@ -15,9 +15,9 @@
+--- app/Makefile
++++ app/Makefile
+@@ -6,7 +6,7 @@
+ # 1) change directory to 'sbig'
+ # 2) make
+ # Note: Linker uses shared libraries and do not forget to put
+-# *.so libraries to the /usr/local/lib directory and
++# *.so libraries to the /usr/lib64 directory and
+ # setenv LD_LIBRARY_PATH to this path. See README.txt for details.
####################################################################################
+ APP_NAME = testapp
+@@ -16,8 +16,8 @@
APP_SRC = $(S_APP)
APP_OBJ = $(O_APP)
--INCLUDE = -I .
--LIBRARY = -L .
--APP_CFLAGS = -O2 $(INCLUDE) $(LIBRARY) -Wall
-+INCLUDE = -I . -I /usr/include/libcfitsio0
-+LIBRARY = -L../install -L/usr/lib
-+APP_CFLAGS = -O2 $(RPM_OPT_FLAGS) $(INCLUDE) $(LIBRARY) -Wall
+ INCLUDE = -I .
+-LIBRARY = -L /usr/local/lib
+-APP_CFLAGS = -O2 $(INCLUDE) $(LIBRARY) -Wall
++LIBRARY = -L../drv -L/usr/lib64
++APP_CFLAGS = -O2 $(RPM_OPT_FLAGS) $(INCLUDE) $(LIBRARY) -Wall
APP_CC = g++
####################################################################################
all: $(APP_NAME)
+@@ -26,7 +26,7 @@
+ ####################################################################################
+ $(APP_NAME): $(APP_OBJ)
+ # $(APP_CC) $(APP_CFLAGS) -o $(APP_NAME) $(APP_OBJ) -lsbigudrv -lcfitsio -lm
+- $(APP_CC) $(APP_CFLAGS) -o $(APP_NAME) $(APP_OBJ) -lsbigudrv -lm
++ $(APP_CC) $(APP_CFLAGS) -o $(APP_NAME) $(APP_OBJ) -lsbigudrv64 -lm
+ chmod a+x $(APP_NAME)
+
+ testmain.o : testmain.cpp csbigcam.h csbigimg.h
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
