rpms/libapogee/F-9 import.log, NONE, 1.1 libapogee-suffix.patch, NONE, 1.1 libapogee-sysio.patch, NONE, 1.1 libapogee.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Sergio Pascual
sergiopr at fedoraproject.org
Sat Feb 14 13:37:29 UTC 2009
- Previous message: rpms/libapogee/F-10 import.log, NONE, 1.1 libapogee-suffix.patch, NONE, 1.1 libapogee-sysio.patch, NONE, 1.1 libapogee.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/openoffice.org/devel openoffice.org.spec,1.1798,1.1799
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: sergiopr
Update of /cvs/pkgs/rpms/libapogee/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27772/F-9
Modified Files:
.cvsignore sources
Added Files:
import.log libapogee-suffix.patch libapogee-sysio.patch
libapogee.spec
Log Message:
Import libapogee
--- NEW FILE import.log ---
libapogee-2_2-2_fc10:F-9:libapogee-2.2-2.fc10.src.rpm:1234618619
libapogee-suffix.patch:
--- NEW FILE libapogee-suffix.patch ---
diff -ur libapogee2-2.2.old/CMakeLists.txt libapogee2-2.2/CMakeLists.txt
--- libapogee2-2.2.old/CMakeLists.txt 2008-11-18 10:44:08.000000000 +0100
+++ libapogee2-2.2/CMakeLists.txt 2009-02-07 17:05:39.000000000 +0100
@@ -114,7 +114,7 @@
target_link_libraries(apogeeu ${LIBUSB_LIBRARIES})
-install(TARGETS apogeeu LIBRARY DESTINATION lib${LIB_POSTFIX} )
+install(TARGETS apogeeu LIBRARY DESTINATION lib${LIB_SUFFIX} )
########### libapogeeAltaE ###########
set(AltaE_SRCS
@@ -133,7 +133,7 @@
target_link_libraries(apogeee ${LIBUSB_LIBRARIES} ${CURL_LIBRARIES})
-install(TARGETS apogeee LIBRARY DESTINATION lib${LIB_POSTFIX} )
+install(TARGETS apogeee LIBRARY DESTINATION lib${LIB_SUFFIX} )
install( FILES libapogee.h DESTINATION ${INCLUDE_INSTALL_DIR}/libapogee COMPONENT Devel)
libapogee-sysio.patch:
--- NEW FILE libapogee-sysio.patch ---
diff -ur libapogee2-2.2/ApogeeUsb/ApogeeUsbLinux.cpp libapogee2-2.2.new/ApogeeUsb/ApogeeUsbLinux.cpp
--- libapogee2-2.2/ApogeeUsb/ApogeeUsbLinux.cpp 2008-11-18 10:44:08.000000000 +0100
+++ libapogee2-2.2.new/ApogeeUsb/ApogeeUsbLinux.cpp 2009-02-13 13:17:05.000000000 +0100
@@ -2,11 +2,11 @@
//
#include <assert.h>
-#ifndef OSX
+/*#ifndef OSX
#ifndef OSXI
#include <sys/io.h>
#endif
-#endif
+#endif*/
#include <sys/time.h>
#include <sys/resource.h>
#include <sys/ioctl.h>
diff -ur libapogee2-2.2/ApogeeUsb/ApogeeUsbLinuxForKernel.cpp libapogee2-2.2.new/ApogeeUsb/ApogeeUsbLinuxForKernel.cpp
--- libapogee2-2.2/ApogeeUsb/ApogeeUsbLinuxForKernel.cpp 2008-11-18 10:44:08.000000000 +0100
+++ libapogee2-2.2.new/ApogeeUsb/ApogeeUsbLinuxForKernel.cpp 2009-02-13 13:16:08.000000000 +0100
@@ -2,7 +2,7 @@
//
#include <assert.h>
-#include <sys/io.h>
+/* #include <sys/io.h> */
#include <sys/time.h>
#include <sys/resource.h>
#include <sys/ioctl.h>
diff -ur libapogee2-2.2/CameraIO_Linux.cpp libapogee2-2.2.new/CameraIO_Linux.cpp
--- libapogee2-2.2/CameraIO_Linux.cpp 2008-11-18 10:44:08.000000000 +0100
+++ libapogee2-2.2.new/CameraIO_Linux.cpp 2009-02-13 13:17:33.000000000 +0100
@@ -7,7 +7,7 @@
#include "stdafx.h"
#else
#include <assert.h>
-#include <sys/io.h>
+/*#include <sys/io.h> */
#include <sys/time.h>
#include <sys/resource.h>
#include <sys/ioctl.h>
diff -ur libapogee2-2.2/CameraIO_LinuxISA.cpp libapogee2-2.2.new/CameraIO_LinuxISA.cpp
--- libapogee2-2.2/CameraIO_LinuxISA.cpp 2008-11-18 10:44:08.000000000 +0100
+++ libapogee2-2.2.new/CameraIO_LinuxISA.cpp 2009-02-13 13:17:52.000000000 +0100
@@ -7,7 +7,7 @@
#include "stdafx.h"
#else
#include <assert.h>
-#include <sys/io.h>
+/*#include <sys/io.h> */
#include <sys/time.h>
#include <sys/resource.h>
#include <sys/ioctl.h>
diff -ur libapogee2-2.2/CameraIO_LinuxPCI.cpp libapogee2-2.2.new/CameraIO_LinuxPCI.cpp
--- libapogee2-2.2/CameraIO_LinuxPCI.cpp 2008-11-18 10:44:08.000000000 +0100
+++ libapogee2-2.2.new/CameraIO_LinuxPCI.cpp 2009-02-13 13:18:11.000000000 +0100
@@ -7,7 +7,7 @@
#include "stdafx.h"
#else
#include <assert.h>
-#include <sys/io.h>
+/*#include <sys/io.h>*/
#include <sys/time.h>
#include <sys/resource.h>
#include <sys/ioctl.h>
diff -ur libapogee2-2.2/CameraIO_LinuxPPI.cpp libapogee2-2.2.new/CameraIO_LinuxPPI.cpp
--- libapogee2-2.2/CameraIO_LinuxPPI.cpp 2008-11-18 10:44:08.000000000 +0100
+++ libapogee2-2.2.new/CameraIO_LinuxPPI.cpp 2009-02-13 13:18:27.000000000 +0100
@@ -7,7 +7,7 @@
#include "stdafx.h"
#else
#include <assert.h>
-#include <sys/io.h>
+/*#include <sys/io.h>*/
#include <sys/time.h>
#include <sys/resource.h>
#include <sys/ioctl.h>
--- NEW FILE libapogee.spec ---
Name: libapogee
Version: 2.2
Release: 2%{?dist}
Summary: Library for Apogee CCD Cameras
%define majorver 2
Group: Development/Libraries
License: GPLv2+
URL: http://indi.sourceforge.net/index.php
Source0: http://downloads.sourceforge.net/indi/%{name}%{majorver}_%{version}.tar.gz
Patch0: libapogee-suffix.patch
# Patch to build in ppc ppc64
#https://sourceforge.net/tracker2/?func=detail&aid=2215787&group_id=90275&atid=593019
Patch1: libapogee-sysio.patch
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
# Bug upstream about libapogee calling exit()
# https://sourceforge.net/tracker2/?func=detail&aid=2595732&group_id=90275&atid=593019
BuildRequires: cmake libusb-devel libcurl-devel
%description
Apogee library is used by applications to control Apogee CCDs.
%package devel
Summary: Libraries, includes, etc. used to develop an application with %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
These are the header files needed to develop a %{name} application
%prep
%setup -q -n %{name}%{majorver}-%{version}
%patch0 -p1
%patch1 -p1
%build
%cmake
make VERBOSE=1 %{?_smp_mflags}
%install
rm -fr %{buildroot}
make install DESTDIR=%{buildroot}
%clean
rm -fr %{buildroot}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog README LICENSE
%{_libdir}/*.so.*
%files devel
%defattr(-,root,root,-)
%doc LICENSE
%{_includedir}/*
%{_libdir}/*.so
%changelog
* Fri Feb 13 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 2.2-2
- Fixing license tag
- Patch to remove sys/io.h
- Bug filled upstream about calling exit()
* Sat Feb 07 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 2.2-1
- Initial spec file
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libapogee/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 14 Feb 2009 00:40:59 -0000 1.1
+++ .cvsignore 14 Feb 2009 13:37:28 -0000 1.2
@@ -0,0 +1 @@
+libapogee2_2.2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libapogee/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 14 Feb 2009 00:40:59 -0000 1.1
+++ sources 14 Feb 2009 13:37:28 -0000 1.2
@@ -0,0 +1 @@
+9f5c3ddfa44bc6d83e72c1509110cab4 libapogee2_2.2.tar.gz
- Previous message: rpms/libapogee/F-10 import.log, NONE, 1.1 libapogee-suffix.patch, NONE, 1.1 libapogee-sysio.patch, NONE, 1.1 libapogee.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/openoffice.org/devel openoffice.org.spec,1.1798,1.1799
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list