[svn] r6315 - in trunk/rpms: lftp wine

[packagers at lists.rpmforge.net]

Author: dag
Date: 2008-05-13 23:41:27 +0100 (Tue, 13 May 2008)
New Revision: 6315

Modified:
   trunk/rpms/lftp/lftp.spec
   trunk/rpms/wine/wine.spec
Log:
Updates

Modified: trunk/rpms/lftp/lftp.spec
===================================================================
--- trunk/rpms/lftp/lftp.spec	2008-05-12 19:20:21 UTC (rev 6314)
+++ trunk/rpms/lftp/lftp.spec	2008-05-13 22:41:27 UTC (rev 6315)
@@ -7,7 +7,7 @@
 
 Summary: Sophisticated file transfer program
 Name: lftp
-Version: 3.7.0
+Version: 3.7.1
 Release: 1
 License: GPL
 Group: Applications/Internet
@@ -32,9 +32,9 @@
 ### Workaround for broken openssl on RH9 and EL3
 export CPPFLAGS="-I/usr/kerberos/include"
 %configure \
-	--with-modules \
-	--disable-static \
-	--with-openssl="/usr"
+    --with-modules \
+    --disable-static \
+    --with-openssl="/usr"
 %{__make} clean
 %{__make} %{?_smp_mflags}
 
@@ -62,6 +62,9 @@
 %{_libdir}/liblftp-tasks.so*
 
 %changelog
+* Sat May 10 2008 Dag Wieers <dag at wieers.com> - 3.7.1-1
+- Updated to release 3.7.1.
+
 * Thu Mar 13 2008 Dag Wieers <dag at wieers.com> - 3.7.0-1
 - Updated to release 3.7.0.
 

Modified: trunk/rpms/wine/wine.spec
===================================================================
--- trunk/rpms/wine/wine.spec	2008-05-12 19:20:21 UTC (rev 6314)
+++ trunk/rpms/wine/wine.spec	2008-05-13 22:41:27 UTC (rev 6315)
@@ -48,13 +48,14 @@
 
 Summary: Windows 16/32/64 bit emulator
 Name: wine
-Version: 0.9.61
-Release: 1
+%define real_version 1.0-rc1
+Version: 1.0
+Release: 0.rc1
 License: LGPL
 Group: Applications/Emulators
 URL: http://www.winehq.org/
 
-Source0: http://dl.sf.net/sourceforge/wine/wine-%{version}.tar.bz2
+Source0: http://dl.sf.net/sourceforge/wine/wine-%{real_version}.tar.bz2
 Patch0: wine-prefixfonts.patch
 Patch1: wine-rpath.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -181,7 +182,7 @@
 you will need to install %{name}-devel.
 
 %prep
-%setup
+%setup -n %{name}-%{real_version}
 %patch0
 
 %{__cat} <<EOF >wine-config.desktop
@@ -326,28 +327,28 @@
     %{__install} -Dp -m0644 wine-uninstaller.desktop %{buildroot}/etc/X11/applnk/Applications/wine-uninstaller.desktop
 %else
     desktop-file-install --delete-original             \
-        --vendor=%{desktop_vendor}                 \
-        --dir=%{buildroot}%{_datadir}/applications \
+        --vendor="%{desktop_vendor}"                   \
+        --dir="%{buildroot}%{_datadir}/applications"   \
         %{buildroot}%{_datadir}/applications/wine.desktop
 
     desktop-file-install                               \
-        --vendor=%{desktop_vendor}                 \
-        --dir=%{buildroot}%{_datadir}/applications \
+        --vendor="%{desktop_vendor}"                   \
+        --dir="%{buildroot}%{_datadir}/applications"   \
         wine-config.desktop
 
     desktop-file-install                               \
-        --vendor=%{desktop_vendor}                 \
-        --dir=%{buildroot}%{_datadir}/applications \
+        --vendor="%{desktop_vendor}"                   \
+        --dir="%{buildroot}%{_datadir}/applications"   \
         wine-fileman.desktop
 
     desktop-file-install                               \
-        --vendor=%{desktop_vendor}                 \
-        --dir=%{buildroot}%{_datadir}/applications \
+        --vendor="%{desktop_vendor}"                   \
+        --dir="%{buildroot}%{_datadir}/applications"   \
         wine-regedit.desktop
 
     desktop-file-install                               \
-        --vendor=%{desktop_vendor}                 \
-        --dir=%{buildroot}%{_datadir}/applications \
+        --vendor="%{desktop_vendor}"                   \
+        --dir="%{buildroot}%{_datadir}/applications"   \
         wine-uninstaller.desktop
 %endif
 
@@ -884,6 +885,9 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Tue May 13 2008 Dag Wieers <dag at wieers.com> - 1.0-0.rc1
+- Updated to release 1.0-rc1.
+
 * Fri May 09 2008 Dag Wieers <dag at wieers.com> - 0.9.61-1
 - Updated to release 0.9.61.