From 7b2257e538308212ff04a76927d212ab65efeba2 Mon Sep 17 00:00:00 2001 From: Markus Gans Date: Thu, 20 Sep 2018 04:59:04 +0200 Subject: [PATCH] finalcut.spec --- .gitignore | 1 + ChangeLog | 2 +- Makefile.in | 11 +++++++---- configure | 3 ++- configure.ac | 1 + finalcut.spec => finalcut.spec.in | 6 +++--- 6 files changed, 15 insertions(+), 9 deletions(-) rename finalcut.spec => finalcut.spec.in (98%) diff --git a/.gitignore b/.gitignore index 544abd2d..4f367c50 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ *.log *.trs finalcut.pc +finalcut.spec stamp-h1 _configs.sed config.guess diff --git a/ChangeLog b/ChangeLog index 2943b92a..bb214e70 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ 2018-09-20 Markus Gans - * added pkg-config file finalcut.pc + * Added pkg-config file finalcut.pc 2018-09-16 Markus Gans * Implement a ttytype test for the FTermDetection unit test diff --git a/Makefile.in b/Makefile.in index 472480af..2601458a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -85,9 +85,10 @@ host_triplet = @host@ subdir = . DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in $(srcdir)/finalcut.pc.in AUTHORS COPYING \ - COPYING.LESSER ChangeLog compile config.guess config.sub \ - depcomp install-sh missing ltmain.sh + $(srcdir)/config.h.in $(srcdir)/finalcut.spec.in \ + $(srcdir)/finalcut.pc.in AUTHORS COPYING COPYING.LESSER \ + ChangeLog compile config.guess config.sub depcomp install-sh \ + missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_prefix_config_h.m4 \ $(top_srcdir)/m4/cppunit.m4 $(top_srcdir)/m4/libtool.m4 \ @@ -100,7 +101,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 = finalcut.pc +CONFIG_CLEAN_FILES = finalcut.spec finalcut.pc CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -417,6 +418,8 @@ $(srcdir)/config.h.in: $(am__configure_deps) distclean-hdr: -rm -f config.h stamp-h1 +finalcut.spec: $(top_builddir)/config.status $(srcdir)/finalcut.spec.in + cd $(top_builddir) && $(SHELL) ./config.status $@ finalcut.pc: $(top_builddir)/config.status $(srcdir)/finalcut.pc.in cd $(top_builddir) && $(SHELL) ./config.status $@ diff --git a/configure b/configure index 31bee2d0..6432d3f7 100755 --- a/configure +++ b/configure @@ -17786,7 +17786,7 @@ SO_VERSION="4:0:4" -ac_config_files="$ac_config_files Makefile src/Makefile fonts/Makefile doc/Makefile examples/Makefile src/test/Makefile finalcut.pc" +ac_config_files="$ac_config_files Makefile src/Makefile fonts/Makefile doc/Makefile examples/Makefile src/test/Makefile finalcut.spec finalcut.pc" # use GPM (General Purpose Mouse) @@ -19239,6 +19239,7 @@ do "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; "src/test/Makefile") CONFIG_FILES="$CONFIG_FILES src/test/Makefile" ;; + "finalcut.spec") CONFIG_FILES="$CONFIG_FILES finalcut.spec" ;; "finalcut.pc") CONFIG_FILES="$CONFIG_FILES finalcut.pc" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; diff --git a/configure.ac b/configure.ac index 71a0b848..9c710191 100644 --- a/configure.ac +++ b/configure.ac @@ -72,6 +72,7 @@ AC_CONFIG_FILES([Makefile doc/Makefile examples/Makefile src/test/Makefile + finalcut.spec finalcut.pc]) # use GPM (General Purpose Mouse) diff --git a/finalcut.spec b/finalcut.spec.in similarity index 98% rename from finalcut.spec rename to finalcut.spec.in index a67ece4c..6a31b675 100644 --- a/finalcut.spec +++ b/finalcut.spec.in @@ -1,14 +1,14 @@ # # spec file for package finalcut # -# Copyright (c) 2017 by Markus Gans +# Copyright (c) 2018 by Markus Gans # -Name: finalcut +Name: @PACKAGE@ %define libname libfinal %define libsoname %{libname}0 -Version: 0.4.0 +Version: @VERSION@ Release: %{buildno} License: LGPL-3.0 Summary: The Final Cut