Improve catdoc.spec, simplify .packit.yaml

Add autoreconf -fi to %prep, add autoconf/automake BuildRequires,
enable %check, expand %doc.
Remove create-archive from .packit.yaml since spec now handles autotools
bootstrapping from raw git archive.  `autoreconf -fi` generates
configure (and provides files it needs in build-aux), so no need to
track it.

Add configure, catdoc-*.tar.gz artifacts from `make dist` and build
artifacts in x86_64/ from local RPM/packit builds to .gitignore.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: skierpage

.gitignore

@@ -26,6 +26,7 @@ src/wordview
 # Autotools generated files
 aclocal.m4
 build-aux/
+configure
 Makefile.in
 src/Makefile.in
 tests/Makefile.in
@@ -37,3 +38,7 @@ src/config.h.in
 tests/**/*.log
 tests/**/*.trs
 tests/test-suite.log
+
+# `make dist` and local RPM/packit builds
+catdoc-*.tar.gz
+x86_64/

.packit.yaml

@@ -19,18 +19,8 @@ actions:
   # overwrites Version: in the spec. This reads the version from configure.ac.
   get-current-version:
     - autoconf --trace='AC_INIT:$2' configure.ac
-  create-archive:
-    - autoreconf -fiv
-    - ./configure
-    - make dist
-    # packit uses the last line of output as the archive path
-    - bash -c "ls catdoc-*.tar.gz"
-
-srpm_build_deps:
-  - autoconf
-  - automake
-  - make
-  - gcc
+  # No create-archive needed: packit uses a raw git archive, and autoreconf -fi
+  # in the spec's %prep generates the required autotools files during the RPM build.
 
 jobs:
 - job: copr_build

NEWS

@@ -1,5 +1,6 @@
    0.97.1 in development
-	Clean up address sanitizer tests
+	Clean up address sanitizer tests.
+	Simplify RPM package builds triggered by Packit.
 
    0.97 March 8 2026
 	Remove 16-bit DOS support. Use version 0.96 if you're still building and

TODO.md

@@ -18,28 +18,8 @@
 - [ ] Run `make distcheck` to produce `catdoc-0.97.1.tar.gz`
 - [ ] Tag `v0.97.1` and create a GitHub Release
 - [ ] Upload `catdoc-0.97.1.tar.gz` (from `make distcheck`) as a release asset
-- [ ] Verify packit `trigger: release` Copr build fires and succeeds (see CI issues below)
-
-## Other CI issues
-
-- [x] Confirmed packit PR builds work. To check builds for a PR, go to
-  https://dashboard.packit.dev/projects/github.com/skierpage/catdoc, find the PR under
-  "PRs Handled", then follow the Copr build links (e.g.
-  https://copr.fedorainfracloud.org/coprs/packit/skierpage-catdoc-10/). RPMs are in the
-  "Pulp results" link at the bottom of each chroot page.
-- [ ] `trigger: release` Copr build never fires or fails silently — packit lacks permission
-  to build in `skierpage/catdoc` Copr project. Need to investigate granting packit access.
-  See packit docs for Copr credential/permission setup.
-- [ ] Fix `Source0` in catdoc.spec to point to the `make dist` tarball uploaded as a GitHub
-  release asset:
-  `https://github.com/skierpage/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz`
-  Currently points to a raw git archive which lacks autotools-generated files and fails to build.
-  (Packit ignores Source0 since `create-archive` overrides it, so this only matters for manual RPM builds.)
-- [ ] Fix `%check` in catdoc.spec to run the test suite against the just-built binaries.
-  Current attempt with `%{__make} check` runs the system `/usr/bin/catdoc` instead of the
-  BUILDROOT binary. Fix requires prepending `%{buildroot}%{_bindir}` to PATH in `%check`
-  and setting `CHARSETPATH` correctly.
-
+- [ ] Verify packit `trigger: release` fires off a Copr build and succeeds,
+  see https://dashboard.packit.dev/projects/github.com/skierpage/catdoc
 
 ## Research: find more Office 2007 test files
 

catdoc.spec

@@ -1,10 +1,12 @@
 Name: catdoc
-Version: 0.97
-Release: %autorelease
+Version: 0.97.1_devel
+Release: 1.20260320162811988977.master.2.gbb7d4c7%{?dist}
 Summary: programs which extract text from Microsoft Office 97-2004 files
 License: GPL-2.0-or-later
 URL: https://github.com/skierpage/catdoc
 Source0: https://github.com/skierpage/%{name}/archive/refs/tags/v%{version}.tar.gz
+BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: gcc
 BuildRequires: make
 BuildRequires: tk
@@ -39,6 +41,7 @@ via Tk.
 
 %prep
 %autosetup -p1 -n %{name}-%{version}
+autoreconf -fi
 
 %build
 %configure
@@ -47,16 +50,11 @@ via Tk.
 %install
 %make_install
 
-# Struggling to get this to work
-#       %check
-#       %{make} check
-# fails when I invoke `packit build locally` with
-#        /var/tmp/rpm-tmp.5GB8PL: line 47: fg: no job control
-#        error: Bad exit status from /var/tmp/rpm-tmp.5GB8PL (%check)
-#       %{__make} check
-# works, but fails because it runs /usr/bin/catdoc, not the just-built BUILDROOT/usr/bin/
-# %check
-# %{__make} check
+# Test scripts use ../src/catdoc relative to the tests/ build directory,
+# so they run the just-built binary without needing %{buildroot}/%{_bindir}.
+# Set CHARSETPATH relative to the build tree for the same reason.
+%check
+CHARSETPATH="$(pwd)/charsets" %make_build check
 
 %files
 %license COPYING
@@ -67,7 +65,7 @@ via Tk.
 %{_mandir}/man1/catppt.1.*
 %{_mandir}/man1/xls2csv.1.*
 %{_datadir}/catdoc
-%doc README.md NEWS
+%doc README.md NEWS ALTERNATIVES.md CREDITS
 
 %files wordview
 %{_bindir}/wordview