[svn] r6087 - in trunk/rpms: ddrescue fuse-encfs nxtvepg wine

[packagers at lists.rpmforge.net]

Author: dag
Date: 2008-01-08 03:36:03 +0100 (Tue, 08 Jan 2008)
New Revision: 6087

Added:
   trunk/rpms/ddrescue/ddrescue-1.7-unistd.patch
Modified:
   trunk/rpms/ddrescue/ddrescue.spec
   trunk/rpms/fuse-encfs/fuse-encfs.spec
   trunk/rpms/nxtvepg/nxtvepg.spec
   trunk/rpms/wine/wine.spec
Log:
Updates

Added: trunk/rpms/ddrescue/ddrescue-1.7-unistd.patch
===================================================================
--- trunk/rpms/ddrescue/ddrescue-1.7-unistd.patch	                        (rev 0)
+++ trunk/rpms/ddrescue/ddrescue-1.7-unistd.patch	2008-01-08 02:36:03 UTC (rev 6087)
@@ -0,0 +1,10 @@
+--- logbook.cc.orig	2008-01-08 02:49:05.132127704 +0100
++++ logbook.cc	2008-01-08 02:49:17.513245488 +0100
+@@ -27,6 +27,7 @@
+ #include <vector>
+ 
+ #include "ddrescue.h"
++#include "unistd.h"
+ 
+ 
+ namespace {

Modified: trunk/rpms/ddrescue/ddrescue.spec
===================================================================
--- trunk/rpms/ddrescue/ddrescue.spec	2008-01-08 01:24:19 UTC (rev 6086)
+++ trunk/rpms/ddrescue/ddrescue.spec	2008-01-08 02:36:03 UTC (rev 6087)
@@ -13,6 +13,7 @@
 URL: http://www.gnu.org/software/ddrescue/ddrescue.html
 
 Source: http://savannah.gnu.org/download/ddrescue/ddrescue-%{version}.tar.bz2
+Patch0: ddrescue-1.7-unistd.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: gcc-c++
@@ -31,9 +32,32 @@
 
 %prep
 %setup
+%patch0 -p0
 
 %build
 %configure
+### configure script does not accept target_platform as argument (as done on RH7 and EL2)
+### defining %%_gnu does not work !
+#./configure \
+#  CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
+#  CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
+#  FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
+#  ./configure --host="%{_host}" --build="%{_build}" \
+#    --target="%{_target_platform}" \
+#    --program-prefix="%{?_program_prefix}" \
+#    --prefix="%{_prefix}" \
+#    --exec-prefix="%{_exec_prefix}" \
+#    --bindir="%{_bindir}" \
+#    --sbindir="%{_sbindir}" \
+#    --sysconfdir="%{_sysconfdir}" \
+#    --datadir="%{_datadir}" \
+#    --includedir="%{_includedir}" \
+#    --libdir="%{_libdir}" \
+#    --libexecdir="%{_libexecdir}" \
+#    --localstatedir="%{_localstatedir}" \
+#    --sharedstatedir="%{_sharedstatedir}" \
+#    --mandir="%{_mandir}" \
+#    --infodir="%{_infodir}"
 %{__make} %{?_smp_mflags}
 
 %install

Modified: trunk/rpms/fuse-encfs/fuse-encfs.spec
===================================================================
--- trunk/rpms/fuse-encfs/fuse-encfs.spec	2008-01-08 01:24:19 UTC (rev 6086)
+++ trunk/rpms/fuse-encfs/fuse-encfs.spec	2008-01-08 02:36:03 UTC (rev 6087)
@@ -5,13 +5,13 @@
 
 Summary: Encrypted pass-thru filesystem in userspace
 Name: fuse-encfs
-Version: 1.3.2
+Version: 1.4.0
 Release: 1
 License: GPL
 Group: System Environment/Kernel
-URL: http://arg0.net/wiki/encfs/
+URL: http://www.arg0.net/encfs
 
-Source: http://arg0.net/vgough/download/encfs-%{version}-1.tgz
+Source: http://www.arg0.net/encfs-1.4.0.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: openssl-devel, fuse-devel >= 2.2, rlog-devel >= 1.3
@@ -32,16 +32,19 @@
 
 %build
 %configure \
-	--disable-static
+    --disable-static
 %{__make} %{?_smp_mflags}
+### Make sure we install translations on EL5/x86_64 (bug in 1.4.0)
+%{__make} %{?_smp_mflags} -C po
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR="%{buildroot}"
+### Make sure we install translations on EL5/x86_64 (bug in 1.4.0)
+%{__make} install DESTDIR="%{buildroot}" -C po
 %find_lang %{real_name}
 
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
 %clean
@@ -55,9 +58,12 @@
 %{_bindir}/encfs
 %{_bindir}/encfsctl
 %{_bindir}/encfssh
+%{_libdir}/libencfs.so*
 %exclude %{_libdir}/libencfs.la
-%{_libdir}/libencfs.so*
 
 %changelog
+* Tue Jan 08 2008 Dag Wieers <dag at wieers.com> - 1.4.0-1
+- Updated to release 1.4.0.
+
 * Sat May 12 2007 Dag Wieers <dag at wieers.com> - 1.3.2-1
 - Initial package. (using DAR)

Modified: trunk/rpms/nxtvepg/nxtvepg.spec
===================================================================
--- trunk/rpms/nxtvepg/nxtvepg.spec	2008-01-08 01:24:19 UTC (rev 6086)
+++ trunk/rpms/nxtvepg/nxtvepg.spec	2008-01-08 02:36:03 UTC (rev 6087)
@@ -59,6 +59,7 @@
         s|/usr/tmp|%{_localstatedir}/tmp|g;
         s|\$\(mandir\)|\$(mandir)/man1|g;
         s|/lib\b|/%{_lib}|g;
+        s|^WARN\s+\+=\s+-Wno-pointer-sign$||;
     ' Makefile
 
 %{__cat} <<EOF >%{name}.desktop
@@ -75,7 +76,7 @@
 %build
 %{__make} %{?_smp_mflags} \
     prefix="%{_prefix}" \
-    CCFLAGS="%{optflags}"
+    CFLAGS="%{optflags} \$(INCS) \$(DEFS)"
 
 %install
 %{__rm} -rf %{buildroot}

Modified: trunk/rpms/wine/wine.spec
===================================================================
--- trunk/rpms/wine/wine.spec	2008-01-08 01:24:19 UTC (rev 6086)
+++ trunk/rpms/wine/wine.spec	2008-01-08 02:36:03 UTC (rev 6087)
@@ -400,6 +400,7 @@
 %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*
@@ -473,6 +474,7 @@
 %{_libdir}/wine/rundll32.exe.so
 %{_libdir}/wine/spoolsv.exe.so
 %{_libdir}/wine/start.exe.so
+%{_libdir}/wine/svchost.exe.so
 %{_libdir}/wine/taskmgr.exe.so
 %{_libdir}/wine/uninstaller.exe.so
 %{_libdir}/wine/wineboot.exe.so
@@ -535,6 +537,7 @@
 ### dll.so
 %{_libdir}/wine/acledit.dll.so
 %{_libdir}/wine/activeds.dll.so
+%{_libdir}/wine/actxprxy.dll.so
 %{_libdir}/wine/advapi32.dll.so
 %{_libdir}/wine/advpack.dll.so
 %{_libdir}/wine/amstream.dll.so
@@ -668,6 +671,7 @@
 %{_libdir}/wine/pstorec.dll.so
 %{_libdir}/wine/qcap.dll.so
 %{_libdir}/wine/qmgr.dll.so
+%{_libdir}/wine/qmgrprxy.dll.so
 %{_libdir}/wine/quartz.dll.so
 %{_libdir}/wine/query.dll.so
 %{_libdir}/wine/rasapi32.dll.so