lkundrak pushed to usb_modeswitch (master). "New 2.5.2 release"
by notificationsï¼ fedoraproject.org
From 44f1f6829084d77c630b0a0cb268162e56750120 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Feb 28 2018 21:19:47 +0000
Subject: New 2.5.2 release
---
diff --git a/0001-Fix-crash-on-early-fail.patch b/0001-Fix-crash-on-early-fail.patch
deleted file mode 100644
index bab74dc..0000000
--- a/0001-Fix-crash-on-early-fail.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 73001792b29f080fcabc57f30d6030bedb2a24b0 Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak(a)v3.sk>
-Date: Wed, 20 Jul 2016 21:14:10 +0200
-Subject: [PATCH] Fix crash on early fail
-
-Don't uninitialize libusb if it has not been initialized yet.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1358472
----
- usb_modeswitch.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/usb_modeswitch.c b/usb_modeswitch.c
-index cbb8c28..f9c8b2e 100644
---- a/usb_modeswitch.c
-+++ b/usb_modeswitch.c
-@@ -2021,7 +2021,8 @@ void close_all()
- libusb_close(devh);
- // libusb_exit will crash on Raspbian 7, crude protection
- #ifndef __ARMEL__
-- libusb_exit(NULL);
-+ if (ctx)
-+ libusb_exit(NULL);
- #endif
- if (sysmode)
- closelog();
---
-2.7.4
-
diff --git a/0001-usb_modeswitch-count-the-target-devices-from-zero.patch b/0001-usb_modeswitch-count-the-target-devices-from-zero.patch
new file mode 100644
index 0000000..822ee72
--- /dev/null
+++ b/0001-usb_modeswitch-count-the-target-devices-from-zero.patch
@@ -0,0 +1,26 @@
+From 99cade3624c432a478e624f278692cdedf4e0450 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak(a)v3.sk>
+Date: Fri, 18 Aug 2017 10:40:41 +0200
+Subject: [PATCH] usb_modeswitch: count the target devices from zero
+
+Most likely a typo here.
+---
+ usb_modeswitch.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/usb_modeswitch.c b/usb_modeswitch.c
+index 3239946..1b3bf9d 100644
+--- a/usb_modeswitch.c
++++ b/usb_modeswitch.c
+@@ -1582,7 +1582,7 @@ int checkSuccess()
+ * description is read for syslog message
+ */
+ // Wait counter passed on from previous loop
+- for (i=i; i < CheckSuccess; i++) {
++ for (i=0; i < CheckSuccess; i++) {
+ SHOW_PROGRESS(output," Search for target devices ...\n");
+ dev = search_devices(&newTargetCount, TargetVendor, TargetProductList,
+ TargetClass, 0, SEARCH_TARGET);
+--
+2.14.3
+
diff --git a/0001-usb_modeswitch-fix-a-wrong-comparison.patch b/0001-usb_modeswitch-fix-a-wrong-comparison.patch
deleted file mode 100644
index 863e880..0000000
--- a/0001-usb_modeswitch-fix-a-wrong-comparison.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From bcb5b8702adbf568598988fccf256586b5788fcb Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak(a)v3.sk>
-Date: Fri, 18 Aug 2017 10:37:15 +0200
-Subject: [PATCH 1/2] usb_modeswitch: fix a wrong comparison
-
-The char pointer should be dereferences when checking the string is empty.
----
- usb_modeswitch.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/usb_modeswitch.c b/usb_modeswitch.c
-index b2b930b..6948a84 100644
---- a/usb_modeswitch.c
-+++ b/usb_modeswitch.c
-@@ -1707,7 +1707,7 @@ struct libusb_device* search_devices( int *numFound, int vendor, char* productLi
- *numFound = 0;
-
- /* Sanity check */
-- if (!vendor || productList == '\0')
-+ if (!vendor || *productList == '\0')
- return NULL;
-
- listcopy = malloc(strlen(productList)+1);
---
-2.13.0
-
diff --git a/0002-usb_modeswitch-count-the-target-devices-from-zero.patch b/0002-usb_modeswitch-count-the-target-devices-from-zero.patch
deleted file mode 100644
index 144d93d..0000000
--- a/0002-usb_modeswitch-count-the-target-devices-from-zero.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9d05fe0e0f6b049520d97a47d042d5cfad35b5d6 Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak(a)v3.sk>
-Date: Fri, 18 Aug 2017 10:40:41 +0200
-Subject: [PATCH 2/2] usb_modeswitch: count the target devices from zero
-
-Most likely a typo here.
----
- usb_modeswitch.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/usb_modeswitch.c b/usb_modeswitch.c
-index 6948a84..4a1fb5c 100644
---- a/usb_modeswitch.c
-+++ b/usb_modeswitch.c
-@@ -1579,7 +1579,7 @@ int checkSuccess()
- * Target device on the same bus with higher device number is returned,
- * description is read for syslog message
- */
-- for (i=i; i < CheckSuccess; i++) {
-+ for (i=0; i < CheckSuccess; i++) {
- SHOW_PROGRESS(output," Search for target devices ...\n");
- dev = search_devices(&newTargetCount, TargetVendor, TargetProductList,
- TargetClass, 0, SEARCH_TARGET);
---
-2.13.0
-
diff --git a/rhbz948451-fix-manual-pages.patch b/rhbz948451-fix-manual-pages.patch
deleted file mode 100644
index 32238b9..0000000
--- a/rhbz948451-fix-manual-pages.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/usb_modeswitch.c b/usb_modeswitch.c
-index 52598f7..cbb8c28 100644
---- a/usb_modeswitch.c
-+++ b/usb_modeswitch.c
-@@ -2060,7 +2060,8 @@ void printHelp()
- " -g, --device-num NUM system device number (for hard ID)\n"
- " -m, --message-endpoint NUM direct the message transfer there (optional)\n"
- " -M, --message-content <msg> message to send (hex number as string)\n"
-- " -2 <msg>, -3 <msg> additional messages to send (-n recommended)\n"
-+ " -2, --message-content2 <msg> additional messages to send (-n recommended)\n"
-+ " -3, --message-content3 <msg> additional messages to send (-n recommended)\n"
- " -w, --release-delay NUM wait NUM ms before releasing the interface\n"
- " -n, --need-response obsolete, no effect (always on)\n"
- " -r, --response-endpoint NUM read response from there (optional)\n"
-@@ -2084,7 +2085,7 @@ void printHelp()
- " -Q, --quiet don't show progress or error messages\n"
- " -W, --verbose print all settings and debug output\n"
- " -D, --sysmode specific result and syslog message\n"
-- " -s, --success <seconds> switching result check with timeout\n"
-+ " -s, --check-success <seconds> switching result check with timeout\n"
- " -I, --inquire obsolete, no effect\n\n"
- " -c, --config-file <filename> load long configuration from file\n\n"
- " -t, --stdinput read long configuration from stdin\n\n"
diff --git a/sources b/sources
index 33497be..f0f3584 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (usb-modeswitch-2.5.1.tar.bz2) = 23f1866cbb5882280369362f6d3e01d991136f322284d3f343da132520569f9e303cd9c4368a71893a3d959bae6bde2d4325f6dc175a1cb2d4dd5faa61add6ab
+SHA512 (usb-modeswitch-2.5.2.tar.bz2) = ad2a7e5134379664fca83b85803e52ec8e3fe3c2d6c633eb5af3c291c43b15ca4a67198612864de01d146a029ee5c475c8c7dc71d16e3a475b532837c5dd34ea
diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec
index 49cbc4f..3887da0 100644
--- a/usb_modeswitch.spec
+++ b/usb_modeswitch.spec
@@ -1,8 +1,8 @@
%define source_name usb-modeswitch
Name: usb_modeswitch
-Version: 2.5.1
-Release: 3%{?dist}
+Version: 2.5.2
+Release: 1%{?dist}
Summary: USB Modeswitch gets mobile broadband cards in operational mode
Summary(de): USB Modeswitch aktiviert UMTS-Karten
Group: Applications/System
@@ -12,16 +12,10 @@ URL: http://www.draisberghof.de/usb_modeswitch/
Source0: http://www.draisberghof.de/%{name}/%{source_name}-%{version}.tar.bz2
Source1: http://www.draisberghof.de/usb_modeswitch/device_reference.txt
-# http://www.draisberghof.de/usb_modeswitch/bb/viewtopic.php?f=2&t=2546
-Patch0: rhbz948451-fix-manual-pages.patch
# Submitted upstream (2014-11-24)
-Patch1: device_reference-utf8.patch
-# http://www.draisberghof.de/usb_modeswitch/bb/viewtopic.php?f=2&t=2556
-Patch2: 0001-Fix-crash-on-early-fail.patch
-# http://www.draisberghof.de/usb_modeswitch/bb/viewtopic.php?f=2&t=2732
-Patch3: 0001-usb_modeswitch-fix-a-wrong-comparison.patch
+Patch0: device_reference-utf8.patch
# http://www.draisberghof.de/usb_modeswitch/bb/viewtopic.php?f=2&t=2733
-Patch4: 0002-usb_modeswitch-count-the-target-devices-from-zero.patch
+Patch1: 0001-usb_modeswitch-count-the-target-devices-from-zero.patch
BuildRequires: libusbx-devel
BuildRequires: jimtcl-devel
@@ -47,11 +41,8 @@ Vodafone, Option, ZTE und Novatell werden unterstützt.
%setup -q -n %{source_name}-%{version}
cp -f %{SOURCE1} device_reference.txt
-%patch0 -p1 -b .manpage
-%patch1 -p0 -b .utf8
-%patch2 -p1 -b .libusb_exit
-%patch3 -p1 -b .char_deref
-%patch4 -p1 -b .zero_iter
+%patch0 -p0
+%patch1 -p1
%build
@@ -79,6 +70,9 @@ make install \
%changelog
+* Wed Feb 28 2018 Lubomir Rintel <lkundrak(a)v3.sk> - 2.5.2-1
+- New 2.5.2 release
+
* Fri Feb 23 2018 Florian Weimer <fweimer(a)redhat.com> - 2.5.1-3
- Use LDFLAGS from redhat-rpm-config
https://src.fedoraproject.org/rpms/usb_modeswitch/c/44f1f6829084d77c630b0...
5Â years
tdawson pushed to rubygem-ffi (f28). "Update to FFI 1.9.23."
by notificationsï¼ fedoraproject.org
From 381efce6743f1085aba180081bbb5c5feabc106d Mon Sep 17 00:00:00 2001
From: VÃt Ondruch <vondruch(a)redhat.com>
Date: Feb 28 2018 14:39:50 +0000
Subject: Update to FFI 1.9.23.
---
diff --git a/.gitignore b/.gitignore
index 965e61a..bca864f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ ffi-ffi-b69a5e3.tar.gz
/ffi-1.9.10.gem
/ffi-1.9.14.gem
/ffi-1.9.18.gem
+/ffi-1.9.23-spec.tgz
+/ffi-1.9.23.gem
diff --git a/rubygem-ffi.spec b/rubygem-ffi.spec
index ad9b6a1..70ff1af 100644
--- a/rubygem-ffi.spec
+++ b/rubygem-ffi.spec
@@ -1,20 +1,23 @@
%global gem_name ffi
Name: rubygem-%{gem_name}
-Version: 1.9.18
-Release: 7%{?dist}
+Version: 1.9.23
+Release: 1%{?dist}
Summary: FFI Extensions for Ruby
-Group: Development/Languages
-
License: BSD
URL: http://wiki.github.com/ffi/ffi
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
-
+# git clone https://github.com/ffi/ffi.git && cd ffi
+# git checkout 1.9.23 && tar czvf ffi-1.9.23-spec.tgz spec/
+Source1: %{gem_name}-%{version}-spec.tgz
BuildRequires: ruby(release)
BuildRequires: rubygems-devel
BuildRequires: ruby-devel
+# Compiler is required for build of gem binary extension.
+# https://fedoraproject.org/wiki/Packaging:C_and_C++#BuildRequires_and_Requ...
+BuildRequires: gcc
BuildRequires: libffi-devel
-BuildRequires: rubygem(rspec2)
+BuildRequires: rubygem(rspec)
%description
Ruby-FFI is a ruby extension for programmatically loading dynamic
@@ -25,7 +28,6 @@ using Ruby-FFI here[http://wiki.github.com/ffi/ffi/why-use-ffi].
%package doc
Summary: Documentation for %{name}
-Group: Documentation
Requires: %{name} = %{version}-%{release}
BuildArch: noarch
@@ -33,15 +35,11 @@ BuildArch: noarch
Documentation for %{name}.
%prep
-gem unpack %{SOURCE0}
-
-%setup -q -D -T -n %{gem_name}-%{version}
-
-gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
+%setup -q -n %{gem_name}-%{version} -b 1
%build
# Create the gem as gem install only works on a gem file
-gem build %{gem_name}.gemspec
+gem build ../%{gem_name}-%{version}.gemspec
%gem_install
@@ -57,41 +55,42 @@ cp -a .%{gem_extdir_mri}/{gem.build_complete,*.so} %{buildroot}%{gem_extdir_mri}
rm -rf %{buildroot}%{gem_instdir}/ext/
-# Fix the permissions.
-# https://github.com/ffi/ffi/pull/545
-chmod a-x %{buildroot}%{gem_libdir}/ffi/platform/i386-cygwin/types.conf
-chmod a-x %{buildroot}%{gem_libdir}/ffi/platform/x86_64-cygwin/types.conf
-
-
%check
pushd .%{gem_instdir}
+ln -s %{_builddir}/spec spec
+
# Build the test library with Fedora build options.
pushd spec/ffi/fixtures
make JFLAGS="%{optflags}"
popd
-rspec2 -I$(dirs +1)%{gem_extdir_mri} spec
+rspec -I$(dirs +1)%{gem_extdir_mri} spec
popd
%files
%dir %{gem_instdir}
%{gem_extdir_mri}
+%exclude %{gem_instdir}/.*
%license %{gem_instdir}/COPYING
%license %{gem_instdir}/LICENSE
-%exclude %{gem_instdir}/ffi.gemspec
-%exclude %{gem_instdir}/gen
+%license %{gem_instdir}/LICENSE.SPECS
+%exclude %{gem_instdir}/appveyor.yml
%{gem_libdir}
-%exclude %{gem_instdir}/libtest
-%exclude %{gem_instdir}/spec
%exclude %{gem_cache}
%{gem_spec}
%files doc
%doc %{gem_docdir}
+%{gem_instdir}/Gemfile
%doc %{gem_instdir}/README.md
%{gem_instdir}/Rakefile
+%{gem_instdir}/samples
+%{gem_instdir}/ffi.gemspec
%changelog
+* Wed Feb 28 2018 VÃt Ondruch <vondruch(a)redhat.com> - 1.9.23-1
+- Update to FFI 1.9.23.
+
* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.9.18-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
diff --git a/sources b/sources
index 8ad3756..5d6b82a 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (ffi-1.9.18.gem) = 957bdda13eb84bcda43280ee6025f13c6cff8b14090079f7bbb1296e13082c4d6027c25de2b0c6e1f9d9c2f020ef66d1e6db2c5d9cfa50e828e146ab83e7a6d9
+SHA512 (ffi-1.9.23-spec.tgz) = c0d27b851674806f45a3986a67213687e6fee0bca35edbac29c6abd3f3a32206865ff06fc9f6ba6128e5dd8703de315e63364148447adfc74653d66ce9320a75
+SHA512 (ffi-1.9.23.gem) = 6e4400872e5ea0b27a1406a334fd0aa1802c2fc0b99c41302369666da74991b8ee66ce1be08d2526e8c22e803d6f43a3181f4628d9bc87eccb572fb591c14b5f
https://src.fedoraproject.org/rpms/rubygem-ffi/c/381efce6743f1085aba18008...
5Â years
crobinso pushed to virt-manager (f28). "Update Python 2 dependency
declarations to new packaging standards"
by notificationsï¼ fedoraproject.org
From e0df8a8a7e1eadc9e47653363a59bf66f2f7da17 Mon Sep 17 00:00:00 2001
From: Iryna Shcherbina <shcherbina.iryna(a)gmail.com>
Date: Feb 07 2018 16:35:01 +0000
Subject: Update Python 2 dependency declarations to new packaging standards
---
diff --git a/virt-manager.spec b/virt-manager.spec
index f4c0093..3e8a7b6 100644
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -20,7 +20,7 @@
Name: virt-manager
Version: 1.5.0
-Release: 1%{?dist}
+Release: 2%{?dist}
%global verrel %{version}-%{release}
Summary: Desktop tool for managing virtual machines via libvirt
@@ -32,7 +32,7 @@ Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar
Requires: virt-manager-common = %{verrel}
-Requires: pygobject3
+Requires: python2-gobject
Requires: gtk3
Requires: libvirt-glib >= 0.0.9
Requires: dconf
@@ -73,13 +73,13 @@ Group: Applications/Emulators
# This version not strictly required: virt-manager should work with older,
# however varying amounts of functionality will not be enabled.
-Requires: libvirt-python >= 0.7.0
-Requires: libxml2-python
-Requires: python-requests
-Requires: python-ipaddr
+Requires: python2-libvirt >= 0.7.0
+Requires: python2-libxml2
+Requires: python2-requests
+Requires: python2-ipaddr
Requires: libosinfo >= 0.2.10
# Required for gobject-introspection infrastructure
-Requires: pygobject3-base
+Requires: python2-gobject-base
# Required for pulling files from iso media with isoinfo
Requires: genisoimage
@@ -213,6 +213,10 @@ rm %{buildroot}%{_datadir}/GConf/gsettings/org.virt-manager.virt-manager.convert
%changelog
+* Wed Feb 07 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 1.5.0-2
+- Update Python 2 dependency declarations to new packaging standards
+ (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
* Tue Feb 06 2018 Cole Robinson <crobinso(a)redhat.com> - 1.5.0-1
- Rebased to version 1.5.0
- python3 prep work (Radostin Stoyanov, Cole Robinson, Cédric Bosdonnat)
https://src.fedoraproject.org/rpms/virt-manager/c/e0df8a8a7e1eadc9e476533...
5Â years
crobinso pushed to virt-manager (f28). "Rebased to version 1.5.1
(..more)"
by notificationsï¼ fedoraproject.org
From fa7134895f5827dd9ac30c9976f31317bc8d62bc Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso(a)redhat.com>
Date: Feb 28 2018 20:40:42 +0000
Subject: Rebased to version 1.5.1
Fix disk/net/mem stats graphs
---
diff --git a/sources b/sources
index ba276d7..adf34eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (virt-manager-1.5.0.tar.gz) = b375927776b9132fbd9dacd8223b6c94b89c32d6812394ec7e18df7c66f7e6dec853885e85e2b4b4ffd283e8afe0dd2526bafeac4b55511a4a115ef5798f97da
+SHA512 (virt-manager-1.5.1.tar.gz) = e0da3b879ea33a8c394c33df85cadac4fbb9cfed65f9a904c5d9bf07232e29f8c96b5242e3f94cae390b7b5d7a20e1c25c3867962f0a39de40e71dc00013d32b
diff --git a/virt-manager.spec b/virt-manager.spec
index 3e8a7b6..a1a5c29 100644
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -19,8 +19,8 @@
# End local config
Name: virt-manager
-Version: 1.5.0
-Release: 2%{?dist}
+Version: 1.5.1
+Release: 1%{?dist}
%global verrel %{version}-%{release}
Summary: Desktop tool for managing virtual machines via libvirt
@@ -213,6 +213,10 @@ rm %{buildroot}%{_datadir}/GConf/gsettings/org.virt-manager.virt-manager.convert
%changelog
+* Wed Feb 28 2018 Cole Robinson <crobinso(a)redhat.com> - 1.5.1-1
+- Rebased to version 1.5.1
+- Fix disk/net/mem stats graphs
+
* Wed Feb 07 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 1.5.0-2
- Update Python 2 dependency declarations to new packaging standards
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
https://src.fedoraproject.org/rpms/virt-manager/c/fa7134895f5827dd9ac30c9...
5Â years
crobinso pushed to virt-manager (master). "Rebased to version 1.5.1
(..more)"
by notificationsï¼ fedoraproject.org
From fa7134895f5827dd9ac30c9976f31317bc8d62bc Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso(a)redhat.com>
Date: Feb 28 2018 20:40:42 +0000
Subject: Rebased to version 1.5.1
Fix disk/net/mem stats graphs
---
diff --git a/sources b/sources
index ba276d7..adf34eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (virt-manager-1.5.0.tar.gz) = b375927776b9132fbd9dacd8223b6c94b89c32d6812394ec7e18df7c66f7e6dec853885e85e2b4b4ffd283e8afe0dd2526bafeac4b55511a4a115ef5798f97da
+SHA512 (virt-manager-1.5.1.tar.gz) = e0da3b879ea33a8c394c33df85cadac4fbb9cfed65f9a904c5d9bf07232e29f8c96b5242e3f94cae390b7b5d7a20e1c25c3867962f0a39de40e71dc00013d32b
diff --git a/virt-manager.spec b/virt-manager.spec
index 3e8a7b6..a1a5c29 100644
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -19,8 +19,8 @@
# End local config
Name: virt-manager
-Version: 1.5.0
-Release: 2%{?dist}
+Version: 1.5.1
+Release: 1%{?dist}
%global verrel %{version}-%{release}
Summary: Desktop tool for managing virtual machines via libvirt
@@ -213,6 +213,10 @@ rm %{buildroot}%{_datadir}/GConf/gsettings/org.virt-manager.virt-manager.convert
%changelog
+* Wed Feb 28 2018 Cole Robinson <crobinso(a)redhat.com> - 1.5.1-1
+- Rebased to version 1.5.1
+- Fix disk/net/mem stats graphs
+
* Wed Feb 07 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 1.5.0-2
- Update Python 2 dependency declarations to new packaging standards
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
https://src.fedoraproject.org/rpms/virt-manager/c/fa7134895f5827dd9ac30c9...
5Â years
rdieter pushed to amarok (master). "use %ldconfig_scriptlets,
%_kf5_metainfodir, BR: gcc-c++"
by notificationsï¼ fedoraproject.org
From 4620fc6d76982474785c3c1fc122e5a7aed8ce01 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter(a)gmail.com>
Date: Feb 28 2018 20:24:06 +0000
Subject: use %ldconfig_scriptlets, %_kf5_metainfodir, BR: gcc-c++
---
diff --git a/amarok.spec b/amarok.spec
index cdb29e1..47267ad 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -8,7 +8,7 @@
Name: amarok
Summary: Media player
Version: 2.8.90
-Release: 18%{?dist}
+Release: 19%{?dist}
# KDE e.V. may determine that future GPL versions are accepted
License: GPLv2 or GPLv3
@@ -61,6 +61,7 @@ Patch43: 0043-Fix-appdata-add-the-required-summary-tag.patch
BuildRequires: curl-devel
BuildRequires: desktop-file-utils
+BuildRequires: gcc-c++
## non-modular MusicBrainz-based audio fingerprint tag lookup support :(
#BuildRequires: ffmpeg-devel libofa-devel
BuildRequires: gettext
@@ -136,7 +137,6 @@ Amarok is a multimedia player with:
%package libs
Summary: Runtime libraries for %{name}
Requires: %{name} = %{version}-%{release}
-%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
%description libs
%{summary}.
@@ -219,9 +219,11 @@ make %{?_smp_mflags} -C %{_target_platform}
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
# appdata/metainfo
-mkdir -p %{buildroot}%{_kde4_datadir}/appdata/
+%if "%{_kde4_datadir}/metainfo" != "%{kf5_metainfodir}"
+mkdir -p %{buildroot}%{_kf5_metainfodir}
mv %{buildroot}%{_kde4_datadir}/metainfo/*.xml \
- %{buildroot}%{_kde4_datadir}/appdata/
+ %{buildroot}%{_kf5_metainfodir}
+%endif
# NoDisplay Amazon Downloader in menus
desktop-file-edit \
@@ -251,7 +253,7 @@ rm -fv %{buildroot}%{_kde4_libdir}/libamarok{-sqlcollection,_taglib,core,lib,pla
%check
%if 0%{?fedora} > 20
-appstream-util validate-relax --nonet %{buildroot}%{_kde4_datadir}/appdata/*%{name}.appdata.xml
+appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.%{name}.appdata.xml
%endif
desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/*amarok.desktop
desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/*amarok_containers.desktop
@@ -277,7 +279,7 @@ grep '^NoDisplay' %{buildroot}%{_kde4_datadir}/applications/kde4/amzdownloader.d
%{_kde4_configdir}/amarok.knsrc
%{_kde4_configdir}/amarok_homerc
%{_kde4_configdir}/amarokapplets.knsrc
-%{_kde4_datadir}/appdata/*%{name}.appdata.xml
+%{_kf5_metainfodir}/org.kde.%{name}.appdata.xml
%{_kde4_datadir}/applications/kde4/*amarok.desktop
%{_kde4_datadir}/applications/kde4/*amarok_containers.desktop
%{_kde4_datadir}/applications/kde4/amzdownloader.desktop
@@ -332,8 +334,7 @@ grep '^NoDisplay' %{buildroot}%{_kde4_datadir}/applications/kde4/amzdownloader.d
%{_datadir}/dbus-1/interfaces/*.xml
%{_datadir}/mime/packages/amzdownloader.xml
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+%ldconfig_scriptlets libs
%files libs
%{_kde4_libdir}/libamarokcore.so.1*
@@ -362,6 +363,9 @@ grep '^NoDisplay' %{buildroot}%{_kde4_datadir}/applications/kde4/amzdownloader.d
%changelog
+* Wed Feb 28 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 2.8.90-19
+- use %%ldconfig_scriptlets, %%_kf5_metainfodir, BR: gcc-c++
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.8.90-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
https://src.fedoraproject.org/rpms/amarok/c/4620fc6d76982474785c3c1fc122e...
5Â years