scm-commits June 2014

scm-commits@lists.fedoraproject.org

462 participants
35398 discussions

[python-weberror] Replace python-setuptools-devel BR with python-setuptools
by Toshio くらとみ 01 Jul '14

01 Jul '14

commit e338d48c516a6c3f6e1680913b64bb726f7bacee Author: Toshio Kuratomi <toshio(a)fedoraproject.org> Date: Mon Jun 30 16:59:19 2014 -0700 Replace python-setuptools-devel BR with python-setuptools python-weberror.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) --- diff --git a/python-weberror.spec b/python-weberror.spec index 5209d48..9edc0d9 100644 --- a/python-weberror.spec +++ b/python-weberror.spec @@ -4,7 +4,7 @@ Name: python-weberror Version: 0.10.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Web Error handling and exception catching middleware Group: Development/Languages @@ -18,7 +18,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch BuildRequires: python2-devel -BuildRequires: python-setuptools-devel +BuildRequires: python-setuptools BuildRequires: python-nose BuildRequires: python-webob BuildRequires: python-webtest @@ -66,6 +66,9 @@ nosetests %changelog +* Mon Jun 30 2014 Toshio Kuratomi <toshio(a)fedoraproject.org> - 0.10.3-8 +- Replace python-setuptools-devel BR with python-setuptools + * Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.10.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

1 0

[vfrnav] try to get libftdi1 work with vfrnav
by sailer 01 Jul '14

01 Jul '14

commit 10390b105a1bb53c4e30ae2cff1a26a33a2660b9 Author: Thomas Sailer <t.sailer(a)alumni.ethz.ch> Date: Tue Jul 1 01:54:19 2014 +0200 try to get libftdi1 work with vfrnav ftdiconfig.patch | 295 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ vfrnav.spec | 5 + 2 files changed, 300 insertions(+), 0 deletions(-) --- diff --git a/ftdiconfig.patch b/ftdiconfig.patch new file mode 100644 index 0000000..105af0c --- /dev/null +++ b/ftdiconfig.patch @@ -0,0 +1,295 @@ +diff --git a/configure.ac b/configure.ac +index 7434c43..f543ce3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -116,11 +116,11 @@ PKG_CHECK_MODULES([UDEV], [libudev], [have_udev=yes], [have_udev=no]) + PKG_CHECK_MODULES([HIDAPI], [hidapi], [have_hidapi=yes], [have_hidapi=no]) + PKG_CHECK_MODULES([GSL], [gsl], [have_gsl=yes], [have_gsl=no]) + PKG_CHECK_MODULES([LIBUSB1], [libusb-1.0], [have_libusb1=yes], [have_libusb1=no]) +-PKG_CHECK_MODULES([FTDI], [libftdi >= 0.18], [have_ftdi=libftdi], [AC_CHECK_HEADERS([ftdi/ftd2xx.h], [have_ftdi=d2xx], [have_ftdi=no], ++PKG_CHECK_MODULES([FTDI], [libftdi1 >= 1.0], [have_ftdi=libftdi1], [PKG_CHECK_MODULES([FTDI], [libftdi >= 0.18], [have_ftdi=libftdi], [AC_CHECK_HEADERS([ftdi/ftd2xx.h], [have_ftdi=d2xx], [have_ftdi=no], + [[#ifdef HAVE_WINDOWS_H + # include <windows.h> + #endif +-]])]) ++]])])]) + #dnl PKG_CHECK_MODULES([POPPLER], [poppler], [have_poppler=yes], [have_poppler=no]) + PKG_CHECK_MODULES([CURL], [libcurl >= 7.0.0], [have_curl=yes], [have_curl=no]) + PKG_CHECK_MODULES([OPENJPEG], [libopenjpeg], [have_openjpeg=yes], [have_openjpeg=no]) +@@ -573,7 +573,7 @@ fi + + AM_CONDITIONAL(HAVE_LIBUSB1, test x$have_libusb1 = xyes) + +-if test "x${have_ftdi}" = "xlibftdi" -o "x${have_ftdi}" = "xd2xx"; then ++if test "x${have_ftdi}" = "xlibftdi" -o "x${have_ftdi}" = "xlibftdi1" -o "x${have_ftdi}" = "xd2xx"; then + AC_DEFINE(HAVE_FTDI,[],[either libftdi or d2xx FTDI chip access library]) + fi + +@@ -581,11 +581,15 @@ if test "x${have_ftdi}" = "xlibftdi"; then + AC_DEFINE(HAVE_LIBFTDI, [], [whether we have libftdi]) + fi + ++if test "x${have_ftdi}" = "xlibftdi1"; then ++ AC_DEFINE(HAVE_LIBFTDI1, [], [whether we have libftdi1]) ++fi ++ + if test "x${have_ftdi}" = "xd2xx"; then + AC_DEFINE(HAVE_FTDID2XX, [], [whether we have FTDI D2XX Library]) + fi + +-AM_CONDITIONAL(HAVE_FTDI, test x$have_ftdi = xlibftdi -o x$have_ftdi = xd2xx) ++AM_CONDITIONAL(HAVE_FTDI, test x$have_ftdi = xlibftdi -o x$have_ftdi = xlibftdi1 -o x$have_ftdi = xd2xx) + + if test "x${have_poppler}" = "xyes"; then + AC_DEFINE(HAVE_POPPLER,[],[poppler library]) +diff --git a/flightdeck/Makefile.am b/flightdeck/Makefile.am +index a0a7aec..c659a03 100644 +--- a/flightdeck/Makefile.am ++++ b/flightdeck/Makefile.am +@@ -12,7 +12,7 @@ flightdeck_SOURCES = flightdeck.cc flightdeckwindow.cc splash.cc gyroinst.cc alt + fplgpsimppage.cc keyboarddlg.cc coorddlg.cc suspenddlg.cc docpage.cc srsspage.cc perfpage.cc logpage.cc \ + grib2page.cc fplatmodlg.cc fplverifdlg.cc fplautoroutedlg.cc nwxchartdlg.cc routeprofile.cc svgimage.cc \ + senscfg.cc sensors.cc sensnav.cc sensgps.cc senscfgmagcalib.cc senscfggps.cc sensgpsking.cc sensgpsking.h \ +- sensgpskingtty.cc sensgpskingtty.h sensgpsnmea.cc sensgpsnmea.h sensms5534.cc sensms5534.h \ ++ sensgpskingtty.cc sensgpskingtty.h sensgpsnmea.cc sensgpsnmea.h \ + sensadsb.cc sensadsb.h sensrtladsb.cc sensrtladsb.h sensremoteadsb.cc sensremoteadsb.h + flightdeck_LDADD = ../cfmu/libcfmuautoroute.a ../src/libvfrnav.la @LIBS@ @GTKMM_LIBS@ @GLIBMM_LIBS@ @GIOMM_LIBS@ \ + @EVINCE_LIBS@ @GPS_LIBS@ @LOCATION_LIBS@ @GYPSY_LIBS@ @SQLITE3X_LIBS@ @GTHREAD_LIBS@ \ +@@ -24,7 +24,8 @@ flightdeck_LDFLAGS = @BOOST_LDFLAGS@ @GEOS_LDFLAGS@ @CLIPPER_LDFLAGS@ + EXTRA_flightdeck_SOURCES = flightdeckrc.rc sensattitude.h sensattitude.cc ahrs.h ahrs.cc sensattpsmove.h sensattpsmove.cc \ + sensattpsmovebt.h sensattpsmovebt.cc sensattpsmovehid.h sensattpsmovehid.cc \ + sensgpsd.h sensgpsd.cc sensgypsy.h sensgypsy.cc senslibloc.h senslibloc.cc sensgeoclue.h sensgeoclue.cc \ +- sensgpskingftdi.h sensgpskingftdi.cc win/sensors.h win/sensorspk.cc senswingps.h senswingps.cc \ ++ sensgpskingftdi.h sensgpskingftdi.cc sensms5534.cc sensms5534.h \ ++ win/sensors.h win/sensorspk.cc senswingps.h senswingps.cc \ + senswinbaro.h senswinbaro.cc senswinatt.h senswinatt.cc sensattiio.h sensattiio.cc sensattstmhub.h sensattstmhub.cc + + if WIN32 +@@ -64,7 +65,7 @@ flightdeck_SOURCES += sensgeoclue.h sensgeoclue.cc + endif + + if HAVE_FTDI +-flightdeck_SOURCES += sensgpskingftdi.h sensgpskingftdi.cc ++flightdeck_SOURCES += sensgpskingftdi.h sensgpskingftdi.cc sensms5534.cc sensms5534.h + bin_PROGRAMS += flightdeckftdieeprog + flightdeckftdieeprog_SOURCES = ftdieeprog.cc + flightdeckftdieeprog_LDADD = @GLIBMM_LIBS@ @FTDI_LIBS@ +diff --git a/flightdeck/ftdieeprog.cc b/flightdeck/ftdieeprog.cc +index 96a1d42..462a204 100644 +--- a/flightdeck/ftdieeprog.cc ++++ b/flightdeck/ftdieeprog.cc +@@ -13,7 +13,7 @@ + + #include <glibmm.h> + +-#ifdef HAVE_LIBFTDI ++#if defined(HAVE_LIBFTDI) || defined(HAVE_LIBFTDI1) + #include <ftdi.h> + #elif WIN32 + #include <windows.h> +@@ -51,7 +51,7 @@ Original EEPROM Contents: + + */ + +-#ifdef HAVE_LIBFTDI ++#if defined(HAVE_LIBFTDI) + + class FtdiProg { + public: +@@ -202,6 +202,196 @@ std::vector<uint8_t> FtdiDump::dump(void) + return r; + } + ++#elif defined(HAVE_LIBFTDI1) ++ ++class FtdiProg { ++public: ++ FtdiProg(void); ++ ~FtdiProg(); ++ void program_all(const char *manufacturer, const char *product, const char *serial, bool force); ++ ++protected: ++ struct ftdi_context m_ctx; ++ struct ftdi_device_list *m_devlist; ++ bool m_init; ++ ++ void chk(int r, const std::string& n); ++}; ++ ++FtdiProg::FtdiProg(void) ++ : m_devlist(0), m_init(false) ++{ ++ if (ftdi_init(&m_ctx) < 0) ++ throw std::runtime_error("ftdi_init failed"); ++ m_init = true; ++ if (ftdi_usb_find_all(&m_ctx, &m_devlist, vendor_id, device_id) < 0) ++ throw std::runtime_error("ftdi_usb_find_all failed"); ++} ++ ++FtdiProg::~FtdiProg() ++{ ++ if (m_devlist) ++ ftdi_list_free(&m_devlist); ++ m_devlist = 0; ++ if (m_init) ++ ftdi_deinit(&m_ctx); ++ m_init = false; ++} ++ ++void FtdiProg::chk(int r, const std::string& n) ++{ ++ if (r >= 0) ++ return; ++ std::ostringstream oss; ++ oss << n << " failed (" << r << ", " << ftdi_get_error_string(&m_ctx) << ")"; ++ throw std::runtime_error(oss.str()); ++} ++ ++void FtdiProg::program_all(const char *manufacturer, const char *product, const char *serial, bool force) ++{ ++ if (!serial) ++ serial = dev_serial; ++ for (struct ftdi_device_list *dev(m_devlist); dev; dev = dev->next) { ++ struct usb_device *udev(dev->dev); ++ if (!udev) ++ continue; ++ char mfg[128], desc[128], ser[128]; ++ mfg[0] = desc[0] = ser[0] = 0; ++ if (ftdi_usb_get_strings(&m_ctx, udev, mfg, sizeof mfg, desc, sizeof desc, ser, sizeof ser) && !force) ++ continue; ++ mfg[sizeof(mfg)-1] = 0; ++ desc[sizeof(desc)-1] = 0; ++ ser[sizeof(ser)-1] = 0; ++ if (!force && (std::string(mfg) != dev_orig_manufacturer || std::string(desc) != dev_orig_product)) { ++ std::cout << "Skipping Adapter: MFG \"" << mfg << "\" Desc \"" ++ << desc << "\" Serial \"" << ser << "\"" << std::endl; ++ continue; ++ } ++ if (ftdi_usb_open_dev(&m_ctx, udev) < 0) ++ continue; ++ std::cout << "Reprogramming Adapter: MFG \"" << mfg << "\" Desc \"" ++ << desc << "\" Serial \"" << ser << "\"" << std::endl; ++ ftdi_eeprom_initdefaults(&m_ctx, manufacturer, product, serial); ++ chk(ftdi_set_eeprom_value(&m_ctx, VENDOR_ID, vendor_id), "ftdi_set_eeprom_value: VENDOR_ID"); ++ chk(ftdi_set_eeprom_value(&m_ctx, PRODUCT_ID, device_id), "ftdi_set_eeprom_value: PRODUCT_ID"); ++ chk(ftdi_set_eeprom_value(&m_ctx, SELF_POWERED, 0), "ftdi_set_eeprom_value: SELF_POWERED"); ++ chk(ftdi_set_eeprom_value(&m_ctx, REMOTE_WAKEUP, 0), "ftdi_set_eeprom_value: REMOTE_WAKEUP"); ++ chk(ftdi_set_eeprom_value(&m_ctx, IN_IS_ISOCHRONOUS, 0), "ftdi_set_eeprom_value: IN_IS_ISOCHRONOUS"); ++ chk(ftdi_set_eeprom_value(&m_ctx, OUT_IS_ISOCHRONOUS, 0), "ftdi_set_eeprom_value: OUT_IS_ISOCHRONOUS"); ++ chk(ftdi_set_eeprom_value(&m_ctx, SUSPEND_PULL_DOWNS, 0), "ftdi_set_eeprom_value: SUSPEND_PULL_DOWNS"); ++ chk(ftdi_set_eeprom_value(&m_ctx, USE_SERIAL, 1), "ftdi_set_eeprom_value: USE_SERIAL"); ++ chk(ftdi_set_eeprom_value(&m_ctx, USE_USB_VERSION, 0), "ftdi_set_eeprom_value: USE_USB_VERSION"); ++ chk(ftdi_set_eeprom_value(&m_ctx, USB_VERSION, 0x0200), "ftdi_set_eeprom_value: USB_VERSION"); ++ chk(ftdi_set_eeprom_value(&m_ctx, MAX_POWER, 50), "ftdi_set_eeprom_value: MAX_POWER"); ++ chk(ftdi_set_eeprom_value(&m_ctx, CBUS_FUNCTION_0, CBUS_IOMODE), "ftdi_set_eeprom_value: CBUS_FUNCTION_0"); ++ chk(ftdi_set_eeprom_value(&m_ctx, CBUS_FUNCTION_1, CBUS_IOMODE), "ftdi_set_eeprom_value: CBUS_FUNCTION_1"); ++ chk(ftdi_set_eeprom_value(&m_ctx, CBUS_FUNCTION_2, CBUS_IOMODE), "ftdi_set_eeprom_value: CBUS_FUNCTION_2"); ++ chk(ftdi_set_eeprom_value(&m_ctx, CBUS_FUNCTION_3, CBUS_IOMODE), "ftdi_set_eeprom_value: CBUS_FUNCTION_3"); ++ chk(ftdi_set_eeprom_value(&m_ctx, CBUS_FUNCTION_4, CBUS_SLEEP), "ftdi_set_eeprom_value: CBUS_FUNCTION_4"); ++ chk(ftdi_set_eeprom_value(&m_ctx, CHIP_TYPE, TYPE_R), "ftdi_set_eeprom_value: CHIP_TYPE"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, CHIP_SIZE, FTDI_DEFAULT_EEPROM_SIZE), "ftdi_set_eeprom_value: CHIP_SIZE"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, IS_NOT_PNP, ), "ftdi_set_eeprom_value: IS_NOT_PNP"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, SUSPEND_DBUS7, ), "ftdi_set_eeprom_value: SUSPEND_DBUS7"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, CHANNEL_A_TYPE, ), "ftdi_set_eeprom_value: CHANNEL_A_TYPE"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, CHANNEL_B_TYPE, ), "ftdi_set_eeprom_value: CHANNEL_B_TYPE"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, CHANNEL_A_DRIVER, ), "ftdi_set_eeprom_value: CHANNEL_A_DRIVER"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, CHANNEL_B_DRIVER, ), "ftdi_set_eeprom_value: CHANNEL_B_DRIVER"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, CBUS_FUNCTION_5, ), "ftdi_set_eeprom_value: CBUS_FUNCTION_5"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, CBUS_FUNCTION_6, ), "ftdi_set_eeprom_value: CBUS_FUNCTION_6"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, CBUS_FUNCTION_7, ), "ftdi_set_eeprom_value: CBUS_FUNCTION_7"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, CBUS_FUNCTION_8, ), "ftdi_set_eeprom_value: CBUS_FUNCTION_8"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, CBUS_FUNCTION_9, ), "ftdi_set_eeprom_value: CBUS_FUNCTION_9"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, HIGH_CURRENT, ), "ftdi_set_eeprom_value: HIGH_CURRENT"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, HIGH_CURRENT_A, ), "ftdi_set_eeprom_value: HIGH_CURRENT_A"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, HIGH_CURRENT_B, ), "ftdi_set_eeprom_value: HIGH_CURRENT_B"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, INVERT, ), "ftdi_set_eeprom_value: INVERT"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, GROUP0_DRIVE, ), "ftdi_set_eeprom_value: GROUP0_DRIVE"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, GROUP0_SCHMITT, ), "ftdi_set_eeprom_value: GROUP0_SCHMITT"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, GROUP0_SLEW, ), "ftdi_set_eeprom_value: GROUP0_SLEW"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, GROUP1_DRIVE, ), "ftdi_set_eeprom_value: GROUP1_DRIVE"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, GROUP1_SCHMITT, ), "ftdi_set_eeprom_value: GROUP1_SCHMITT"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, GROUP1_SLEW, ), "ftdi_set_eeprom_value: GROUP1_SLEW"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, GROUP2_DRIVE, ), "ftdi_set_eeprom_value: GROUP2_DRIVE"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, GROUP2_SCHMITT, ), "ftdi_set_eeprom_value: GROUP2_SCHMITT"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, GROUP2_SLEW, ), "ftdi_set_eeprom_value: GROUP2_SLEW"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, GROUP3_DRIVE, ), "ftdi_set_eeprom_value: GROUP3_DRIVE"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, GROUP3_SCHMITT, ), "ftdi_set_eeprom_value: GROUP3_SCHMITT"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, GROUP3_SLEW, ), "ftdi_set_eeprom_value: GROUP3_SLEW"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, POWER_SAVE, ), "ftdi_set_eeprom_value: POWER_SAVE"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, CLOCK_POLARITY, ), "ftdi_set_eeprom_value: CLOCK_POLARITY"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, DATA_ORDER, ), "ftdi_set_eeprom_value: DATA_ORDER"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, FLOW_CONTROL, ), "ftdi_set_eeprom_value: FLOW_CONTROL"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, CHANNEL_C_DRIVER, ), "ftdi_set_eeprom_value: CHANNEL_C_DRIVER"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, CHANNEL_D_DRIVER, ), "ftdi_set_eeprom_value: CHANNEL_D_DRIVER"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, CHANNEL_A_RS485, ), "ftdi_set_eeprom_value: CHANNEL_A_RS485"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, CHANNEL_B_RS485, ), "ftdi_set_eeprom_value: CHANNEL_B_RS485"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, CHANNEL_C_RS485, ), "ftdi_set_eeprom_value: CHANNEL_C_RS485"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, CHANNEL_D_RS485, ), "ftdi_set_eeprom_value: CHANNEL_D_RS485"); ++ //chk(ftdi_set_eeprom_value(&m_ctx, RELEASE_NUMBER, ), "ftdi_set_eeprom_value: RELEASE_NUMBER"); ++ //m_eeprom.BM_type_chip = 1; ++ chk(ftdi_eeprom_build(&m_ctx), "ftdi_eeprom_build"); ++ chk(ftdi_write_eeprom(&m_ctx), "ftdi_write_eeprom"); ++ chk(ftdi_usb_close(&m_ctx), "ftdi_usb_close"); ++ } ++} ++ ++class FtdiDump { ++public: ++ FtdiDump(void); ++ ~FtdiDump(); ++ std::vector<uint8_t> dump(void); ++ ++protected: ++ struct ftdi_context m_ctx; ++ bool m_init; ++ ++ void chk(int r, const std::string& n); ++}; ++ ++FtdiDump::FtdiDump(void) ++ : m_init(false) ++{ ++ if (ftdi_init(&m_ctx) < 0) ++ throw std::runtime_error("ftdi_init failed"); ++ m_init = true; ++} ++ ++FtdiDump::~FtdiDump() ++{ ++ ftdi_usb_close(&m_ctx); ++ if (m_init) ++ ftdi_deinit(&m_ctx); ++ m_init = false; ++} ++ ++void FtdiDump::chk(int r, const std::string& n) ++{ ++ if (r >= 0) ++ return; ++ std::ostringstream oss; ++ oss << n << " failed (" << r << ", " << ftdi_get_error_string(&m_ctx) << ")"; ++ throw std::runtime_error(oss.str()); ++} ++ ++std::vector<uint8_t> FtdiDump::dump(void) ++{ ++ ftdi_usb_close(&m_ctx); ++ chk(ftdi_usb_open(&m_ctx, vendor_id, device_id), "ftdi_usb_open"); ++ chk(ftdi_read_eeprom(&m_ctx), "ftdi_read_eeprom"); ++ chk(ftdi_eeprom_decode(&m_ctx, 0), "ftdi_eeprom_decode"); ++ int rsize(0); ++ chk(ftdi_get_eeprom_value(&m_ctx, CHIP_SIZE, &rsize), "ftdi_get_eeprom_value"); ++ std::vector<uint8_t> r; ++ if (rsize > 0 && rsize <= FTDI_MAX_EEPROM_SIZE) { ++ r.resize(rsize, 0); ++ chk(ftdi_get_eeprom_buf(&m_ctx, &r[0], rsize), "ftdi_get_eeprom_buf"); ++ } ++ chk(ftdi_usb_close(&m_ctx), "ftdi_usb_close"); ++ return r; ++} ++ ++}; ++ + #else + + class FtdiProg { diff --git a/vfrnav.spec b/vfrnav.spec index 5ee9a8e..adccec5 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -8,6 +8,7 @@ License: GPLv2+ URL: http://www.baycom.org/~tom/vfrnav Source0: http://download.gna.org/vfrnav/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: ftdiconfig.patch %bcond_without webservice @@ -125,6 +126,10 @@ This package contains a webservice for the CFMU Autorouter. %prep %setup -q +%patch0 -p1 -b .ftdi +aclocal -I m4 +automake -a -c +autoconf %build %configure

1 0

[python-urllib2_kerberos] Replace python-setuptools-devel BR with python-setuptools
by Toshio くらとみ 01 Jul '14

01 Jul '14

commit 5c84a9cd442c47c46a85b2ae8a4c8a586fa66a72 Author: Toshio Kuratomi <toshio(a)fedoraproject.org> Date: Mon Jun 30 16:54:28 2014 -0700 Replace python-setuptools-devel BR with python-setuptools python-urllib2_kerberos.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) --- diff --git a/python-urllib2_kerberos.spec b/python-urllib2_kerberos.spec index 3b9b36d..585215b 100644 --- a/python-urllib2_kerberos.spec +++ b/python-urllib2_kerberos.spec @@ -2,7 +2,7 @@ Name: python-%{srcname} Version: 0.1.6 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Kerberos over HTTP Negotiate/SPNEGO support for urllib2 Group: Development/Languages @@ -19,7 +19,7 @@ Patch2: dont-panick-if-we-succeed.patch Patch3: port-to-python-2.4.patch BuildArch: noarch -BuildRequires: python-setuptools-devel +BuildRequires: python-setuptools Requires: python-kerberos %description @@ -55,6 +55,9 @@ touch -r $lib $lib.new && mv $lib.new $lib %changelog +* Mon Jun 30 2014 Toshio Kuratomi <toshio(a)fedoraproject.org> - 0.1.6-12 +- Replace python-setuptools-devel BR with python-setuptools + * Tue Jun 10 2014 Matěj Cepl <mcepl(a)redhat.com> - 0.1.6-11 - Add all patches I could find. - Also add RHEL5 patch porting to python 2.4 (RHBZ# 578711)

1 0

[python-typepad] Replace python-setuptools-devel BR with python-setuptools
by Toshio くらとみ 01 Jul '14

01 Jul '14

commit 1230115e71b1c59c47dc9717fe2807a923c9609c Author: Toshio Kuratomi <toshio(a)fedoraproject.org> Date: Mon Jun 30 16:53:18 2014 -0700 Replace python-setuptools-devel BR with python-setuptools python-typepad.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) --- diff --git a/python-typepad.spec b/python-typepad.spec index 80105ea..1341240 100644 --- a/python-typepad.spec +++ b/python-typepad.spec @@ -4,7 +4,7 @@ Name: python-typepad Version: 2.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Connectivity to the TypePad API through remote objects Group: Development/Languages @@ -14,7 +14,7 @@ Source0: http://pypi.python.org/packages/source/t/%{pkgname}/%{pkgname}-% BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python-devel python-setuptools-devel +BuildRequires: python-devel python-setuptools Requires: python-batchhttp python-httplib2 python-oauth python-remoteobjects python-simplejson %description @@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jun 30 2014 Toshio Kuratomi <toshio(a)fedoraproject.org> - 2.0-5 +- Replace python-setuptools-devel BR with python-setuptools + * Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

1 0

[python-twill] Replace python-setuptools-devel BR with python-setuptools
by Toshio くらとみ 01 Jul '14

01 Jul '14

commit f587751139ee5c14ffeefebd8c7b8faf47423e41 Author: Toshio Kuratomi <toshio(a)fedoraproject.org> Date: Mon Jun 30 16:52:19 2014 -0700 Replace python-setuptools-devel BR with python-setuptools python-twill.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) --- diff --git a/python-twill.spec b/python-twill.spec index 7ab6a8b..a6cf481 100644 --- a/python-twill.spec +++ b/python-twill.spec @@ -3,7 +3,7 @@ Summary: Simple scripting language for Web browsing Name: python-twill Version: 0.9 -Release: 11%{?dist} +Release: 12%{?dist} Group: Applications/Internet License: MIT URL: http://twill.idyll.org/ @@ -16,7 +16,7 @@ Requires: python-mechanize Requires: pyparsing Requires: python-setuptools BuildRequires: python-devel -BuildRequires: python-setuptools-devel +BuildRequires: python-setuptools BuildArch: noarch %description @@ -58,6 +58,9 @@ use forms, cookies, and most standard Web features. %changelog +* Mon Jun 30 2014 Toshio Kuratomi <toshio(a)fedoraproject.org> - 0.9-12 +- Replace python-setuptools-devel BR with python-setuptools + * Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.9-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

1 0

[python-tag] Replace the python-setuptools-devel BR with python-setuptools
by Toshio くらとみ 01 Jul '14

01 Jul '14

commit c031cd1c92d99a1751fdcb16ad2c05705adfebe2 Author: Toshio Kuratomi <toshio(a)fedoraproject.org> Date: Mon Jun 30 16:51:38 2014 -0700 Replace the python-setuptools-devel BR with python-setuptools python-tag.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) --- diff --git a/python-tag.spec b/python-tag.spec index 567bc6a..437e915 100644 --- a/python-tag.spec +++ b/python-tag.spec @@ -3,7 +3,7 @@ Summary: Python bindings for TagLib to read and write music files tags Name: python-tag Version: 2013.1 -Release: 6%{?dist} +Release: 7%{?dist} License: BSD Group: Development/Languages URL: http://pypi.python.org/pypi/tagpy @@ -13,7 +13,7 @@ Patch0: tagpy-2013.1-no-distribute.patch Provides: tagpy = %{version}-%{release} BuildRequires: python-devel -BuildRequires: python-setuptools-devel +BuildRequires: python-setuptools BuildRequires: taglib-devel BuildRequires: boost-devel @@ -37,6 +37,9 @@ python setup.py install -O1 --skip-build --root %{buildroot} %{python_sitearch}/* %changelog +* Mon Jun 30 2014 Toshio Kuratomi <toshio(a)fedoraproject.org> - 2013.1-7 +- Replace the python-setuptools-devel BR with python-setuptools + * Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2013.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

1 0

[python-sudsds] Replace python-setuptools-devel BR with python-setuptools
by Toshio くらとみ 01 Jul '14

01 Jul '14

commit 628b8f4888922b30e161fa94be1be02b38064602 Author: Toshio Kuratomi <toshio(a)fedoraproject.org> Date: Mon Jun 30 16:50:53 2014 -0700 Replace python-setuptools-devel BR with python-setuptools python-sudsds.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) --- diff --git a/python-sudsds.spec b/python-sudsds.spec index 23c5435..a4f625e 100644 --- a/python-sudsds.spec +++ b/python-sudsds.spec @@ -1,13 +1,13 @@ Summary: A python SOAP client modified for usage with Czech Databox Name: python-sudsds Version: 1.0.1 -Release: 4%{?dist} +Release: 5%{?dist} Source0: http://www.nic.cz/public_media/datove_schranky/releases/src/sudsds-%{versio… License: LGPLv3+ Group: Development/Libraries BuildArch: noarch Requires: python >= 2.4 -BuildRequires: python-setuptools-devel +BuildRequires: python-setuptools URL: https://labs.nic.cz/page/969/datovka/ %description @@ -49,6 +49,9 @@ rmdir %{buildroot}%{_datadir}/sudsds %doc README LICENSE.txt %changelog +* Mon Jun 30 2014 Toshio Kuratomi <toshio(a)fedoraproject.org> - 1.0.1-5 +- Replace python-setuptools-devel BR with python-setuptools + * Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

1 0

[python-suds] Replace python-setuptools-devel BR with python-setuptools
by Toshio くらとみ 01 Jul '14

01 Jul '14

commit f290ef61031a54406cca0fc1ad8f838af988481c Author: Toshio Kuratomi <toshio(a)fedoraproject.org> Date: Mon Jun 30 16:50:10 2014 -0700 Replace python-setuptools-devel BR with python-setuptools python-suds.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) --- diff --git a/python-suds.spec b/python-suds.spec index c448ffd..4c5b582 100644 --- a/python-suds.spec +++ b/python-suds.spec @@ -3,14 +3,14 @@ Summary: A python SOAP client Name: python-suds Version: 0.4.1 -Release: 6%{?dist} +Release: 7%{?dist} Source0: https://fedorahosted.org/releases/s/u/suds/%{name}-%{version}.tar.gz License: LGPLv3+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildArch: noarch Requires: python >= 2.4 -BuildRequires: python-setuptools-devel +BuildRequires: python-setuptools Url: https://fedorahosted.org/suds %description @@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %doc README LICENSE %changelog +* Mon Jun 30 2014 Toshio Kuratomi <toshio(a)fedoraproject.org> - 0.4.1-7 +- Replace python-setuptools-devel BR with python-setuptools + * Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.4.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

1 0

[python-sqlamp] Replace python-setuptools-devel BR with python-setuptools
by Toshio くらとみ 01 Jul '14

01 Jul '14

commit e13402f96ffc0e191521d5a9c75f42b2a3ef3e1c Author: Toshio Kuratomi <toshio(a)fedoraproject.org> Date: Mon Jun 30 16:42:22 2014 -0700 Replace python-setuptools-devel BR with python-setuptools python-sqlamp.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) --- diff --git a/python-sqlamp.spec b/python-sqlamp.spec index ffd01f2..59b37d0 100644 --- a/python-sqlamp.spec +++ b/python-sqlamp.spec @@ -4,7 +4,7 @@ Name: python-sqlamp Version: 0.5.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Library for working with hierarchical data structures using SQLAlchemy Group: Development/Languages @@ -19,7 +19,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel -BuildRequires: python-setuptools-devel +BuildRequires: python-setuptools BuildRequires: python-sqlalchemy BuildRequires: python-nose BuildRequires: python-sphinx @@ -71,6 +71,9 @@ rm -rf %{buildroot} %changelog +* Mon Jun 30 2014 Toshio Kuratomi <toshio(a)fedoraproject.org> - 0.5.2-9 +- Replace python-setuptools-devel BR with python-setuptools + * Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.5.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

1 0

[python-sippy] Replace python-setuptools-devel BR with python-setuptools
by Toshio くらとみ 01 Jul '14

01 Jul '14

commit 5772bb1ca97c5e376b09ab3c1ab236ae2b28fa4c Author: Toshio Kuratomi <toshio(a)fedoraproject.org> Date: Mon Jun 30 16:41:36 2014 -0700 Replace python-setuptools-devel BR with python-setuptools python-sippy.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) --- diff --git a/python-sippy.spec b/python-sippy.spec index 94e11fe..9d89905 100644 --- a/python-sippy.spec +++ b/python-sippy.spec @@ -4,7 +4,7 @@ Name: python-%{realname} Version: 1.0.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: B2BUA (back-to-back user agent) SIP call controlling component Group: Development/Libraries License: GPLv2+ @@ -15,7 +15,7 @@ Source0: http://b2bua.org/chrome/site/%{realname}-%{version}.tar.gz Patch0: sippy-setup.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel -BuildRequires: python-setuptools-devel +BuildRequires: python-setuptools Requires: python-twisted-core # for sippy/Radius_client.py Requires: radiusclient-ng-utils @@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jun 30 2014 Toshio Kuratomi <toshio(a)fedoraproject.org> - 1.0.3-10 +- Replace python-setuptools-devel BR with python-setuptools + * Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits June 2014