[svn] r5388 - in trunk/rpms: gliv multitail pyvnc2swf vncselector

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Fri May 11 15:46:50 CEST 2007


Author: dag
Date: 2007-05-11 15:46:48 +0200 (Fri, 11 May 2007)
New Revision: 5388

Modified:
   trunk/rpms/gliv/gliv.spec
   trunk/rpms/multitail/multitail.spec
   trunk/rpms/pyvnc2swf/pyvnc2swf.spec
   trunk/rpms/vncselector/vncselector.spec
Log:
Updates

Modified: trunk/rpms/gliv/gliv.spec
===================================================================
--- trunk/rpms/gliv/gliv.spec	2007-05-11 13:12:54 UTC (rev 5387)
+++ trunk/rpms/gliv/gliv.spec	2007-05-11 13:46:48 UTC (rev 5388)
@@ -3,13 +3,13 @@
 # Upstream: Guillaume Chazarain <guichaz$yahoo,fr>
 
 %{?dist: %{expand: %%define %dist 1}}
+%{?fc4:%define _without_modxorg 1}
 %{?el4:%define _without_modxorg 1}
-%{?el3:%define _without_modxorg 1}
-%{?el2:%define _without_modxorg 1}
-%{?fc4:%define _without_modxorg 1}
 %{?fc3:%define _without_modxorg 1}
 %{?fc2:%define _without_modxorg 1}
 %{?fc1:%define _without_modxorg 1}
+%{?el3:%define _without_modxorg 1}
+%{?el2:%define _without_modxorg 1}
 
 %define desktop_vendor rpmforge
 
@@ -40,7 +40,7 @@
 Name=Gliv Image Viewer
 Comment=View images fast and smoothly
 Exec=gliv
-Icon=redhat-graphics.png
+Icon=gliv.png
 Terminal=false
 Type=Application
 MimeType=image/gif;image/x-xpm;image/x-xbm;image/jpeg;image/x-bmp;image/png;image/x-tiff;image/x-tga;
@@ -63,15 +63,17 @@
 
 %build
 %configure \
-	--x-libraries="%{_prefix}/X11R6/%{_lib}"
+%{!?_without_modxorg:--x-libraries="%{_libdir}"} \
+%{?_without_modxorg:--x-libraries="%{_prefix}/X11R6/%{_lib}"}
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
 %find_lang %{name}
 
 %{__install} -Dp -m0644 gliv.applications %{buildroot}%{_datadir}/application-registry/gliv.applications
+%{__install} -Dp -m0644 gliv.png %{buildroot}%{_datadir}/pixmaps/gliv.png
 
 %{__install} -d -m0755 %{buildroot}%{_datadir}/applications/
 desktop-file-install --vendor %{desktop_vendor}    \
@@ -79,6 +81,12 @@
 	--dir %{buildroot}%{_datadir}/applications \
 	gliv.desktop
 
+%post
+update-desktop-database &>/dev/null || :
+
+%postun
+update-desktop-database &>/dev/null || :
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -89,9 +97,9 @@
 %doc %{_mandir}/*/man1/gliv.1*
 %{_bindir}/gliv
 %{_datadir}/applications/%{desktop_vendor}-gliv.desktop
+%{_datadir}/applications/gnome-gliv.desktop
 %{_datadir}/application-registry/gliv.applications
 %{_datadir}/pixmaps/gliv.png
-%{_datadir}/applications/gnome-gliv.desktop
 
 %changelog
 * Sun Nov 19 2006 Dries Verachtert <dries at ulyssis.org> - 1.9.6-1

Modified: trunk/rpms/multitail/multitail.spec
===================================================================
--- trunk/rpms/multitail/multitail.spec	2007-05-11 13:12:54 UTC (rev 5387)
+++ trunk/rpms/multitail/multitail.spec	2007-05-11 13:46:48 UTC (rev 5388)
@@ -46,9 +46,11 @@
 %{__install} -d -m0755 scripts/
 %{__install} -p -m0644 *.pl *.sh scripts/
 
+### We don't want rpm to require on geoip, so remove it
+%{__rm} -f %{buildroot}%{_sysconfdir}/multitail/convert-geoip.pl
+
 ### Clean up buildroot
 %{__mv} -f %{buildroot}%{_sysconfdir}/multitail.conf.new %{buildroot}%{_sysconfdir}/multitail.conf
-%{__rm} -f %{buildroot}%{_sysconfdir}/multitail/convert-geoip.pl 
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -65,7 +67,7 @@
 %{_sysconfdir}/multitail/convert-simple.pl
 
 %changelog
-* Fri May 11 2007 Dries Verachtert <dries at ulyssis.org> - 5.0.3-1
+* Thu May 10 2007 Dag Wieers <dag at wieers.com> - 5.0.3-1
 - Updated to release 5.0.3.
 
 * Fri May 04 2007 Dag Wieers <dag at wieers.com> - 5.0.2-1

Modified: trunk/rpms/pyvnc2swf/pyvnc2swf.spec
===================================================================
--- trunk/rpms/pyvnc2swf/pyvnc2swf.spec	2007-05-11 13:12:54 UTC (rev 5387)
+++ trunk/rpms/pyvnc2swf/pyvnc2swf.spec	2007-05-11 13:46:48 UTC (rev 5388)
@@ -5,7 +5,7 @@
 
 Summary: Flash movie recording tool for VNC
 Name: pyvnc2swf
-Version: 0.9.1
+Version: 0.9.3
 Release: 1
 Summary: A VNC session recorder to Flash movie
 License: GPL
@@ -27,17 +27,17 @@
 %prep
 %setup
 
-%{__cat} <<'EOF' >pyvnc2swf
+%{__cat} <<'EOF' >pyvnc2swf.sh
 #!/bin/sh
 PYTHONPATH=${PYTHONPATH-}${PYTHONPATH+:}%{_datadir}/pyvnc2swf %{__python} %{_datadir}/pyvnc2swf/vnc2swf.py $@
 EOF
 
-%{__cat} <<'EOF' >pyvnc2swf-edit
+%{__cat} <<'EOF' >pyvnc2swf-edit.sh
 #!/bin/sh
 PYTHONPATH=${PYTHONPATH-}${PYTHONPATH+:}%{_datadir}/pyvnc2swf %{__python} %{_datadir}/pyvnc2swf/edit.py $@
 EOF
 
-%{__cat} <<'EOF' >pyvnc2swf-play
+%{__cat} <<'EOF' >pyvnc2swf-play.sh
 #!/bin/sh
 PYTHONPATH=${PYTHONPATH-}${PYTHONPATH+:}%{_datadir}/pyvnc2swf %{__python} %{_datadir}/pyvnc2swf/play.py $@
 EOF
@@ -46,27 +46,30 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%{__install} -Dp -m0755 pyvnc2swf %{buildroot}%{_bindir}/pyvnc2swf
-%{__install} -Dp -m0755 pyvnc2swf-edit %{buildroot}%{_bindir}/pyvnc2swf-edit
-%{__install} -Dp -m0755 pyvnc2swf-play %{buildroot}%{_bindir}/pyvnc2swf-play
-%{__install} -Dp -m0755 recordwin.sh %{buildroot}%{_bindir}/recordwin.sh
+%{__install} -Dp -m0755 pyvnc2swf.sh %{buildroot}%{_bindir}/pyvnc2swf
+%{__install} -Dp -m0755 pyvnc2swf-edit.sh %{buildroot}%{_bindir}/pyvnc2swf-edit
+%{__install} -Dp -m0755 pyvnc2swf-play.sh %{buildroot}%{_bindir}/pyvnc2swf-play
+%{__install} -Dp -m0755 bin/recordwin.sh %{buildroot}%{_bindir}/recordwin
 
 %{__install} -d -m0755 %{buildroot}%{_datadir}/pyvnc2swf/
-%{__install} -m0644 *.py %{buildroot}%{_datadir}/pyvnc2swf/
+%{__install} -m0644 pyvnc2swf/*.py %{buildroot}%{_datadir}/pyvnc2swf/
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %files
 %defattr(-, root, root, 0775)
-%doc *.txt *.html
+%doc LICENCE.TXT *.txt docs/*.html
 %{_bindir}/pyvnc2swf
 %{_bindir}/pyvnc2swf-edit
 %{_bindir}/pyvnc2swf-play
-%{_bindir}/recordwin.sh
+%{_bindir}/recordwin
 %{_datadir}/pyvnc2swf/
 
 %changelog
+* Thu May 10 2007 Dag Wieers <dag at wieers.com> - 0.9.3-1
+- Updated to release 0.9.3.
+
 * Sun Nov 12 2006 Dag Wieers <dag at wieers.com> - 0.9.1-1
 - Updated to release 0.9.1.
 

Modified: trunk/rpms/vncselector/vncselector.spec
===================================================================
--- trunk/rpms/vncselector/vncselector.spec	2007-05-11 13:12:54 UTC (rev 5387)
+++ trunk/rpms/vncselector/vncselector.spec	2007-05-11 13:46:48 UTC (rev 5388)
@@ -27,10 +27,10 @@
 Group: User Interface/Desktops
 URL: http://www.dooglio.net/VncSelector/
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Source: http://dl.sf.net/vncselector/vncselector_%{version}.tar.gz
 # Source: http://www.dooglio.net/VncSelector/VncSelector_%{version}.tar.gz
-Source: http://dl.sf.net/vncselector/vncselector_%{version}.tar.gz
 # Source: http://vncselector.sourceforge.net/VncSelector_%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: fltk-devel, gcc-c++, autoconf, automake
 BuildRequires: libtool, libpng-devel, libjpeg-devel
 %{!?_without_modxorg:BuildRequires: libX11-devel}




More information about the commits mailing list