commit a8d647472d08d5a888a46f31536a8bf8142bf528
Author: Bartek Szady <b...@bszx.eu>
Date: Sun Jan 26 12:27:45 2025 +0100
- updated to 8.0
avrdude-configure.patch | 21 ----------------
avrdude-doc.patch | 41 +++++++++++-------------------
avrdude-info.patch | 7 +++---
avrdude.spec | 67 +++++++++++++++++++++++++++++++------------------
shebang.patch | 9 +++++++
5 files changed, 70 insertions(+), 75 deletions(-)
---
diff --git a/avrdude.spec b/avrdude.spec
index caea466..dcc1221 100644
--- a/avrdude.spec
+++ b/avrdude.spec
@@ -1,21 +1,23 @@
-# TODO: -devel package, shared library
+# TODO: shared library
+# package python gui demonstrator, requires swig, python and Qt5 or Qt6
Summary: Software for programming Atmel AVR Microcontrollers
Summary(pl.UTF-8): Oprogramowanie do programowania mikrokontrolerów Atmel
AVR
Name: avrdude
-Version: 6.3
-Release: 2
+Version: 8.0
+Release: 1
License: GPL v2
Group: Development/Tools
-Source0:
http://savannah.nongnu.org/download/avrdude/%{name}-%{version}.tar.gz
-# Source0-md5: 58bb42049122cf80fe4f4d0ce36d92ee
+Source0:
https://github.com/avrdudes/avrdude/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: f62d33439f6c5b2239467372864c5e41
Patch0: %{name}-info.patch
Patch1: %{name}-doc.patch
-Patch2: %{name}-configure.patch
-URL: http://savannah.nongnu.org/projects/avrdude/
-BuildRequires: autoconf >= 2.57
-BuildRequires: automake
+Patch2: shebang.patch
+URL: https://github.com/avrdudes/avrdude
BuildRequires: bison
+BuildRequires: cmake >= 3.14
+BuildRequires: elfutils-devel
BuildRequires: flex
+BuildRequires: hidapi-devel
BuildRequires: libusb-devel
BuildRequires: readline-devel
BuildRequires: texinfo
@@ -27,27 +29,37 @@ AVRDUDE is software for programming Atmel AVR
Microcontrollers.
%description -l pl.UTF-8
AVRDUDE to oprogramowanie do programowania mikrokontrolerów Atmel AVR.
+%package devel
+Summary: AVRDUDE static library and development includes
+Summary(pl.UTF-8): Biblioteka stayczna i pliki nagłówkowe AVRDUDE
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+AVRDUDE static library and development includes
+
+%description devel -l pl.UTF-8
+Biblioteka stayczna i pliki nagłówkowe AVRDUDE
+
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%patch -P 0 -p1
+%patch -P 1 -p1
+%patch -P 2 -p1
%build
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
- ac_cv_lib_termcap_tputs=no \
- --enable-doc \
- --disable-shared
-%{__make} -j1
+install -d build
+cd build
+%cmake .. \
+ -DBUILD_SHARED_LIBS=OFF \
+ -DBUILD_DOC=ON
+
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
+%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
%clean
@@ -61,8 +73,15 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog* NEWS README
-%attr(755,root,root) %{_bindir}/*
+%doc AUTHORS NEWS README.md
+%attr(755,root,root) %{_bindir}/avrdude
+%attr(755,root,root) %{_bindir}/elf2tag
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf
%{_mandir}/man?/*
%{_infodir}/avrdude.info*
+
+%files devel
+%defattr(644,root,root,755)
+%{_libdir}/libavrdude.a
+%{_includedir}/libavrdude.h
+%{_includedir}/libavrdude-avrintel.h
diff --git a/avrdude-configure.patch b/avrdude-configure.patch
deleted file mode 100644
index 99025e4..0000000
--- a/avrdude-configure.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- avrdude-5.5/configure.ac.orig 2007-10-30 00:00:12.000000000 +0100
-+++ avrdude-5.5/configure.ac 2008-02-10 00:16:36.000000000 +0100
-@@ -240,6 +240,18 @@
- LDFLAGS="${LDFLAGS} -static"
- ;;
- esac
-+
-+if test "$enabled_doc" = "yes"; then
-+
-+SUBDIRS_AC="doc $WINDOWS_DIRS"
-+DIST_SUBDIRS_AC='doc windows'
-+else
-+
-+SUBDIRS_AC="$WINDOWS_DIRS"
-+DIST_SUBDIRS_AC='windows'
-+fi
-+AC_SUBST(SUBDIRS_AC, $SUBDIRS_AC)
-+AC_SUBST(DIST_SUBDIRS_AC, $DIST_SUBDIRS_AC)
- AC_SUBST(WINDOWS_DIRS,$WINDOWS_DIRS)
-
- # If we are compiling with gcc, enable all warning and make warnings errors.
diff --git a/avrdude-doc.patch b/avrdude-doc.patch
index ae65304..41fa684 100644
--- a/avrdude-doc.patch
+++ b/avrdude-doc.patch
@@ -1,30 +1,17 @@
---- avrdude-5.0/doc/Makefile.am.orig 2005-09-22 19:51:59.000000000 +0200
-+++ avrdude-5.0/doc/Makefile.am 2005-10-23 00:25:56.363330568 +0200
-@@ -27,7 +27,7 @@
+diff -up avrdude-8.0/src/doc/CMakeLists.txt._orig
avrdude-8.0/src/doc/CMakeLists.txt
+--- avrdude-8.0/src/doc/CMakeLists.txt._orig 2024-08-24 22:51:00.000000000
+0200
++++ avrdude-8.0/src/doc/CMakeLists.txt 2024-09-01 11:57:53.844478755 +0200
+@@ -130,13 +130,9 @@ add_custom_command(
+ # =====================================
- info_TEXINFOS = avrdude.texi
+ add_custom_target(info ALL DEPENDS avrdude.info)
+-add_custom_target(pdf ALL DEPENDS avrdude.pdf)
+-add_custom_target(html ALL DEPENDS avrdude-html/avrdude.html)
--all-local: info html ps pdf
-+all-local: info
+ # =====================================
+ # Install
+ # =====================================
- html: avrdude-html/avrdude.html
-
-@@ -43,18 +43,5 @@
- clean-local:
- rm -rf avrdude-html *.info
-
--install-data-local: install-docs
--
--install-docs: html ps pdf
-- $(mkinstalldirs) $(DOC_INST_DIR)
-- $(INSTALL_DATA) avrdude.ps $(DOC_INST_DIR)/avrdude.ps
-- $(INSTALL_DATA) avrdude.pdf $(DOC_INST_DIR)/avrdude.pdf
-- $(mkinstalldirs) $(DOC_INST_DIR)/avrdude-html
-- @list=`echo avrdude-html/*.html`; \
-- for file in $$list; \
-- do \
-- $(INSTALL_DATA) $$file $(DOC_INST_DIR)/$$file; \
-- done
--
- uninstall-local:
- rm -rf $(DOC_INST_DIR)
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/avrdude.info" DESTINATION
${CMAKE_INSTALL_INFODIR})
+-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/avrdude.pdf" DESTINATION
${CMAKE_INSTALL_DOCDIR})
+-install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/avrdude-html" DESTINATION
${CMAKE_INSTALL_DOCDIR})
diff --git a/avrdude-info.patch b/avrdude-info.patch
index a158e80..3258c5f 100644
--- a/avrdude-info.patch
+++ b/avrdude-info.patch
@@ -1,6 +1,7 @@
---- avrdude-4.2.0/doc/avrdude.texi.orig Fri Sep 5 03:12:43 2003
-+++ avrdude-4.2.0/doc/avrdude.texi Thu Jan 15 13:25:55 2004
-@@ -17,9 +17,9 @@
+diff -up avrdude-7.1/src/doc/avrdude.texi._orig
avrdude-7.1/src/doc/avrdude.texi
+--- avrdude-7.1/src/doc/avrdude.texi._orig 2023-01-08 22:28:14.000000000
+0100
++++ avrdude-7.1/src/doc/avrdude.texi 2023-02-19 14:15:25.591557094 +0100
+@@ -18,9 +18,9 @@
@c This is a dir.info fragment to support semi-automated addition of
@c manuals to an info tree.
diff --git a/shebang.patch b/shebang.patch
new file mode 100644
index 0000000..86281d8
--- /dev/null
+++ b/shebang.patch
@@ -0,0 +1,9 @@
+diff -up avrdude-8.0/src/elf2tag._orig avrdude-8.0/src/elf2tag
+--- avrdude-8.0/src/elf2tag._orig 2024-08-24 22:51:00.000000000 +0200
++++ avrdude-8.0/src/elf2tag 2024-09-01 12:07:47.240709744 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/bash
+
+ # Part of the AVRDUDE project https://github.com/avrdudes/avrdude
+ # Published under GNU General Public License, version 2 (GPL-2.0)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/avrdude.git/commitdiff/a8d647472d08d5a888a46f31536a8bf8142bf528
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
