From f91cfa016d05e42fb3b6636c59bc003469711a9c Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Mon, 14 Jan 2019 11:45:48 +0100 Subject: [PATCH] rpm: remove patches as they should be in git by now --- packaging/add-libuldaq.pc.in.patch | 13 --------- packaging/fix-debug.patch | 45 ------------------------------ packaging/fix-debug2.patch | 17 ----------- packaging/uldaq.spec | 3 -- 4 files changed, 78 deletions(-) delete mode 100644 packaging/add-libuldaq.pc.in.patch delete mode 100644 packaging/fix-debug.patch delete mode 100644 packaging/fix-debug2.patch diff --git a/packaging/add-libuldaq.pc.in.patch b/packaging/add-libuldaq.pc.in.patch deleted file mode 100644 index a3e7468..0000000 --- a/packaging/add-libuldaq.pc.in.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- /dev/null 2019-01-10 06:40:13.431642000 +0000 -+++ libuldaq.pc.in 2019-01-10 08:07:38.000000000 +0000 -@@ -0,0 +1,10 @@ -+prefix=@prefix@ -+exec_prefix=@bindir@ -+includedir=@includedir@ -+libdir=@libdir@ -+ -+Name: uldaq -+Description: MCC Universal Library for Linux -+Version: 1.1.0 -+Cflags: -I${includedir} -+Libs: -L${libdir} -luldaq diff --git a/packaging/fix-debug.patch b/packaging/fix-debug.patch deleted file mode 100644 index a53ccdc..0000000 --- a/packaging/fix-debug.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index b117a10..c995099 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -69,17 +69,30 @@ AM_CONDITIONAL(OS_LINUX, test "x$os" = xlinux) - AM_CONDITIONAL(OS_DARWIN, test "x$os" = xdarwin) - - # Examples build --AC_ARG_ENABLE([disable-examples-build], [AS_HELP_STRING([--disable-examples-build], -- [disable building example applications [default=no]])], -- [disable_build_examples=$enableval], -- [disable_build_examples=no]) --AM_CONDITIONAL(BUILD_EXAMPLES, test "x$disable_build_examples" != xyes) -+AC_ARG_ENABLE([examples], -+AS_HELP_STRING([--enable-examples], -+ [enable building example applications, default: yes]), -+ [case "${enableval}" in -+ yes) build_examples=true ;; -+ no) build_examples=false ;; -+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-examples]) ;; -+ esac], -+ [build_examples=true] -+) -+AM_CONDITIONAL(BUILD_EXAMPLES, test x"$build_examples" == x"true") -+ - # Debug enable --AC_ARG_ENABLE([debug], [AS_HELP_STRING([--debug], -- [turn on debugging [default=no]])], -- [debug=$enableval], -- [debug=no]) --AM_CONDITIONAL(DEBUG, test "x$debug" != xno) -+AC_ARG_ENABLE(debug, -+AS_HELP_STRING([--enable-debug], -+ [enable debugging, default: no]), -+ [case "${enableval}" in -+ yes) debug=true ;; -+ no) debug=false ;; -+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-debug]) ;; -+ esac], -+ [debug=false] -+) -+AM_CONDITIONAL(DEBUG, test x"$debug" = x"true") - - AC_SUBST(LTLDFLAGS) - diff --git a/packaging/fix-debug2.patch b/packaging/fix-debug2.patch deleted file mode 100644 index 23760ea..0000000 --- a/packaging/fix-debug2.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/Makefile.am b/src/Makefile.am -index a0781a3..6f58a9a 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,7 +1,11 @@ - AUTOMAKE_OPTIONS = subdir-objects - - if DEBUG --AM_CPPFLAGS = -DDEBUG -+ AM_CFLAGS = -g3 -O0 -DDEBUG -+ AM_CXXFLAGS = -g3 -O0 -DDEBUG -+else -+ AM_CFLAGS = -O2 -+ AM_CXXFLAGS = -O2 - endif - - lib_LTLIBRARIES = libuldaq.la diff --git a/packaging/uldaq.spec b/packaging/uldaq.spec index dd74734..48e4eec 100644 --- a/packaging/uldaq.spec +++ b/packaging/uldaq.spec @@ -6,9 +6,6 @@ URL: http://www.mccdaq.com License: MIT Source0: https://github.com/mccdaq/uldaq/archive/v1.1.0.tar.gz -#Patch0: add-libuldaq.pc.in.patch -#Patch1: fix-debug.patch -#Patch2: fix-debug2.patch BuildRequires: libusb-devel m4 autoconf automake libtool Requires: libusb