[arcem] Remove not needed dependency (BZ #6022) Clean up
by Andrea Musuruane
commit f6754bcb3fa6b50f1326da013786515daf30b68c
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Mon Aug 9 11:21:22 2021 +0200
Remove not needed dependency (BZ #6022)
Clean up
arcem.spec | 35 +++++++++++------------------------
1 file changed, 11 insertions(+), 24 deletions(-)
---
diff --git a/arcem.spec b/arcem.spec
index bb9f812..34e996e 100644
--- a/arcem.spec
+++ b/arcem.spec
@@ -1,6 +1,6 @@
Name: arcem
Version: 1.50.2
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Highly portable Acorn Archimedes emulator
License: GPLv2+
@@ -28,7 +28,6 @@ BuildRequires: libicns-utils
BuildRequires: libappstream-glib
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
-Requires: xorg-x11-apps
%description
ArcEm is a Acorn Archimedes A400 hardware emulator that is highly portable. As
@@ -56,8 +55,8 @@ find . -type f -name "*.c" -exec chmod 644 {} \;
%build
-export CFLAGS="%{optflags}"
-make %{?_smp_mflags} SOUND_SUPPORT=yes
+%set_build_flags
+%make_build SOUND_SUPPORT=yes
%install
@@ -96,26 +95,10 @@ desktop-file-install \
%{SOURCE5}
# Install appdata
-install -d %{buildroot}%{_datadir}/appdata
-install -p -m 0644 %{SOURCE6} \
- %{buildroot}%{_datadir}/appdata
+install -d %{buildroot}%{_metainfodir}
+install -p -m 0644 %{SOURCE6} %{buildroot}%{_metainfodir}
appstream-util validate-relax --nonet \
- %{buildroot}%{_datadir}/appdata/*.appdata.xml
-
-
-%post
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-
-%postun
-if [ $1 -eq 0 ] ; then
- /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+ %{buildroot}%{_metainfodir}/%{name}.appdata.xml
%files
@@ -124,12 +107,16 @@ fi
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
-%{_datadir}/appdata/%{name}.appdata.xml
+%{_metainfodir}/%{name}.appdata.xml
%doc docs/5thColumn.txt manual.html README_arcem.Fedora
%license docs/COPYING
%changelog
+* Mon Aug 09 2021 Andrea Musuruane <musuruan(a)gmail.com> - 1.50.2-11
+- Remove not needed dependency (BZ #6022)
+- Clean up
+
* Mon Aug 02 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.50.2-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
3 years, 3 months
[OpenEXR_Viewers-nonfree] Rebase dso patch
by Nicolas Chauvet
commit 2e089c0c7549ab58a0031ec1986af117e51b2614
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sun Aug 8 19:01:27 2021 +0200
Rebase dso patch
openexr_viewers-2.0.1-dso.patch | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/openexr_viewers-2.0.1-dso.patch b/openexr_viewers-2.0.1-dso.patch
index d4b684b..1409bed 100644
--- a/openexr_viewers-2.0.1-dso.patch
+++ b/openexr_viewers-2.0.1-dso.patch
@@ -1,7 +1,6 @@
-diff -up openexr_viewers-2.0.1/configure.ac.dso openexr_viewers-2.0.1/configure.ac
---- openexr_viewers-2.0.1/configure.ac.dso 2013-06-18 15:58:29.000000000 -0500
-+++ openexr_viewers-2.0.1/configure.ac 2013-10-11 14:15:38.870351295 -0500
-@@ -75,6 +75,18 @@ AM_PATH_PKGCONFIG(
+--- a/configure.ac
++++ b/configure.ac
+@@ -77,6 +77,18 @@ AM_PATH_PKGCONFIG(
[-lIlmImfCtl -lIlmImf -lz -lImath -lHalf -lIex -lIlmThread -lpthread -lIlmCtlSimd -lIlmCtlMath -lIlmCtl],
[openexrctl-prefix])
@@ -18,11 +17,10 @@ diff -up openexr_viewers-2.0.1/configure.ac.dso openexr_viewers-2.0.1/configure.
+ [-lGL],
+ [gl-prefix])
- dnl --enable-threading
- AC_ARG_ENABLE(threading,
-diff -up openexr_viewers-2.0.1/exrdisplay/Makefile.am.dso openexr_viewers-2.0.1/exrdisplay/Makefile.am
---- openexr_viewers-2.0.1/exrdisplay/Makefile.am.dso 2013-06-18 14:51:41.000000000 -0500
-+++ openexr_viewers-2.0.1/exrdisplay/Makefile.am 2013-10-11 14:17:07.953771623 -0500
+ dnl Enable and choose c++ standard
+ AC_ARG_ENABLE(cxxstd,
+--- a/exrdisplay/Makefile.am
++++ b/exrdisplay/Makefile.am
@@ -5,11 +5,12 @@ if HAVE_FLTK
bin_PROGRAMS = exrdisplay
3 years, 3 months
[OpenEXR_Viewers-nonfree] Update to 2.3.0
by Nicolas Chauvet
commit dc400f3fdfc9141ed47faa210d218f2b8595beb5
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sun Aug 8 18:54:37 2021 +0200
Update to 2.3.0
.gitignore | 4 +---
OpenEXR_Viewers-nonfree.spec | 37 +++++++++++++++++++++----------------
sources | 2 +-
3 files changed, 23 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1a6be83..79c4402 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-openexr_viewers-2.1.0.tar.gz
-/openexr_viewers-2.2.0.tar.gz
-/openexr_viewers-2.2.1.tar.gz
+OpenEXR_Viewers-*.tar.gz
diff --git a/OpenEXR_Viewers-nonfree.spec b/OpenEXR_Viewers-nonfree.spec
index c84c81e..36c6092 100644
--- a/OpenEXR_Viewers-nonfree.spec
+++ b/OpenEXR_Viewers-nonfree.spec
@@ -1,6 +1,4 @@
-%global _default_patch_fuzz 2
-
-# nVidia Cg toolkit is not free
+# NVIDIA Cg toolkit is not free
%define with_Cg 1
%if %with_Cg
%define real_name OpenEXR_Viewers-nonfree
@@ -12,25 +10,25 @@
%define priority 5
%endif
+%global project openexr
+
Name: %{real_name}
-Version: 2.2.1
-Release: 2%{?dist}
+Version: 2.3.0
+Release: 1%{?dist}
Summary: Viewers programs for OpenEXR
License: AMPAS BSD
URL: http://www.openexr.com
-Source0: http://download.savannah.nongnu.org/releases/openexr/openexr_viewers-%{ve...
-# missing header from ^^, should be fixed/included in subsequent releases
-Source1: namespaceAlias.h
+Source0: https://github.com/%{project}/%{project}/releases/download/v%{version}/Op...
ExclusiveArch: i686 x86_64
Patch1: openexr_viewers-2.0.1-dso.patch
-# fix ftbfs due to missing header
-Patch2: openexr_viewers-2.1.0-headers.patch
+BuildRequires: make
BuildRequires: libtool
BuildRequires: gcc-c++
+
BuildRequires: fltk-devel >= 1.1
BuildRequires: pkgconfig(OpenEXR) >= 2.1
%if %with_Cg
@@ -41,6 +39,11 @@ Provides: OpenEXR_Viewers = %{version}
BuildConflicts: Cg
%endif
+%if 0%{?openexr_ctl}
+BuildRequires: pkgconfig(OpenEXR_CTL)
+BuildRequires: OpenEXR_CTL
+Requires: OpenEXR_CTL%{?_isa}
+%endif
Requires(post): /usr/sbin/alternatives
Requires(preun): /usr/sbin/alternatives
@@ -56,8 +59,8 @@ with CTL support, applying rendering and display transforms in line with
the current discussions at the AMPAS Image Interchange Framework committee
(September 2006).
-This is the nonfree version compiled with nVidia Cg support
-See: http://developer.nvidia.com/object/cg_toolkit.html
+This is the nonfree version compiled with NVIDIA Cg support
+See: https://developer.nvidia.com/cg-toolkit
%else
%package docs
@@ -71,10 +74,8 @@ This package contains documentation files for %{name}.
%setup -q -n openexr_viewers-%{version}
%patch1 -p1 -b .dso
-cp -n %{SOURCE1} exrdisplay/namespaceAlias.h
-#patch2 -p1 -b .header
-%ifarch x86_64
+%if "%{_lib}" == "lib64"
sed -i -e 's|ACTUAL_PREFIX/lib/CTL|ACTUAL_PREFIX/lib64/CTL|' configure.ac
%endif
#Needed for patch1 and to update CTL compiler test
@@ -123,7 +124,8 @@ if [ $1 -eq 0 ]; then
fi
%files
-%doc AUTHORS ChangeLog COPYING NEWS README
+%doc ChangeLog README.md
+%license LICENSE
%ghost %{_bindir}/exrdisplay
%{_bindir}/exrdisplay%{V_suffix}
%if %with_Cg
@@ -135,6 +137,9 @@ fi
%endif
%changelog
+* Sun Aug 08 2021 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3.0-1
+- Update to 2.3.0
+
* Tue Aug 03 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
diff --git a/sources b/sources
index 57233fe..5126021 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (openexr_viewers-2.2.1.tar.gz) = f62909ee212f6333ee161885011ce8a469413e790ae31e9e25d4a8114d58f0c11284bd0bae09b2cf60122bc11ca136e839a193b4056c02ad940686c8ca1dfcaa
+SHA512 (OpenEXR_Viewers-2.3.0.tar.gz) = 2b7ce7c75733f390bec5c3f9c49edc08da2631e3a45ae20a732dddf9fd813137c3124d0c6e90450fa2b9068f0c40c76374ee7ff9cf0d8697080b2b180c624c5d
3 years, 3 months
