[svn] r6266 - in trunk/rpms: autossh dkms tightvnc wine xawtv

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Wed Apr 16 21:15:15 CEST 2008 

Author: dag
Date: 2008-04-16 20:15:14 +0100 (Wed, 16 Apr 2008)
New Revision: 6266

Modified:
   trunk/rpms/autossh/autossh.spec
   trunk/rpms/dkms/dkms.spec
   trunk/rpms/tightvnc/tightvnc.spec
   trunk/rpms/wine/wine.spec
   trunk/rpms/xawtv/xawtv.spec
Log:
Updates

Modified: trunk/rpms/autossh/autossh.spec
===================================================================
--- trunk/rpms/autossh/autossh.spec	2008-04-14 17:05:14 UTC (rev 6265)
+++ trunk/rpms/autossh/autossh.spec	2008-04-16 19:15:14 UTC (rev 6266)
@@ -4,7 +4,7 @@
 
 Summary: Automatically restart SSH sessions and tunnels
 Name: autossh
-Version: 1.4a
+Version: 1.4b
 Release: 1
 License: GPL
 Group: Applications/Internet
@@ -49,6 +49,9 @@
 %{_bindir}/autossh
 
 %changelog
+* Sat Apr 12 2008 Dag Wieers <dag at wieers.com> - 1.4b-1
+- Updated to release 1.4b.
+
 * Fri Jul 14 2006 Dag Wieers <dag at wieers.com> - 1.4a-1
 - Updated to release 1.4a.
 

Modified: trunk/rpms/dkms/dkms.spec
===================================================================
--- trunk/rpms/dkms/dkms.spec	2008-04-14 17:05:14 UTC (rev 6265)
+++ trunk/rpms/dkms/dkms.spec	2008-04-16 19:15:14 UTC (rev 6266)
@@ -11,7 +11,7 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
 Version: 2.0.19
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Kernel
 URL: http://linux.dell.com/dkms/
@@ -42,20 +42,31 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%{__install} -Dp -m0755 dkms %{buildroot}%{_sbindir}/dkms
-%{__install} -Dp -m0755 dkms_mkkerneldoth %{buildroot}%{_sbindir}/dkms_mkkerneldoth
-%{__install} -Dp -m0644 dkms_framework.conf %{buildroot}%{_sysconfdir}/dkms/framework.conf
-%{__install} -Dp -m0644 template-dkms-mkrpm.spec %{buildroot}%{_sysconfdir}/dkms/template-dkms-mkrpm.spec
+%{__make} install-redhat DESTDIR="%{buildroot}" \
+    SBIN="%{buildroot}%{_sbindir}" \
+    VAR="%{buildroot}%{_localstatedir}/lib/dkms" \
+    MAN="%{buildroot}%{_mandir}/man8" \
+    ETC="%{buildroot}%{_sysconfdir}/dkms" \
+    BASHDIR="%{buildroot}%{_sysconfdir}/bash_completion.d" \
+    LIBDIR="%{buildroot}%{_prefix}/lib/dkms"
+
+#%{__install} -Dp -m0755 dkms %{buildroot}%{_sbindir}/dkms
+#%{__install} -Dp -m0755 dkms_mkkerneldoth %{buildroot}%{_sbindir}/dkms_mkkerneldoth
+#%{__install} -Dp -m0644 dkms_framework.conf %{buildroot}%{_sysconfdir}/dkms/framework.conf
+#%{__install} -Dp -m0644 template-dkms-mkrpm.spec %{buildroot}%{_sysconfdir}/dkms/template-dkms-mkrpm.spec
 %{__install} -Dp -m0755 dkms_autoinstaller %{buildroot}%{_initrddir}/dkms_autoinstaller
-%{__install} -Dp -m0644 dkms_dbversion %{buildroot}%{_localstatedir}/lib/dkms/dkms_dbversion
-%{__install} -Dp -m0644 dkms.8 %{buildroot}%{_mandir}/man8/dkms.8
+#%{__install} -Dp -m0644 dkms_dbversion %{buildroot}%{_localstatedir}/lib/dkms/dkms_dbversion
+#%{__install} -Dp -m0644 dkms.8 %{buildroot}%{_mandir}/man8/dkms.8
 
+### Clean up buildroot
+%{__rm} -rf %{buildroot}%{_sysconfdir}/init.d/
+
 %post
 /sbin/chkconfig --add dkms_autoinstaller
 
 %preun
 if [ $1 -eq 0 ]; then
-        /sbin/chkconfig --del dkms_autoinstaller
+    /sbin/chkconfig --del dkms_autoinstaller
 fi
 
 %clean
@@ -65,13 +76,23 @@
 %defattr(-, root, root, 0755)
 %doc AUTHORS COPYING README* sample.spec sample.conf
 %doc %{_mandir}/man8/dkms.8*
+%dir %{_sysconfdir}/bash_completion.d/
 %config(noreplace) %{_sysconfdir}/dkms/
+%dir %{_sysconfdir}/kernel/
+%dir %{_sysconfdir}/kernel/postinst.d/
+%dir %{_sysconfdir}/kernel/prerm.d/
+%config %{_sysconfdir}/bash_completion.d/dkms
+%config %{_sysconfdir}/kernel/postinst.d/dkms
+%config %{_sysconfdir}/kernel/prerm.d/dkms
 %config %{_initrddir}/dkms_autoinstaller
+%{_localstatedir}/lib/dkms/
+%{_prefix}/lib/dkms/
 %{_sbindir}/dkms
-%{_sbindir}/dkms_mkkerneldoth
-%{_localstatedir}/lib/dkms/
 
 %changelog
+* Thu Apr 10 2008 Dag Wieers <dag at wieers.com> - 2.0.19-2
+- Fixed missing files. (Alan Bartlett)
+
 * Wed Mar 26 2008 Dag Wieers <dag at wieers.com> - 2.0.19-1
 - Updated to release 2.0.19.
 

Modified: trunk/rpms/tightvnc/tightvnc.spec
===================================================================
--- trunk/rpms/tightvnc/tightvnc.spec	2008-04-14 17:05:14 UTC (rev 6265)
+++ trunk/rpms/tightvnc/tightvnc.spec	2008-04-16 19:15:14 UTC (rev 6266)
@@ -25,7 +25,7 @@
 Summary: Graphical remote administration system
 Name: tightvnc
 Version: 1.3.9
-Release: 2
+Release: 3
 License: GPL
 Group: User Interface/Desktops
 URL: http://www.tightvnc.com/
@@ -140,7 +140,7 @@
         echo -n "${display} "
         unset BASH_ENV ENV
         initlog $INITLOG_ARGS -c \
-            "su ${display##*:} -c \"cd ~${display##*:} && [ -f .vnc/passwd ] && vncserver :${display%%:*}\""
+            "su ${display##*:} -c \"cd ~${display##*:} && [ -f .vnc/passwd ] && vncserver :${display%%:*} ${VNCSERVERARGS[${display%:*}]}\""
         RETVAL=$?
         [ "$RETVAL" -ne 0 ] && break
     done
@@ -211,8 +211,8 @@
 %install
 %{__rm} -rf %{buildroot}
 %{__install} -d -m0755 %{buildroot}%{_bindir} \
-            %{buildroot}%{_mandir}/man1/ \
-            %{buildroot}%{_datadir}/vnc/
+    %{buildroot}%{_mandir}/man1/ \
+    %{buildroot}%{_datadir}/vnc/
 ./vncinstall %{buildroot}%{_bindir} %{buildroot}%{_mandir}
 
 %{__cp} -apR classes %{buildroot}%{_datadir}/vnc/
@@ -269,6 +269,9 @@
 %{_datadir}/vnc/
 
 %changelog
+* Thu Apr 10 2008 Dag Wieers <dag at wieers.com> - 1.3.9-3
+- Improved sysv script to include VNCSERVERARGS. (Arturo Díaz Rosemberg)
+
 * Thu Mar 13 2008 Dag Wieers <dag at wieers.com> - 1.3.9-2
 - Added fix for rgb.txt support. (Alberto Lusiani)
 

Modified: trunk/rpms/wine/wine.spec
===================================================================
--- trunk/rpms/wine/wine.spec	2008-04-14 17:05:14 UTC (rev 6265)
+++ trunk/rpms/wine/wine.spec	2008-04-16 19:15:14 UTC (rev 6266)
@@ -48,7 +48,7 @@
 
 Summary: Windows 16/32/64 bit emulator
 Name: wine
-Version: 0.9.52
+Version: 0.9.59
 Release: 1
 License: LGPL
 Group: Applications/Emulators
@@ -400,10 +400,11 @@
 %defattr(-, root, root, 0755)
 %doc ANNOUNCE AUTHORS ChangeLog COPYING.LIB LICENSE* README VERSION
 %doc documentation/README.*
-%doc %{_mandir}/*/man1/wine.1*
 %doc %{_mandir}/man1/wine.1*
 %doc %{_mandir}/man1/wineprefixcreate.1*
 %doc %{_mandir}/man1/wineserver.1*
+%doc %{_mandir}/*/man1/wine.1*
+%doc %{_mandir}/*/man1/wineserver.1*
 %config %{_initrddir}/wine
 %config %{_sysconfdir}/ld.so.conf.d/wine-%{_arch}.conf
 %{_bindir}/msiexec
@@ -456,6 +457,7 @@
 %{_libdir}/wine/clock.exe.so
 %{_libdir}/wine/cmd.exe.so
 %{_libdir}/wine/control.exe.so
+%{_libdir}/wine/cryptdlg.dll.so
 %{_libdir}/wine/eject.exe.so
 %{_libdir}/wine/expand.exe.so
 %{_libdir}/wine/explorer.exe.so
@@ -468,10 +470,13 @@
 %{_libdir}/wine/ntoskrnl.exe.so
 %{_libdir}/wine/oleview.exe.so
 %{_libdir}/wine/progman.exe.so
+%{_libdir}/wine/reg.exe.so
 %{_libdir}/wine/regedit.exe.so
 %{_libdir}/wine/regsvr32.exe.so
 %{_libdir}/wine/rpcss.exe.so
 %{_libdir}/wine/rundll32.exe.so
+%{_libdir}/wine/secedit.exe.so
+%{_libdir}/wine/services.exe.so
 %{_libdir}/wine/spoolsv.exe.so
 %{_libdir}/wine/start.exe.so
 %{_libdir}/wine/svchost.exe.so
@@ -566,6 +571,20 @@
 %{_libdir}/wine/d3dim.dll.so
 %{_libdir}/wine/d3drm.dll.so
 %{_libdir}/wine/d3dx8.dll.so
+%{_libdir}/wine/d3dx9_24.dll.so
+%{_libdir}/wine/d3dx9_25.dll.so
+%{_libdir}/wine/d3dx9_26.dll.so
+%{_libdir}/wine/d3dx9_27.dll.so
+%{_libdir}/wine/d3dx9_28.dll.so
+%{_libdir}/wine/d3dx9_29.dll.so
+%{_libdir}/wine/d3dx9_30.dll.so
+%{_libdir}/wine/d3dx9_31.dll.so
+%{_libdir}/wine/d3dx9_32.dll.so
+%{_libdir}/wine/d3dx9_33.dll.so
+%{_libdir}/wine/d3dx9_34.dll.so
+%{_libdir}/wine/d3dx9_35.dll.so
+%{_libdir}/wine/d3dx9_36.dll.so
+%{_libdir}/wine/d3dx9_37.dll.so
 %{_libdir}/wine/d3dxof.dll.so
 %{_libdir}/wine/dbghelp.dll.so
 %{_libdir}/wine/dciman32.dll.so
@@ -591,28 +610,34 @@
 %{_libdir}/wine/dpnhpast.dll.so
 %{_libdir}/wine/dpnlobby.dll.so
 %{_libdir}/wine/dsound.dll.so
+%{_libdir}/wine/dssenh.dll.so
 %{_libdir}/wine/dswave.dll.so
 %{_libdir}/wine/dwmapi.dll.so
 %{_libdir}/wine/dxdiagn.dll.so
 %{_libdir}/wine/faultrep.dll.so
+%{_libdir}/wine/fusion.dll.so
 %{_libdir}/wine/gdi32.dll.so
 %{_libdir}/wine/gdiplus.dll.so
 %{!?_without_opengl:%{_libdir}/wine/glu32.dll.so}
 #%{_libdir}/wine/glut32.dll.so
+%{_libdir}/wine/gpkcsp.dll.so
 %{_libdir}/wine/hal.dll.so
 %{_libdir}/wine/hid.dll.so
 %{_libdir}/wine/hlink.dll.so
 %{_libdir}/wine/hnetcfg.dll.so
 %{_libdir}/wine/iccvid.dll.so
 %{_libdir}/wine/icmp.dll.so
-%{_libdir}/wine/infosoft.dll.so
-%{_libdir}/wine/inkobj.dll.so
 %{_libdir}/wine/imagehlp.dll.so
 %{_libdir}/wine/imm32.dll.so
 %{_libdir}/wine/inetcomm.dll.so
+%{_libdir}/wine/infosoft.dll.so
+%{_libdir}/wine/initpki.dll.so
+%{_libdir}/wine/inkobj.dll.so
 %{_libdir}/wine/inseng.dll.so
 %{_libdir}/wine/iphlpapi.dll.so
+%{_libdir}/wine/itircl.dll.so
 %{_libdir}/wine/itss.dll.so
+%{_libdir}/wine/jscript.dll.so
 %{_libdir}/wine/kernel32.dll.so
 %{_libdir}/wine/localspl.dll.so
 %{_libdir}/wine/localui.dll.so
@@ -637,7 +662,9 @@
 %{_libdir}/wine/msimtf.dll.so
 %{_libdir}/wine/msnet32.dll.so
 %{_libdir}/wine/msrle32.dll.so
+%{_libdir}/wine/mssip32.dll.so
 %{_libdir}/wine/msvcirt.dll.so
+%{_libdir}/wine/msvcr71.dll.so
 %{_libdir}/wine/msvcrt.dll.so
 %{_libdir}/wine/msvcrt20.dll.so
 %{_libdir}/wine/msvcrt40.dll.so
@@ -667,9 +694,11 @@
 %{_libdir}/wine/pdh.dll.so
 %{_libdir}/wine/powrprof.dll.so
 %{_libdir}/wine/printui.dll.so
+%{_libdir}/wine/propsys.dll.so
 %{_libdir}/wine/psapi.dll.so
 %{_libdir}/wine/pstorec.dll.so
 %{_libdir}/wine/qcap.dll.so
+%{_libdir}/wine/qedit.dll.so
 %{_libdir}/wine/qmgr.dll.so
 %{_libdir}/wine/qmgrprxy.dll.so
 %{_libdir}/wine/quartz.dll.so
@@ -681,6 +710,7 @@
 %{_libdir}/wine/rpcrt4.dll.so
 %{_libdir}/wine/rsabase.dll.so
 %{_libdir}/wine/rsaenh.dll.so
+%{_libdir}/wine/sccbase.dll.so
 %{_libdir}/wine/schannel.dll.so
 %{_libdir}/wine/secur32.dll.so
 %{_libdir}/wine/security.dll.so
@@ -694,7 +724,10 @@
 %{_libdir}/wine/shell32.dll.so
 %{_libdir}/wine/shfolder.dll.so
 %{_libdir}/wine/shlwapi.dll.so
+%{_libdir}/wine/slbcsp.dll.so
+%{_libdir}/wine/slc.dll.so
 %{_libdir}/wine/snmpapi.dll.so
+%{_libdir}/wine/softpub.dll.so
 %{_libdir}/wine/spoolss.dll.so
 %{_libdir}/wine/sti.dll.so
 %{_libdir}/wine/svrapi.dll.so
@@ -720,12 +753,14 @@
 %{_libdir}/wine/winscard.dll.so
 %{_libdir}/wine/wintab32.dll.so
 %{_libdir}/wine/wintrust.dll.so
+%{_libdir}/wine/wmi.dll.so
 %{_libdir}/wine/wnaspi32.dll.so
 %{_libdir}/wine/wow32.dll.so
 %{_libdir}/wine/ws2_32.dll.so
 %{_libdir}/wine/wsock32.dll.so
 %{_libdir}/wine/wtsapi32.dll.so
 
+
 ### ds.so
 %{_libdir}/wine/gphoto2.ds.so
 %{_libdir}/wine/sane.ds.so
@@ -776,6 +811,12 @@
 %{_libdir}/wine/hhctrl.ocx.so
 %{_libdir}/wine/msisys.ocx.so
 
+### mod16
+%{_libdir}/wine/winoldap.mod16
+
+### sys.so
+%{_libdir}/wine/mountmgr.sys.so
+
 %files capi
 %defattr(-, root, root, 0755)
 %dir %{_libdir}/wine/
@@ -841,6 +882,9 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sun Apr 13 2008 Dag Wieers <dag at wieers.com> - 0.9.59-1
+- Updated to release 0.9.59.
+
 * Tue Jan 08 2008 Dag Wieers <dag at wieers.com> - 0.9.52-1
 - Updated to release 0.9.52.
 

Modified: trunk/rpms/xawtv/xawtv.spec
===================================================================
--- trunk/rpms/xawtv/xawtv.spec	2008-04-14 17:05:14 UTC (rev 6265)
+++ trunk/rpms/xawtv/xawtv.spec	2008-04-16 19:15:14 UTC (rev 6266)
@@ -31,22 +31,23 @@
 Summary: Television application for video4linux compliant devices
 Name: xawtv
 Version: 3.95
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Multimedia
 URL: http://bytesex.org/xawtv/
 
 Source: http://dl.bytesex.org/releases/xawtv/xawtv-%{version}.tar.gz
+Patch0: xawtv-3.95-modxorg.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-%{?_without_modxorg:BuildRequires: XFree86-devel}
-%{!?_without_modxorg:BuildRequires: libX11-devel, libFS-devel}
 BuildRequires: ncurses-devel, Xaw3d-devel, libjpeg-devel
 BuildRequires: zvbi-devel, libpng-devel
 %{?_with_lesstif:BuildRequires: lesstif-devel}
 %{?_with_openmotif:BuildRequires: openmotif-devel}
 %{?rh62:BuildRequires: Mesa-devel}
 %{!?_without_freedesktop:BuildRequires: desktop-file-utils}
+%{?_without_modxorg:BuildRequires: XFree86-devel}
+%{!?_without_modxorg:BuildRequires: libX11-devel, libFS-devel, libXaw-devel}
 #BuildRequires: libdv-devel, libquicktime-devel
 
 %description
@@ -57,6 +58,7 @@
 
 %prep
 %setup
+%{!?_without_modxorg:%patch0 -p1}
 
 %{__perl} -pi.orig -e 's| -o root||' Makefile.in
 
@@ -73,8 +75,9 @@
 
 %build
 ### FIXME: Work-around for buildproblems with rpm configure macro (can't find the problem) Not related to optflags, _target_platform, CFLAGS (Builds fine on rh62 though)
-%configure
 #./configure --prefix="%{_prefix}"
+%configure \
+    --disable-quicktime
 %{__make} %{?_smp_mflags}
 
 %install
@@ -82,18 +85,18 @@
 ### On RH62 it fails because %{buildroot}%{_bindir} does not exist. (Fix upstream please)
 %{__install} -d -m0755 %{buildroot}%{_bindir}
 %makeinstall \
-	DESTDIR="%{buildroot}" \
-	libdir="%{buildroot}%{_libdir}/xawtv" \
-	datadir="%{buildroot}%{_datadir}/xawtv"
+    DESTDIR="%{buildroot}" \
+    libdir="%{buildroot}%{_libdir}/xawtv" \
+    datadir="%{buildroot}%{_datadir}/xawtv"
 
 %if %{?_without_freedesktop:1}0
-	%{__install} -Dp -m0644 xawtv.desktop %{buildroot}%{_datadir}/gnome/apps/Multimedia/xawtv.desktop
+    %{__install} -Dp -m0644 xawtv.desktop %{buildroot}%{_datadir}/gnome/apps/Multimedia/xawtv.desktop
 %else
-	%{__install} -d -m0755 %{buildroot}%{_datadir}/applications/
-	desktop-file-install --vendor %{desktop_vendor}    \
-		--add-category X-Red-Hat-Base              \
-		--dir %{buildroot}%{_datadir}/applications \
-		xawtv.desktop
+    %{__install} -d -m0755 %{buildroot}%{_datadir}/applications/
+    desktop-file-install --vendor %{desktop_vendor}    \
+        --add-category X-Red-Hat-Base              \
+        --dir %{buildroot}%{_datadir}/applications \
+        xawtv.desktop
 %endif
 
 %clean
@@ -113,6 +116,9 @@
 %{!?_without_freedesktop:%{_datadir}/applications/%{desktop_vendor}-xawtv.desktop}
 
 %changelog
+* Wed Apr 09 2008 Ariel Dembling <arieldembling at gmail.com> 3.95-2
+- Fixed compilation errors under CentOS 5.1.
+
 * Thu Mar 29 2007 Dag Wieers <dag at wieers.com> - 3.95-1
 - Updated to release 3.95.

More information about the svn-commits mailing list