[amule] git add 120.patch
by Sérgio M. Basto
commit 3805843e29863075d3e05a68d364622908365cb0
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Feb 26 04:55:24 2018 +0000
git add 120.patch
120.patch | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
---
diff --git a/120.patch b/120.patch
new file mode 100644
index 0000000..6c84a8d
--- /dev/null
+++ b/120.patch
@@ -0,0 +1,23 @@
+https://github.com/amule-project/amule/pull/120
+From d1d1368c7909ffd8423730afaa811ce7b6a3a8aa Mon Sep 17 00:00:00 2001
+From: Tommy Jerry Mairo <tommy.mairo(a)gmail.com>
+Date: Sun, 4 Feb 2018 12:42:00 -0800
+Subject: [PATCH] Bugfix: API mismatch with crypto++ 6.0.0
+
+---
+ src/ClientCreditsList.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ClientCreditsList.cpp b/src/ClientCreditsList.cpp
+index 3bea9fe2d..a7ae1e34c 100644
+--- a/src/ClientCreditsList.cpp
++++ b/src/ClientCreditsList.cpp
+@@ -312,7 +312,7 @@ void CClientCreditsList::InitalizeCrypting()
+ // calculate and store public key
+ CryptoPP::RSASSA_PKCS1v15_SHA_Verifier pubkey(*static_cast<CryptoPP::RSASSA_PKCS1v15_SHA_Signer *>(m_pSignkey));
+ CryptoPP::ArraySink asink(m_abyMyPublicKey, 80);
+- pubkey.DEREncode(asink);
++ pubkey.AccessMaterial().Save(asink);
+ m_nMyPublicKeyLen = asink.TotalPutLength();
+ asink.MessageEnd();
+ } catch (const CryptoPP::Exception& e) {
6 years, 11 months
[audacity-freeworld] remove (debug) echo grep
by Sérgio M. Basto
commit 48eff4e8b36a5f2d72fb63900fdb93af2f208ff9
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Feb 26 03:48:44 2018 +0000
remove (debug) echo grep
audacity-freeworld.spec | 1 -
1 file changed, 1 deletion(-)
---
diff --git a/audacity-freeworld.spec b/audacity-freeworld.spec
index 7f999cf..37704da 100644
--- a/audacity-freeworld.spec
+++ b/audacity-freeworld.spec
@@ -123,7 +123,6 @@ do
diff $i.tmp $i -s || :
rm $i.tmp
done
-echo grep
grep -q -s __RPM_LIB * -R && exit 1
# Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
6 years, 11 months
[audacity-freeworld] Remove obsolete scriptlets
by Sérgio M. Basto
commit 172e3661a80a9170316902af638b55c532d73e90
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Feb 26 03:25:03 2018 +0000
Remove obsolete scriptlets
and a little better scriptlet
audacity-freeworld.spec | 22 ++--------------------
1 file changed, 2 insertions(+), 20 deletions(-)
---
diff --git a/audacity-freeworld.spec b/audacity-freeworld.spec
index 459eeed..7f999cf 100644
--- a/audacity-freeworld.spec
+++ b/audacity-freeworld.spec
@@ -144,7 +144,7 @@ done
export WX_CONFIG=wx-config-3.0-gtk2
%endif
-%if %{with compat_ffmpeg}
+%if %{with ffmpeg} && %{with compat_ffmpeg}
export PKG_CONFIG_PATH=%{_libdir}/compat-ffmpeg28/pkgconfig
%endif
@@ -238,25 +238,6 @@ cp -pr lib-src/libnyquist/nyquist/license.txt %{buildroot}%{_datadir}/doc/%{real
cp -pr lib-src/libnyquist/nyquist/Readme.txt %{buildroot}%{_datadir}/doc/%{realname}/nyquist
rm %{buildroot}%{_datadir}/doc/%{realname}/LICENSE.txt
-%post
-update-desktop-database &> /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-touch --no-create %{_datadir}/mime/packages &> /dev/null || :
-
-%postun
-update-desktop-database &> /dev/null || :
-if [ $1 -eq 0 ] ; then
- touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
- touch --no-create %{_datadir}/mime/packages &> /dev/null || :
- update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
-fi
-
-%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
-
-
%files -f %{realname}.lang
%{_bindir}/%{realname}
%dir %{_datadir}/%{realname}
@@ -276,6 +257,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog
* Mon Feb 26 2018 Sérgio Basto <sergio(a)serjux.com> - 2.2.2-3
- Restore remove after configure
+- Remove obsolete scriptlets
* Sun Feb 25 2018 Sérgio Basto <sergio(a)serjux.com> - 2.2.2-2
- Use compat-ffmpeg28 on Fedora 28+
6 years, 11 months
[audacity-freeworld] Restore remove after configure
by Sérgio M. Basto
commit 7a6b86126e9f91443836557f1be60473c52cd46c
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Feb 26 03:13:18 2018 +0000
Restore remove after configure
...-60f2322055756e8cacfe96530a12c63e9694482c.patch | 50 ----------------------
audacity-freeworld.spec | 30 +++++++------
2 files changed, 16 insertions(+), 64 deletions(-)
---
diff --git a/audacity-freeworld.spec b/audacity-freeworld.spec
index 67edcce..459eeed 100644
--- a/audacity-freeworld.spec
+++ b/audacity-freeworld.spec
@@ -15,7 +15,7 @@
Name: audacity-freeworld
Version: 2.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Multitrack audio editor
Group: Applications/Multimedia
License: GPLv2
@@ -138,18 +138,6 @@ done
%patch3 -p1 -b .desktop
%patch4 -p1 -b .non-dl-ffmpeg
-# ensure we use the system headers for these, note we do this after
-# configure as it wants to run sub-configures in these dirs
-#in ffmpeg FileDialog lame libnyquist libsndfile libsoxr libvamp lv2 portburn portmidi portmixer portsmf sbsms twolame; do
-
-# http://rglinuxtech.com/?p=2093
-#--enable-shared --with-ffmpeg --with-lame --with-libflac --with-libid3tag --with-libmad --with-libtwolame
-#--with-libvorbis --with-lv2 --with-portaudio=local --with-midi --with-portmidi
-
-for i in %{!?with_local_ffmpeg:ffmpeg} lame libsndfile libsoxr libvamp twolame; do
- rm -r lib-src/$i
-done
-
%build
%if (0%{?fedora} && 0%{?fedora} < 28)
@@ -206,6 +194,17 @@ autoconf
%{nil}
%endif
+# http://rglinuxtech.com/?p=2093
+#--enable-shared --with-ffmpeg --with-lame --with-libflac --with-libid3tag --with-libmad --with-libtwolame
+#--with-libvorbis --with-lv2 --with-portaudio=local --with-midi --with-portmidi
+
+# ensure we use the system headers for these, note we do this after
+# configure as it wants to run sub-configures in these dirs
+#in ffmpeg FileDialog lame libnyquist libsndfile libsoxr libvamp lv2 portburn portmidi portmixer portsmf sbsms twolame; do
+for i in %{!?with_local_ffmpeg:ffmpeg} lame libsndfile libsoxr libvamp twolame; do
+ rm -r lib-src/$i
+done
+
%make_build
@@ -275,8 +274,11 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog
+* Mon Feb 26 2018 Sérgio Basto <sergio(a)serjux.com> - 2.2.2-3
+- Restore remove after configure
+
* Sun Feb 25 2018 Sérgio Basto <sergio(a)serjux.com> - 2.2.2-2
-- Use compat-ffmpeg28
+- Use compat-ffmpeg28 on Fedora 28+
- Also add conditionals to be possible build with local ffmpeg (not in use)
- Use autoconf before ./configure
- Readd libmp3lame-default.patch and libdir.patch
6 years, 11 months
[amule/f26] (7 commits) ...Update changelog
by Nicolas Chauvet
Summary of changes:
3eb96b9... - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass (*)
a0be9aa... Disable xchat amule (*)
f75a6f0... Update changelog (*)
b7de23a... Add obsoletes/provides (*)
3f20d90... Clean up spec (*)
cbd1363... Spec clean-up and rebuilt for cryptopp (*)
8dc2b52... Update changelog (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 11 months
[amule/f27] (3 commits) ...Update changelog
by Nicolas Chauvet
Summary of changes:
3f20d90... Clean up spec (*)
cbd1363... Spec clean-up and rebuilt for cryptopp (*)
8dc2b52... Update changelog (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 11 months
[amule] Update changelog
by Nicolas Chauvet
commit 8dc2b528d92489d8db784d720bb1f1df122c0cfc
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sun Feb 25 18:57:18 2018 +0100
Update changelog
amule.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/amule.spec b/amule.spec
index 6be9062..a92df5d 100644
--- a/amule.spec
+++ b/amule.spec
@@ -7,7 +7,7 @@
Name: amule
Version: 2.3.2
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: File sharing client compatible with eDonkey
License: GPLv2+
Source0: https://github.com/amule-project/amule/archive/%{version}/%{name}-%{versi...
@@ -142,6 +142,9 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/COPYING
%changelog
+* Sun Feb 25 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3.2-9
+- Spec clean-up and rebuilt for cryptopp
+
* Tue Feb 06 2018 Sérgio Basto <sergio(a)serjux.com> - 2.3.2-8
- Clean up spec
6 years, 11 months
[audacity-freeworld] Comment BR portmidi-devel and remove no-local-includes.patch
by Sérgio M. Basto
commit 559e6b4295c768e589a87b3a45314b9ccddbca9a
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Feb 25 12:41:51 2018 +0000
Comment BR portmidi-devel and remove no-local-includes.patch
audacity-2.2.0-no-local-includes.patch | 13 -------------
audacity-freeworld.spec | 5 ++---
2 files changed, 2 insertions(+), 16 deletions(-)
---
diff --git a/audacity-freeworld.spec b/audacity-freeworld.spec
index 37c13e2..67edcce 100644
--- a/audacity-freeworld.spec
+++ b/audacity-freeworld.spec
@@ -42,7 +42,6 @@ Patch2: audacity-2.2.1-libdir.patch
# add categories Sequencer X-Jack AudioVideoEditing for F-12 Studio feature
Patch3: audacity-2.0.2-desktop.in.patch
Patch4: audacity-2.0.6-non-dl-ffmpeg.patch
-Patch5: audacity-2.2.0-no-local-includes.patch
Provides: audacity-nonfree = %{version}-%{release}
Obsoletes: audacity-nonfree < %{version}-%{release}
@@ -71,7 +70,7 @@ BuildRequires: libvorbis-devel
#BuildRequires: portaudio-devel >= 19-16
#checking for PORTMIDI... no
#configure: portmidi library is NOT available as system library
-BuildRequires: portmidi-devel
+#BuildRequires: portmidi-devel
BuildRequires: soundtouch-devel
BuildRequires: soxr-devel
BuildRequires: vamp-plugin-sdk-devel >= 2.0
@@ -138,7 +137,6 @@ done
%patch3 -p1 -b .desktop
%patch4 -p1 -b .non-dl-ffmpeg
-%patch5 -p1 -b .nolocal
# ensure we use the system headers for these, note we do this after
# configure as it wants to run sub-configures in these dirs
@@ -284,6 +282,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
- Readd libmp3lame-default.patch and libdir.patch
- Readd to configure --disable-dynamic-loading
- General review of spec
+- Comment BR portmidi-devel and remove no-local-includes.patch
* Thu Feb 22 2018 Sérgio Basto <sergio(a)serjux.com> - 2.2.2-1
- Update to 2.2.2
6 years, 11 months
