rpms/bino/F-18 .cvsignore, 1.2, 1.3 bino.spec, 1.2, 1.3 sources, 1.2, 1.3 bino-1.2.1-ld-fix.patch, 1.1, NONE bino-1.2.1-unbundle-icons.patch, 1.1, NONE

[Jaroslav Škarvada]

Author: jskarvad

Update of /cvs/free/rpms/bino/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14781

Modified Files:
	.cvsignore bino.spec sources 
Removed Files:
	bino-1.2.1-ld-fix.patch bino-1.2.1-unbundle-icons.patch 
Log Message:
* Thu Oct 18 2012 Jaroslav Å karvada <jskarvad at redhat.com> - 1.4.1-1
- New version
- Dropped ld-fix patch (upstreamed)
- Dropped unbundle-icons patch (not needed)



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/bino/F-18/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Mar 2012 12:16:48 -0000	1.2
+++ .cvsignore	18 Oct 2012 20:30:56 -0000	1.3
@@ -1 +1 @@
-bino-1.2.1.tar.xz
+bino-1.4.1.tar.xz


Index: bino.spec
===================================================================
RCS file: /cvs/free/rpms/bino/F-18/bino.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bino.spec	26 Jun 2012 09:05:45 -0000	1.2
+++ bino.spec	18 Oct 2012 20:30:57 -0000	1.3
@@ -1,19 +1,15 @@
 Name: bino
-Version: 1.2.1
-Release: 4%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
 Summary: 3D video player
 Group: System Environment/Base
 License: GPLv3+
 URL: http://bino3d.org
 Source0: http://download.savannah.nongnu.org/releases-noredirect/bino/%{name}-%{version}.tar.xz
-# Fix for implicit DSO linkage, patch accepted by upstream
-Patch1: bino-1.2.1-ld-fix.patch
-# Unbundle oxygen icons
-Patch2: bino-1.2.1-unbundle-icons.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 BuildRequires: ffmpeg-devel glew-devel libass-devel openal-devel qt-devel
-BuildRequires: gettext texinfo oxygen-icon-theme
+BuildRequires: gettext texinfo oxygen-icon-theme desktop-file-utils
 
 %description
 Bino is a 3D video player. It supports stereoscopic 3D video with a wide
@@ -25,15 +21,9 @@
 %setup -q
 
 # Removal of unneeded stuff
-rm -rf pkg/macosx/* pkg/w32
+rm -rf pkg/macosx/*
 touch pkg/macosx/Info.plist.in
 
-# Removal of bundled oxygen-icons
-rm -rf src/icons
-
-%patch1 -p1 -b .ld-fix
-%patch2 -p1 -b .unbundle-icons
-
 %build
 %configure
 make %{?_smp_mflags}
@@ -41,9 +31,13 @@
 %install
 make install DESTDIR=%{buildroot} mandir=%{_mandir}
 rm -f %{buildroot}%{_infodir}/dir
+
 mkdir _tmpdoc
 mv %{buildroot}%{_datadir}/doc/%{name}/* _tmpdoc/
 rm -rf %{buildroot}%{_datadir}/doc
+
+desktop-file-validate %{buildroot}%{_datadir}/applications/bino.desktop
+
 %find_lang %{name}
 
 %post
@@ -53,11 +47,22 @@
     %{_infodir}/%{name}.info \
     %{_infodir}/dir 2>/dev/null || :
 
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
 %preun
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
 fi
 
+%postun
+if [ $1 -eq 0 ] ; then
+    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
+
 %files -f %{name}.lang
 %doc AUTHORS COPYING ChangeLog NEWS README _tmpdoc/*
 %{_bindir}/bino
@@ -67,6 +72,11 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Thu Oct 18 2012 Jaroslav Å karvada <jskarvad at redhat.com> - 1.4.1-1
+- New version
+- Dropped ld-fix patch (upstreamed)
+- Dropped unbundle-icons patch (not needed)
+
 * Tue Jun 26 2012 Nicolas Chauvet <kwizart at gmail.com> - 1.2.1-4
 - Rebuilt for FFmpeg
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/bino/F-18/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Mar 2012 12:16:48 -0000	1.2
+++ sources	18 Oct 2012 20:30:57 -0000	1.3
@@ -1 +1 @@
-8110094f05c02667760eda720f84618f  bino-1.2.1.tar.xz
+52c7975564fe80aa18917905b6d19a25  bino-1.4.1.tar.xz


--- bino-1.2.1-ld-fix.patch DELETED ---


--- bino-1.2.1-unbundle-icons.patch DELETED ---