Attachment 14591 Details for Bug 33399 – patch for mmv.spec

[patch] patch for mmv.spec

mmv.spec.patch (text/plain), 1.89 KB, created by Aurelian R on 2024-07-14 11:15:15 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Aurelian R

Created: 2024-07-14 11:15:15 CEST

Size: 1.89 KB

patch

obsolete

>--- mmv/mmv.spec	2024-07-14 00:38:31.255654702 +0300
>+++ SPECS/mmv.spec	2024-07-14 11:33:08.698006228 +0300
>@@ -1,18 +1,14 @@
> Name:		mmv
>-Version:	1.01b
>-Release:	%mkrel 20
>+Version:	2.7
>+Release:	%mkrel 0.1
> Summary:	Move/copy/append/link multiple files
> 
> Group:		File tools
> License:	GPL
> URL:		https://packages.qa.debian.org/m/mmv.html
>-Source0:	https://ftp.debian.org/debian/pool/main/m/mmv/mmv_1.01b.orig.tar.gz
>-Source1:	copyright
>-Source2:	changelog
>-Patch0:		mmv-1.01b-debian.patch
>-Patch1:		mmv-1.01b-makefile.patch
>-Patch2:		mmv-1.01b-debian-14.patch
>-Patch3:		mmv-1.01b-printf-fix.patch
>+#Source0:	https://ftp.debian.org/debian/pool/main/m/mmv/%{name}-%{version}.orig.tar.gz
>+Source0:	https://github.com/rrthomas/mmv/releases/download/v%{version}/%{name}-%{version}.tar.gz
>+BuildRequires:  autoconf
> 
> %description
> This is mmv, a program to move/copy/append/link multiple files
>@@ -25,31 +21,26 @@ specified and gives the user the choice
> beginning, or proceeding by avoiding the offending parts.
> 
> %prep
>-%setup -q -n %{name}-%{version}.orig
>-%patch0 -p1
>-%patch1 -p1
>-%patch2 -p1
>-%patch3 -p1
>-cp -p %{SOURCE1} . 
>-cp -p %{SOURCE2} .
>+%autosetup -p1
> 
> %build
>-%make_build CONF="%{optflags} -fpie" LDCONF="-pie"
>+autoreconf -vfi
>+
>+%configure
>+%make_build CONF="%{optflags} -fpie" LDCONF="%{ldflags} -pie"
> 
> %install
> %make_install
>-ln -s mmv %{buildroot}%{_bindir}/mcp
>-ln -s mmv %{buildroot}%{_bindir}/mad
>-ln -s mmv %{buildroot}%{_bindir}/mln
> ln -s mmv.1%{_extension} %{buildroot}%{_mandir}/man1/mcp.1%{_extension}
> ln -s mmv.1%{_extension} %{buildroot}%{_mandir}/man1/mad.1%{_extension}
> ln -s mmv.1%{_extension} %{buildroot}%{_mandir}/man1/mln.1%{_extension}
> 
>+%check
>+%__make check
>+
> %files
>-%defattr(0644,root,root,0755)
>-%doc copyright changelog
>-%defattr(-,root,root,-)
>-%doc ANNOUNCE ARTICLE READ.ME
>+%license COPYING
>+%doc AUTHORS ChangeLog README.md
> %{_bindir}/mmv
> %{_bindir}/mcp
> %{_bindir}/mad

--- mmv/mmv.spec	2024-07-14 00:38:31.255654702 +0300
+++ SPECS/mmv.spec	2024-07-14 11:33:08.698006228 +0300
@@ -1,18 +1,14 @@
 Name:		mmv
-Version:	1.01b
-Release:	%mkrel 20
+Version:	2.7
+Release:	%mkrel 0.1
 Summary:	Move/copy/append/link multiple files
 
 Group:		File tools
 License:	GPL
 URL:		https://packages.qa.debian.org/m/mmv.html
-Source0:	https://ftp.debian.org/debian/pool/main/m/mmv/mmv_1.01b.orig.tar.gz
-Source1:	copyright
-Source2:	changelog
-Patch0:		mmv-1.01b-debian.patch
-Patch1:		mmv-1.01b-makefile.patch
-Patch2:		mmv-1.01b-debian-14.patch
-Patch3:		mmv-1.01b-printf-fix.patch
+#Source0:	https://ftp.debian.org/debian/pool/main/m/mmv/%{name}-%{version}.orig.tar.gz
+Source0:	https://github.com/rrthomas/mmv/releases/download/v%{version}/%{name}-%{version}.tar.gz
+BuildRequires:  autoconf
 
 %description
 This is mmv, a program to move/copy/append/link multiple files
@@ -25,31 +21,26 @@ specified and gives the user the choice
 beginning, or proceeding by avoiding the offending parts.
 
 %prep
-%setup -q -n %{name}-%{version}.orig
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-cp -p %{SOURCE1} . 
-cp -p %{SOURCE2} .
+%autosetup -p1
 
 %build
-%make_build CONF="%{optflags} -fpie" LDCONF="-pie"
+autoreconf -vfi
+
+%configure
+%make_build CONF="%{optflags} -fpie" LDCONF="%{ldflags} -pie"
 
 %install
 %make_install
-ln -s mmv %{buildroot}%{_bindir}/mcp
-ln -s mmv %{buildroot}%{_bindir}/mad
-ln -s mmv %{buildroot}%{_bindir}/mln
 ln -s mmv.1%{_extension} %{buildroot}%{_mandir}/man1/mcp.1%{_extension}
 ln -s mmv.1%{_extension} %{buildroot}%{_mandir}/man1/mad.1%{_extension}
 ln -s mmv.1%{_extension} %{buildroot}%{_mandir}/man1/mln.1%{_extension}
 
+%check
+%__make check
+
 %files
-%defattr(0644,root,root,0755)
-%doc copyright changelog
-%defattr(-,root,root,-)
-%doc ANNOUNCE ARTICLE READ.ME
+%license COPYING
+%doc AUTHORS ChangeLog README.md
 %{_bindir}/mmv
 %{_bindir}/mcp
 %{_bindir}/mad

Actions: View | Diff

Attachments on bug 33399: 14591