[ffmpeg/f25] Add support for LibOpenJPEG v2.2
by Leigh Scott
commit df489076ac354342c5a4892e54bb6b71ed13a84c
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Sep 2 11:50:04 2017 +0100
Add support for LibOpenJPEG v2.2
LibOpenJPEG-2.2.patch | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++
ffmpeg.spec | 8 ++++-
2 files changed, 102 insertions(+), 1 deletion(-)
---
diff --git a/LibOpenJPEG-2.2.patch b/LibOpenJPEG-2.2.patch
new file mode 100644
index 0000000..8ea7c6b
--- /dev/null
+++ b/LibOpenJPEG-2.2.patch
@@ -0,0 +1,95 @@
+--- a/configure
++++ b/configure
+@@ -1826,6 +1826,7 @@
+ machine_ioctl_meteor_h
+ malloc_h
+ opencv2_core_core_c_h
++ openjpeg_2_2_openjpeg_h
+ openjpeg_2_1_openjpeg_h
+ openjpeg_2_0_openjpeg_h
+ openjpeg_1_5_openjpeg_h
+@@ -5675,7 +5676,9 @@
+ require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
+ require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
+ enabled libopenh264 && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
+-enabled libopenjpeg && { { check_lib2 openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
++enabled libopenjpeg && { { check_lib2 openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
++ check_lib2 openjpeg-2.2/openjpeg.h opj_version -lopenjp2 ||
++ { check_lib2 openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
+ check_lib2 openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
+ { check_lib2 openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
+ { check_lib2 openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
+
+--- a/libavcodec/libopenjpegdec.c
++++ b/libavcodec/libopenjpegdec.c
+@@ -34,7 +34,9 @@
+ #include "internal.h"
+ #include "thread.h"
+
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H
++# include <openjpeg-2.2/openjpeg.h>
++#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
+ # include <openjpeg-2.1/openjpeg.h>
+ #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
+ # include <openjpeg-2.0/openjpeg.h>
+@@ -44,7 +46,7 @@
+ # include <openjpeg.h>
+ #endif
+
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
+ # define OPENJPEG_MAJOR_VERSION 2
+ # define OPJ(x) OPJ_##x
+ #else
+@@ -429,7 +431,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
+ opj_stream_set_read_function(stream, stream_read);
+ opj_stream_set_skip_function(stream, stream_skip);
+ opj_stream_set_seek_function(stream, stream_seek);
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
+ opj_stream_set_user_data(stream, &reader, NULL);
+ #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
+ opj_stream_set_user_data(stream, &reader);
+diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c
+index 4a12729..b67e533 100644
+--- a/libavcodec/libopenjpegenc.c
++++ b/libavcodec/libopenjpegenc.c
+@@ -32,7 +32,9 @@
+ #include "avcodec.h"
+ #include "internal.h"
+
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H
++# include <openjpeg-2.2/openjpeg.h>
++#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
+ # include <openjpeg-2.1/openjpeg.h>
+ #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
+ # include <openjpeg-2.0/openjpeg.h>
+@@ -42,7 +44,7 @@
+ # include <openjpeg.h>
+ #endif
+
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
+ # define OPENJPEG_MAJOR_VERSION 2
+ # define OPJ(x) OPJ_##x
+ #else
+@@ -306,7 +308,7 @@ static av_cold int libopenjpeg_encode_init(AVCodecContext *avctx)
+
+ opj_set_default_encoder_parameters(&ctx->enc_params);
+
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
+ switch (ctx->cinema_mode) {
+ case OPJ_CINEMA2K_24:
+ ctx->enc_params.rsiz = OPJ_PROFILE_CINEMA_2K;
+@@ -771,7 +773,7 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
+ opj_stream_set_write_function(stream, stream_write);
+ opj_stream_set_skip_function(stream, stream_skip);
+ opj_stream_set_seek_function(stream, stream_seek);
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
+ opj_stream_set_user_data(stream, &writer, NULL);
+ #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
+ opj_stream_set_user_data(stream, &writer);
diff --git a/ffmpeg.spec b/ffmpeg.spec
index a523922..778dc02 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -20,7 +20,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 3.1.10
-Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 2%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr} || 0%{?_with_gmp}
License: GPLv3+
%else
@@ -32,6 +32,8 @@ Source0: %{name}-%{?branch}%{date}.tar.bz2
%else
Source0: http://ffmpeg.org/releases/%{name}-%{version}.tar.xz
%endif
+# Patch based on https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/078322f33ced4b2db6ac3e5002...
+Patch0: LibOpenJPEG-2.2.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
BuildRequires: bzip2-devel
%{?_with_faac:BuildRequires: faac-devel}
@@ -232,6 +234,7 @@ echo "git-snapshot-%{?branch}%{date}-RPMFusion" > VERSION
%else
%setup -q
%endif
+%patch0 -p1
# fix -O3 -g in host_cflags
sed -i "s|check_host_cflags -O3|check_host_cflags $RPM_OPT_FLAGS|" configure
mkdir -p _doc/examples
@@ -329,6 +332,9 @@ install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
%changelog
+* Thu Aug 31 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.1.10-2
+- Add support for LibOpenJPEG v2.2
+
* Mon Aug 07 2017 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.1.10-1
- Updated to 3.1.10
6 years, 8 months
[pianobar] Disable debuginfo
by Leigh Scott
commit bbb0637d9d9eadc57f2c8c35d54f1b489c4f5329
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Sep 1 17:36:04 2017 +0100
Disable debuginfo
pianobar.spec | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/pianobar.spec b/pianobar.spec
index f0b137f..e54b009 100644
--- a/pianobar.spec
+++ b/pianobar.spec
@@ -1,11 +1,13 @@
+%global debug_package %{nil}
+
Name: pianobar
Version: 2016.06.02
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Console-based client for Pandora
License: MIT
-URL: http://6xq.net/pianobar/
-Source0: https://6xq.net/pianobar/%{name}-%{version}.tar.bz2
+URL: https://6xq.net/pianobar/
+Source0: %url/%{name}-%{version}.tar.bz2
BuildRequires: gnutls-devel
BuildRequires: libao-devel
@@ -37,7 +39,7 @@ touch configure
%build
-make %{?_smp_mflags} V=1
+%make_build V=1
%install
@@ -52,6 +54,9 @@ make %{?_smp_mflags} V=1
%changelog
+* Fri Sep 01 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2016.06.02-4
+- Disable debuginfo
+
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 2016.06.02-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
6 years, 8 months
[scottfree] Disable debuginfo
by Leigh Scott
commit ce26100e9c507bdd35880b75cd742769b0c29c92
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Sep 1 17:29:12 2017 +0100
Disable debuginfo
scottfree.spec | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
---
diff --git a/scottfree.spec b/scottfree.spec
index 67f4f77..357dff6 100644
--- a/scottfree.spec
+++ b/scottfree.spec
@@ -1,12 +1,14 @@
+%global debug_package %{nil}
+
Summary: Interpreter for Scott Adams format text adventure games
-Name: scottfree
+Name: scottfree
Version: 1.14
-Release: 10%{?dist}
+Release: 11%{?dist}
License: GPLv2+
-Group: Amusements/Games
-Source: ftp://ftp.gmd.de/if-archive/scott-adams/ScottFree.tar.gz
-Patch: scottfree-1.14.diff
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Group: Amusements/Games
+Source: ftp://ftp.gmd.de/if-archive/scott-adams/ScottFree.tar.gz
+Patch: scottfree-1.14.diff
+
BuildRequires: ncurses-devel
%description
@@ -17,26 +19,23 @@ Most Adventure International Games are distributed as shareware and are
available from ftp://ftp.gmd.de/if-archive/scott-adams/
%prep
-%setup -q -c
-%patch -p1
+%autosetup -c -p1
chmod 644 *
%build
-make %{?_smp_mflags}
+%make_build
%install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
-
-%clean
-rm -rf %{buildroot}
+%make_install
%files
-%defattr(-,root,root)
%{_bindir}/scottfree
%doc README Definition
%changelog
+* Fri Sep 01 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1.14-11
+- Disable debuginfo
+
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 1.14-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
6 years, 8 months
[amrnb] Fix SOURCE1
by Nicolas Chauvet
commit 9b6ed5f14ee43786600e2c18d5f9a0ee1682274e
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Sep 1 17:56:59 2017 +0200
Fix SOURCE1
amrnb.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/amrnb.spec b/amrnb.spec
index 7dc3f13..709f1b0 100644
--- a/amrnb.spec
+++ b/amrnb.spec
@@ -37,7 +37,7 @@ developing applications that use %{name}.
%prep
%setup -q
-cp -p %{SOURCE0} .
+cp -p %{SOURCE1} .
%build
6 years, 8 months
[amrnb] fixup
by Nicolas Chauvet
commit 3d3e76b4a24039fc4a10f93fb14f6c8082dd290f
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Sep 1 17:50:10 2017 +0200
fixup
amrnb.spec | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/amrnb.spec b/amrnb.spec
index 91d0dda..7dc3f13 100644
--- a/amrnb.spec
+++ b/amrnb.spec
@@ -7,7 +7,7 @@ License: Distributable
URL: http://www.penguin.cz/~utx/amr
Source0: http://ftp.penguin.cz/pub/users/utx/amr/%{name}-%{version}.tar.bz2
Source1: http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-b00.zip
-BuildRequires: wget unzip
+BuildRequires: unzip
%description
Adaptive Multi-Rate Narrow-Band decoder and encoder library.
@@ -44,12 +44,12 @@ cp -p %{SOURCE0} .
%configure --disable-static
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-make %{?_smp_mflags}
+%make_build
%install
-make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+%make_install
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
%post -p /sbin/ldconfig
@@ -58,7 +58,8 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%files
-%doc AUTHORS ChangeLog COPYING NEWS README TODO readme.txt
+%doc AUTHORS ChangeLog NEWS README TODO readme.txt
+%license COPYING
%{_libdir}/*.so.*
%files tools
6 years, 8 months
[amrnb] Avoid wget hack
by Nicolas Chauvet
commit 7ce5451e805cddae8298736e8967de6bece89b8d
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Sep 1 17:46:43 2017 +0200
Avoid wget hack
.gitignore | 1 +
amrnb.spec | 10 ++++++----
sources | 1 +
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3a2ae6b..c14e02d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
amrnb-11.0.0.0.tar.bz2
+/26104-b00.zip
diff --git a/amrnb.spec b/amrnb.spec
index f3da28f..91d0dda 100644
--- a/amrnb.spec
+++ b/amrnb.spec
@@ -1,11 +1,12 @@
Name: amrnb
Version: 11.0.0.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Adaptive Multi-Rate (AMR) Speech Codec
Group: System Environment/Libraries
License: Distributable
URL: http://www.penguin.cz/~utx/amr
Source0: http://ftp.penguin.cz/pub/users/utx/amr/%{name}-%{version}.tar.bz2
+Source1: http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-b00.zip
BuildRequires: wget unzip
%description
@@ -36,9 +37,7 @@ developing applications that use %{name}.
%prep
%setup -q
-# Note we do the wget ourselves so that we can use in IP in the URL as there
-# is no /etc/resolv.conf in the buildroot
-wget ftp://195.238.226.35/Specs/archive/26_series/26.104/26104-b00.zip
+cp -p %{SOURCE0} .
%build
@@ -71,6 +70,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%changelog
+* Fri Sep 01 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 11.0.0.0-5
+- Avoid wget hack
+
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 11.0.0.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/sources b/sources
index 2265e3a..0021f73 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
+b88fd1ca1fd23e24be1cc70f3227b3e1 26104-b00.zip
673ab645f61d1c830b6429a5ba76bb1f amrnb-11.0.0.0.tar.bz2
6 years, 8 months
[amrwb] Stop using wget to fetch
by Leigh Scott
commit 592b0b6d491954855c55df9342475a760706b782
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Sep 1 13:28:07 2017 +0100
Stop using wget to fetch
.gitignore | 1 +
amrwb.spec | 21 ++++++++++++---------
sources | 1 +
3 files changed, 14 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 28c6dcc..53aa83e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
amrwb-11.0.0.0.tar.bz2
+/26204-b00.zip
diff --git a/amrwb.spec b/amrwb.spec
index 067f9e9..3727823 100644
--- a/amrwb.spec
+++ b/amrwb.spec
@@ -1,12 +1,13 @@
Name: amrwb
Version: 11.0.0.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Adaptive Multi-Rate - Wideband (AMR-WB) Speech Codec
Group: System Environment/Libraries
License: Distributable
URL: http://www.penguin.cz/~utx/amr
Source0: http://ftp.penguin.cz/pub/users/utx/amr/%{name}-%{version}.tar.bz2
-BuildRequires: wget unzip
+Source1: http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-b00.zip
+BuildRequires: unzip
%description
Adaptive Multi-Rate Wideband decoder and encoder library.
@@ -36,20 +37,18 @@ developing applications that use %{name}.
%prep
%setup -q
-# Note we do the wget ourselves so that we can use in IP in the URL as there
-# is no /etc/resolv.conf in the buildroot
-wget ftp://195.238.226.35/Specs/archive/26_series/26.204/26204-b00.zip
+cp %{SOURCE1} .
%build
%configure --disable-static
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-make %{?_smp_mflags}
+%make_build
%install
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
@@ -59,18 +58,22 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%files
-%doc AUTHORS ChangeLog COPYING NEWS README TODO readme.txt
+%doc AUTHORS ChangeLog NEWS README TODO readme.txt
+%license COPYING
%{_libdir}/*.so.*
%files tools
%{_bindir}/*
%files devel
-%{_includedir}/amrwb
+%{_includedir}/amrwb/
%{_libdir}/*.so
%changelog
+* Fri Sep 01 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 11.0.0.0-5
+- Stop using wget to fetch
+
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 11.0.0.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/sources b/sources
index 3af3f3f..2dbc805 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
f9ea63e6f8b778fe1040f73891ba3720 amrwb-11.0.0.0.tar.bz2
+9fd5a681beb11277ce370deafa4a494d 26204-b00.zip
6 years, 8 months
[xmms-mplayer] Fix build issue
by Leigh Scott
commit 3ffe362816519150b9c1cc44e20ff0c63f743204
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Sep 1 12:29:23 2017 +0100
Fix build issue
xmms-mplayer.spec | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
---
diff --git a/xmms-mplayer.spec b/xmms-mplayer.spec
index 97f2eb4..138d15b 100644
--- a/xmms-mplayer.spec
+++ b/xmms-mplayer.spec
@@ -1,12 +1,12 @@
Name: xmms-mplayer
Summary: MPlayer plugin for XMMS
Version: 0.5
-Release: 9%{?dist}
+Release: 10%{?dist}
License: GPL+
Group: Applications/Multimedia
URL: http://xmmsmplayer.sourceforge.net
Source: http://downloads.sourceforge.net/xmmsmplayer/xmmsmplayer-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
BuildRequires: libtool
BuildRequires: xmms-devel
Requires: mplayer
@@ -30,29 +30,25 @@ autoconf
libtoolize --force
automake --add-missing
-# Check if there's anything new:
-[ -s NEWS ] && exit 1
-
%build
%configure
-make %{?_smp_mflags}
+%make_build
%install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} INSTALL="install -p"
+%make_install
# Kill .la files
rm -f %{buildroot}%{_libdir}/xmms/Input/*.la
-%clean
-rm -rf %{buildroot}
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
+%files
+%doc AUTHORS ChangeLog README
+%license COPYING
%{_libdir}/xmms/Input/libxmmsmplayer.*
%changelog
+* Fri Sep 01 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 0.5-10
+- Fix build issue
+
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 0.5-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
6 years, 8 months
[osmose] Disable debuginfo
by Leigh Scott
commit 5a99e7986caf3a6d4bcd6e92d75327958c1db8dc
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Sep 1 12:02:46 2017 +0100
Disable debuginfo
osmose.spec | 27 ++++++++++++---------------
1 file changed, 12 insertions(+), 15 deletions(-)
---
diff --git a/osmose.spec b/osmose.spec
index cdd7d74..85961a6 100644
--- a/osmose.spec
+++ b/osmose.spec
@@ -1,9 +1,10 @@
-%define pkgname Osmose
+%global debug_package %{nil}
+%global pkgname Osmose
%define pkgversion %(echo %version|sed s/\\\\\./-/g)
Name: osmose
Version: 0.9.96
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: A Sega Master System / Game Gear emulator
Group: Applications/Emulators
@@ -15,7 +16,6 @@ Source1: %{name}.desktop
Patch0: %{name}-0.9.96-usesystemlibraries.patch
# Fix building with gcc 4.7
Patch1: %{name}-0.9.96-gcc47.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt4-devel
BuildRequires: alsa-lib-devel
@@ -42,11 +42,8 @@ rm -rf unzip
%build
-export QMAKE_CFLAGS="%{optflags}"
-export QMAKE_CXXFLAGS="%{optflags}"
-
-qmake-qt4
-make %{?_smp_mflags}
+%qmake_qt4
+%make_build
%install
@@ -56,22 +53,22 @@ install -m 755 %{pkgname}-%{pkgversion}-QT %{buildroot}%{_bindir}/%{name}
# Install desktop file
desktop-file-install \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ --dir %{buildroot}%{_datadir}/applications \
%{SOURCE1}
-%clean
-rm -rf %{buildroot}
-
-
%files
-%defattr(-,root,root,-)
+%doc Readme.txt TODO.txt
+%license License.txt
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
-%doc License.txt Readme.txt TODO.txt
%changelog
+* Fri Sep 01 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 0.9.96-9
+- Disable debuginfo
+- Update spec file
+
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 0.9.96-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
6 years, 8 months