[lives] Fix icon installation
by Antonio
commit 5f5d50409a801e367ececc42acb89f00ce4aa8cc
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Aug 18 22:50:55 2016 +0200
Fix icon installation
lives.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/lives.spec b/lives.spec
index 8c9e61b..9ce11e6 100644
--- a/lives.spec
+++ b/lives.spec
@@ -140,7 +140,7 @@ rm -rf %{buildroot}%{_includedir}/weed
rm -rf %{buildroot}%{_docdir}/lives-%{version}
##Push icon into %{_datadir}/icons/%{name}
-mkdir -p %{buildroot}%{_datadir}/hicolor/48x48/apps
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
cp -p %{buildroot}%{_datadir}/app-install/icons/%{name}.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
rm -rf %{buildroot}%{_datadir}/app-install
7 years, 8 months
[lives/f24] Fix icon directory
by Antonio
Summary of changes:
eae011e... Fix icon directory (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 8 months
[lives] Fix icon directory
by Antonio
commit eae011e5e261592fff9368b2439ac43da3f6898e
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Aug 18 22:48:48 2016 +0200
Fix icon directory
lives.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/lives.spec b/lives.spec
index 77c7b18..8c9e61b 100644
--- a/lives.spec
+++ b/lives.spec
@@ -141,7 +141,7 @@ rm -rf %{buildroot}%{_docdir}/lives-%{version}
##Push icon into %{_datadir}/icons/%{name}
mkdir -p %{buildroot}%{_datadir}/hicolor/48x48/apps
-cp -p %{buildroot}%{_datadir}/app-install/icons/%{name}.png %{buildroot}%{_datadir}/hicolor/48x48/apps
+cp -p %{buildroot}%{_datadir}/app-install/icons/%{name}.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
rm -rf %{buildroot}%{_datadir}/app-install
##Remove rpaths
@@ -188,7 +188,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.
%{_datadir}/applications/LiVES.desktop
%{_datadir}/%{name}/
%{_datadir}/pixmaps/%{name}.xpm
-%{_datadir}/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%{_datadir}/appdata/LiVES.appdata.xml
%changelog
7 years, 8 months
[lives/f24] Fix icon installation
by Antonio
Summary of changes:
2f5a692... Fix icon installation (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 8 months
[lives] Fix icon installation
by Antonio
commit 2f5a6929399a42bc6b496480df43b26c371a1cd6
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Aug 18 22:25:18 2016 +0200
Fix icon installation
lives.spec | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/lives.spec b/lives.spec
index eb2e990..77c7b18 100644
--- a/lives.spec
+++ b/lives.spec
@@ -13,7 +13,7 @@
Name: lives
Version: 2.6.6
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Video editor and VJ tool
License: GPLv3+ and LGPLv3+
URL: http://lives-video.com
@@ -63,6 +63,7 @@ BuildRequires: gcc-c++
BuildRequires: autoconf, automake, libtool
Requires: mplayer
+Requires: mpv
Requires: mencoder
Requires: sox
Requires: ImageMagick
@@ -83,6 +84,7 @@ Requires: projectM-pulseaudio
Requires: projectM-jack
%endif
Requires: python2
+Requires: hicolor-icon-theme
%description
LiVES began in 2002 as the Linux Video Editing System.
@@ -138,8 +140,8 @@ rm -rf %{buildroot}%{_includedir}/weed
rm -rf %{buildroot}%{_docdir}/lives-%{version}
##Push icon into %{_datadir}/icons/%{name}
-mkdir -p %{buildroot}%{_datadir}/icons/%{name}
-cp -p %{buildroot}%{_datadir}/app-install/icons/%{name}.png %{buildroot}%{_datadir}/icons/%{name}
+mkdir -p %{buildroot}%{_datadir}/hicolor/48x48/apps
+cp -p %{buildroot}%{_datadir}/app-install/icons/%{name}.png %{buildroot}%{_datadir}/hicolor/48x48/apps
rm -rf %{buildroot}%{_datadir}/app-install
##Remove rpaths
@@ -159,16 +161,16 @@ desktop-file-edit \
install -Dp -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/LiVES.appdata.xml
%post
-/bin/touch --no-create %{_datadir}/icons/%{name} &>/dev/null || :
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
- /bin/touch --no-create %{_datadir}/icons/%{name} &>/dev/null
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/%{name} &>/dev/null || :
+ /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/%{name} &>/dev/null || :
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%check
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml
@@ -186,10 +188,13 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.
%{_datadir}/applications/LiVES.desktop
%{_datadir}/%{name}/
%{_datadir}/pixmaps/%{name}.xpm
-%{_datadir}/icons/%{name}/
+%{_datadir}/hicolor/48x48/apps/%{name}.png
%{_datadir}/appdata/LiVES.appdata.xml
%changelog
+* Thu Aug 18 2016 Antonio Trande <sagitterATfedoraproject.org> - 2.6.6-3
+- Fix icon installation
+
* Thu Aug 18 2016 Antonio Trande <sagitterATfedoraproject.org> - 2.6.6-2
- Add ProjectM support on Fedora >= 24
7 years, 8 months
[lives] Add ProjectM support on Fedora >= 24
by Antonio
commit 3f49563094855fc281756613335a65b30dd9db31
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Aug 18 20:23:31 2016 +0200
Add ProjectM support on Fedora >= 24
lives.spec | 28 ++++++++++++++++++++--------
1 file changed, 20 insertions(+), 8 deletions(-)
---
diff --git a/lives.spec b/lives.spec
index 5fff8cc..eb2e990 100644
--- a/lives.spec
+++ b/lives.spec
@@ -13,7 +13,7 @@
Name: lives
Version: 2.6.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Video editor and VJ tool
License: GPLv3+ and LGPLv3+
URL: http://lives-video.com
@@ -29,6 +29,7 @@ BuildRequires: pkgconfig(libdv)
BuildRequires: pkgconfig(libavc1394)
BuildRequires: pkgconfig(libraw1394)
BuildRequires: pkgconfig(libv4lconvert)
+BuildRequires: pkgconfig(libfreenect)
BuildRequires: pkgconfig(frei0r)
BuildRequires: pkgconfig(liboil-0.3)
BuildRequires: pkgconfig(theora)
@@ -42,8 +43,9 @@ BuildRequires: pkgconfig(fftw3)
#BuildRequires: pkgconfig(libvisual-0.4)
BuildRequires: pkgconfig(libmatroska)
BuildRequires: pkgconfig(mjpegtools)
-##libprojectM-2.0.1 not supported
-#BuildRequires: pkgconfig(libprojectM)
+%if 0%{?fedora} > 23
+BuildRequires: pkgconfig(libprojectM)
+%endif
BuildRequires: ladspa-devel
BuildRequires: GLee-devel
BuildRequires: x264-libs
@@ -75,9 +77,11 @@ Requires: frei0r-plugins
Requires: mkvtoolnix
Requires: vorbis-tools
Requires: dvgrab
-#Requires: projectM-libvisual
-#Requires: projectM-pulseaudio
-#Requires: projectM-jack
+%if 0%{?fedora} > 23
+Requires: projectM-libvisual
+Requires: projectM-pulseaudio
+Requires: projectM-jack
+%endif
Requires: python2
%description
@@ -106,7 +110,12 @@ autoreconf -ivf
%endif
%configure --disable-silent-rules --enable-shared --enable-static \
--enable-largefile --enable-threads --disable-rpath --enable-profiling \
- --enable-doxygen --disable-projectM --disable-libvisual
+ --enable-doxygen --disable-libvisual \
+%if 0%{?fedora} > 23
+ --enable-projectM
+%else
+ --disable-projectM
+%endif
%make_build
@@ -117,7 +126,7 @@ autoreconf -ivf
find %{buildroot} -name '*.la' -exec rm -f {} ';'
find %{buildroot} -name '*.a' -exec rm -f {} ';'
-##Private libs
+##We want that these libraries are private
mv %{buildroot}%{_libdir}/libOSC* %{buildroot}%{_libdir}/%{name}
mv %{buildroot}%{_libdir}/libweed* %{buildroot}%{_libdir}/%{name}
#
@@ -181,6 +190,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.
%{_datadir}/appdata/LiVES.appdata.xml
%changelog
+* Thu Aug 18 2016 Antonio Trande <sagitterATfedoraproject.org> - 2.6.6-2
+- Add ProjectM support on Fedora >= 24
+
* Wed Aug 17 2016 Antonio Trande <sagitterATfedoraproject.org> - 2.6.6-1
- Update to 2.6.6
7 years, 8 months
[devede] devede has been replace by devedeng
by Sérgio M. Basto
commit 2536a95b3c0666d8eb45c5eb67a20a31f68982e1
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Aug 18 05:53:38 2016 +0100
devede has been replace by devedeng
dead.package | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/dead.package b/dead.package
index 5a01905..f4dd154 100644
--- a/dead.package
+++ b/dead.package
@@ -1 +1 @@
-devede has been to devedeng
+devede has been replace by devedeng
7 years, 8 months
