[guvcview] Drop compat-ffmpeg28 changes
by Leigh Scott
commit 15d4de14252e2e304e5487549142e43296ba9f78
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue Oct 30 11:28:34 2018 +0000
Drop compat-ffmpeg28 changes
guvcview.spec | 17 -----------------
1 file changed, 17 deletions(-)
---
diff --git a/guvcview.spec b/guvcview.spec
index 0a59881..da39eb9 100644
--- a/guvcview.spec
+++ b/guvcview.spec
@@ -1,9 +1,3 @@
-%if 0%{?fedora} > 27
-%bcond_without compat_ffmpeg
-%else
-%bcond_with compat_ffmpeg
-%endif
-
Name: guvcview
Version: 2.0.6
Release: 1%{?dist}
@@ -20,11 +14,7 @@ BuildRequires: pkgconfig(glib-2.0) >= 2.10.0
BuildRequires: pkgconfig(portaudio-2.0)
BuildRequires: pkgconfig(libpulse) >= 0.9.15
BuildRequires: pkgconfig(libpng)
-%if %{with compat_ffmpeg}
-BuildRequires: compat-ffmpeg28-devel
-%else
BuildRequires: ffmpeg-devel
-%endif
BuildRequires: pkgconfig(libv4l2)
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(libusb-1.0)
@@ -59,17 +49,10 @@ This package contains development files for %{name}.
%prep
%setup -q -n %{name}-src-%{version}
-%if ! %{with compat_ffmpeg}
-%patch0 -p1
-%patch1 -p1
-%endif
find . \( -name '*.h' -o -name '*.c' \) -exec chmod -x {} \;
%build
-%if %{with compat_ffmpeg}
-export PKG_CONFIG_PATH=%{_libdir}/compat-ffmpeg28/pkgconfig
-%endif
%configure CC=gcc CXX=g++ --disable-debian-menu --disable-silent-rules --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
6 years
[guvcview] Updated to 2.0.6
by Leigh Scott
commit 987c72a44e856a6ca91d6133bfe207cc322a294a
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue Oct 30 11:26:54 2018 +0000
Updated to 2.0.6
guvcview.spec | 7 +++++--
sources | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/guvcview.spec b/guvcview.spec
index ea83146..0a59881 100644
--- a/guvcview.spec
+++ b/guvcview.spec
@@ -5,8 +5,8 @@
%endif
Name: guvcview
-Version: 2.0.5
-Release: 7%{?dist}
+Version: 2.0.6
+Release: 1%{?dist}
Summary: GTK+ UVC Viewer and Capturer
# fixme: ask upstream about license, many source files claim to be
# under GPLv2+
@@ -132,6 +132,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%changelog
+* Tue Oct 30 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.6-1
+- Updated to 2.0.6
+
* Thu Jul 26 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.5-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/sources b/sources
index 4a72618..a0f4329 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f4d238ccd26e126ae6e8e6bd4a052bfc guvcview-src-2.0.5.tar.gz
+ea35acb3a97952ceca26d92478b6e7ea guvcview-src-2.0.6.tar.gz
6 years
[guvcview] Use make macros
by Leigh Scott
commit d19141b9373bf2e9a60ce9ec1e003ffafefc164c
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue Oct 30 11:15:39 2018 +0000
Use make macros
guvcview.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/guvcview.spec b/guvcview.spec
index cbc2d4e..ea83146 100644
--- a/guvcview.spec
+++ b/guvcview.spec
@@ -73,11 +73,11 @@ export PKG_CONFIG_PATH=%{_libdir}/compat-ffmpeg28/pkgconfig
%configure CC=gcc CXX=g++ --disable-debian-menu --disable-silent-rules --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 -k %{?_smp_mflags}
+%make_build
%install
-make install DESTDIR=%{buildroot}
+%make_install
desktop-file-install \
--add-category='X-AudioVideoCapture' \
6 years
[guvcview] Remove Group tag
by Leigh Scott
commit 416f054cf577ded43871beea4ef400838e3e2619
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue Oct 30 11:13:27 2018 +0000
Remove Group tag
guvcview.spec | 2 --
1 file changed, 2 deletions(-)
---
diff --git a/guvcview.spec b/guvcview.spec
index 0ef554d..cbc2d4e 100644
--- a/guvcview.spec
+++ b/guvcview.spec
@@ -8,7 +8,6 @@ Name: guvcview
Version: 2.0.5
Release: 7%{?dist}
Summary: GTK+ UVC Viewer and Capturer
-Group: Amusements/Graphics
# fixme: ask upstream about license, many source files claim to be
# under GPLv2+
License: GPLv3+
@@ -48,7 +47,6 @@ any v4l2 compatible device.
%package devel
Summary: Development files for %{name}
-Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
6 years
[xvid4conf/f29] Clean up spec file
by Leigh Scott
Summary of changes:
c0adba4... Clean up spec file (*)
(*) This commit already existed in another branch; no separate mail sent
6 years
[xvid4conf] Clean up spec file
by Leigh Scott
commit c0adba4fcd6f7f22b671fff11de39442d8d4998d
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue Oct 30 10:06:51 2018 +0000
Clean up spec file
xvid4conf.spec | 49 ++++++++++++++++++++++++++-----------------------
1 file changed, 26 insertions(+), 23 deletions(-)
---
diff --git a/xvid4conf.spec b/xvid4conf.spec
index d7133fd..9026e02 100644
--- a/xvid4conf.spec
+++ b/xvid4conf.spec
@@ -1,14 +1,15 @@
Summary: Tool to create XviD configuration files
-Name: xvid4conf
+Name: xvid4conf
Version: 1.12
-Release: 13%{?dist}
+Release: 14%{?dist}
License: GPLv2+
-Group: Applications/Multimedia
-URL: http://www.exit1.org/archive/dvdrip-users/2005-07/msg00007.html
+URL: http://www.exit1.org/archive/dvdrip-users/2005-07/msg00007.html
Source0: http://nexus.tfh-berlin.de/~t2/source/2.1/x/xvid4conf-%{version}.tar.bz2
Source1: xvid4conf.png
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gtk2-devel, desktop-file-utils
+
+BuildRequires: gcc
+BuildRequires: gtk2-devel
+BuildRequires: desktop-file-utils
%description
This tool creates XviD configuration files. The generated configuration file
@@ -17,7 +18,17 @@ the configuration file) is intended to be used with at least XviD 1.0.
%prep
-%setup
+%setup -q
+
+
+%build
+%configure
+%make_build
+
+
+%install
+%make_install
+
# Create the desktop file
%{__cat} > xvid4conf.desktop << EOF
[Desktop Entry]
@@ -30,16 +41,6 @@ Type=Application
Categories=Application;AudioVideo;
EOF
-
-%build
-%configure
-%{__make} %{?_smp_mflags}
-
-
-%install
-%{__rm} -rf %{buildroot}
-%makeinstall
-
# Install the desktop file
desktop-file-install \
--dir %{buildroot}%{_datadir}/applications \
@@ -50,19 +51,21 @@ desktop-file-install \
%{buildroot}%{_datadir}/pixmaps/xvid4conf.png
-%clean
-%{__rm} -rf %{buildroot}
-
-
%files
-%defattr(-, root, root, 0755)
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS ChangeLog README
+%license COPYING
%{_bindir}/xvid4conf
%{_datadir}/applications/*xvid4conf.desktop
%{_datadir}/pixmaps/xvid4conf.png
%changelog
+* Tue Oct 30 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.12-14
+- Remove Group tag
+- Use make macros
+- Add BuildRequires gcc
+- Clean up spec file
+
* Sun Aug 19 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.12-13
- Rebuilt for Fedora 29 Mass Rebuild binutils issue
6 years
[vdr-skindesigner] Add dtd setup files
by Martin Gansser
commit 0ce33eceb9c783f19da1688f216bdbdcdc880398
Author: Martin Gansser <mgansser(a)online.de>
Date: Tue Oct 30 10:51:03 2018 +0100
Add dtd setup files
vdr-skindesigner.spec | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
---
diff --git a/vdr-skindesigner.spec b/vdr-skindesigner.spec
index 683dcdf..00c4778 100644
--- a/vdr-skindesigner.spec
+++ b/vdr-skindesigner.spec
@@ -1,6 +1,6 @@
Name: vdr-skindesigner
Version: 1.2.7
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: A VDR skinning engine that displays XML based Skins
Group: Applications/Multimedia
@@ -78,6 +78,9 @@ install -pm 644 themes/*.theme %{buildroot}%{vdr_vardir}/themes/
# install the skins to the custom location used in Fedora
install -dm 755 %{buildroot}%{vdr_resdir}/plugins/skindesigner/skins
cp -pR skins/* %{buildroot}%{vdr_resdir}/plugins/skindesigner/skins
+# install the dtd to the custom location used in Fedora
+install -dm 755 %{buildroot}%{vdr_resdir}/plugins/skindesigner/dtd
+cp -pR dtd/* %{buildroot}%{vdr_resdir}/plugins/skindesigner/dtd
# install the scripts to the custom location used in Fedora
install -dm 755 %{buildroot}%{vdr_resdir}/plugins/skindesigner/scripts
cp -pR scripts/* %{buildroot}%{vdr_resdir}/plugins/skindesigner/scripts
@@ -117,6 +120,9 @@ ldconfig -n %{buildroot}%{_libdir}
%{_includedir}/libskindesignerapi/*
%changelog
+* Tue Oct 30 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 1.2.7-6
+- Add dtd setup files
+
* Thu Oct 11 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 1.2.7-5
- Add BR gcc-c++
6 years