From 63654f32133f494d5f173a47c7ccbf95715c60f4 Mon Sep 17 00:00:00 2001 From: pgen Date: Tue, 8 Jun 2021 22:07:28 +0200 Subject: Removal of SUSE-specific specfile generation --- Makefile.am | 7 +++---- Makefile.in | 14 +++++--------- configure | 3 --- configure.ac | 2 +- smenu.spec.in | 59 ----------------------------------------------------------- 5 files changed, 9 insertions(+), 76 deletions(-) delete mode 100644 smenu.spec.in diff --git a/Makefile.am b/Makefile.am index 0dfba2a..3059671 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,10 @@ bin_PROGRAMS = smenu smenu_SOURCES = smenu.c smenu.h list.c list.h xmalloc.c xmalloc.h \ - index.c index.h utf8.c utf8.h fgetc.c fgetc.h \ + index.c index.h utf8.c utf8.h fgetc.c fgetc.h \ utils.c utils.h usage.c usage.h ctxopt.h ctxopt.c dist_man_MANS = smenu.1 -EXTRA_DIST = smenu.spec.in smenu.spec ChangeLog build.sh version \ - COPYRIGHT LICENSE.rst README.rst examples build-aux tests \ - FAQ +EXTRA_DIST = ChangeLog build.sh version COPYRIGHT LICENSE.rst README.rst \ + examples build-aux tests FAQ dist-hook: @chmod u+rw $(distdir)/tests; \ diff --git a/Makefile.in b/Makefile.in index 129721b..d664353 100644 --- a/Makefile.in +++ b/Makefile.in @@ -100,7 +100,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = smenu.spec +CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" PROGRAMS = $(bin_PROGRAMS) @@ -201,8 +201,7 @@ CTAGS = ctags CSCOPE = cscope AM_RECURSIVE_TARGETS = cscope am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \ - $(srcdir)/config.h.in $(srcdir)/smenu.spec.in \ - $(top_srcdir)/build-aux/compile \ + $(srcdir)/config.h.in $(top_srcdir)/build-aux/compile \ $(top_srcdir)/build-aux/config.guess \ $(top_srcdir)/build-aux/config.sub \ $(top_srcdir)/build-aux/depcomp \ @@ -326,13 +325,12 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ smenu_SOURCES = smenu.c smenu.h list.c list.h xmalloc.c xmalloc.h \ - index.c index.h utf8.c utf8.h fgetc.c fgetc.h \ + index.c index.h utf8.c utf8.h fgetc.c fgetc.h \ utils.c utils.h usage.c usage.h ctxopt.h ctxopt.c dist_man_MANS = smenu.1 -EXTRA_DIST = smenu.spec.in smenu.spec ChangeLog build.sh version \ - COPYRIGHT LICENSE.rst README.rst examples build-aux tests \ - FAQ +EXTRA_DIST = ChangeLog build.sh version COPYRIGHT LICENSE.rst README.rst \ + examples build-aux tests FAQ all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -387,8 +385,6 @@ $(srcdir)/config.h.in: $(am__configure_deps) distclean-hdr: -rm -f config.h stamp-h1 -smenu.spec: $(top_builddir)/config.status $(srcdir)/smenu.spec.in - cd $(top_builddir) && $(SHELL) ./config.status $@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ diff --git a/configure b/configure index a7eb8de..8b435eb 100755 --- a/configure +++ b/configure @@ -5182,8 +5182,6 @@ esac ac_config_files="$ac_config_files Makefile" -ac_config_files="$ac_config_files smenu.spec" - cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -5912,7 +5910,6 @@ do "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "smenu.spec") CONFIG_FILES="$CONFIG_FILES smenu.spec" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/configure.ac b/configure.ac index 0a85042..0ce7698 100644 --- a/configure.ac +++ b/configure.ac @@ -58,4 +58,4 @@ case "${host_os}" in esac AC_CONFIG_FILES([Makefile]) -AC_OUTPUT([smenu.spec]) +AC_OUTPUT diff --git a/smenu.spec.in b/smenu.spec.in deleted file mode 100644 index 3cfcd0b..0000000 --- a/smenu.spec.in +++ /dev/null @@ -1,59 +0,0 @@ -# -# spec file for package smenu -# - -Name: smenu -Version: @VERSION@ -Release: 0 -Summary: A standard input word picker -License: GPL-2.0-only -Group: Productivity/Text/Utilities -URL: https://github.com/p-gen/%{name} -Source: https://github.com/p-gen/%{name}/archive/refs/tags/v%{version}.tar.gz -BuildRequires: ncurses-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%description -This tool reads words from a file or standard input, presents them in an -interactive window after the current line on the terminal, and writes the -selected words, if any, to standard output. - -%prep -%setup -q - -%build -%configure -make %{?_smp_mflags} - -%package tests -Summary: Testing system for %{name} -Group: Productivity/Text/Utilities -Requires: smenu - -%description tests -This packages contains some scripts and a number of tests to check the -%{name} tool. - -%install -%if 0%{?suse_version} < 1315 -make install DESTDIR="%{?buildroot}" -%else -%make_install -%endif - -%files tests -%defattr(-,root,root,-) -%doc tests - -%files -%defattr(-,root,root,-) -%attr(0755,root,root) %{_bindir}/* -%if 0%{?sle_version} < 120300 -%doc COPYRIGHT -%else -%license COPYRIGHT -%endif -%doc examples README.rst FAQ -%{_mandir}/man1/* - -%changelog -- cgit v1.2.3