- updated ldmdoc to 0.3.2; build just ldmutil

diff --git a/linux-ldm-build.patch b/linux-ldm-build.patch
index 0ccb66d1b159778848af09685fde5366f64b514e..fc57e0c83e5593f3703039bcd84df9c4d3a9a8be 100644 (file)
--- a/linux-ldm-build.patch
+++ b/linux-ldm-build.patch
@@ -89,3 +89,13 @@ diff -Nur linux-ldm-0.0.7.orig/test/Makefile linux-ldm-0.0.7/test/Makefile
  LDFLAGS=-Xlinker --strip-all
  LIB=
  INC=
+--- linux-ldm-0.0.8/ldmutil/ldm_db.cpp.orig    2001-12-14 20:27:00.000000000 +0100
++++ linux-ldm-0.0.8/ldmutil/ldm_db.cpp 2023-06-20 18:18:20.385442718 +0200
+@@ -21,6 +21,7 @@
+  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ 
++#include <cstring>
+ #include <iostream>
+ #include <iomanip>
+ #include <list>

diff --git a/linux-ldm.spec b/linux-ldm.spec
index 72154e41a8aa6d2c6adf9783422a80a2bbdc2daf..d57fa25c75c080efed848f3168fc7c6a3af13d5a 100644 (file)
--- a/linux-ldm.spec
+++ b/linux-ldm.spec
@@ -1,4 +1,4 @@
-%define        docver  0.2
+%define        docver  0.3.2
 Summary:       Logical Disk Manager (Dynamic Disk) Tool
 Summary(pl.UTF-8):     Narzędzie do partycji LDM ("dynamicznych dysków" Windows 2000/XP)
 Name:          linux-ldm
@@ -6,10 +6,10 @@ Version:      0.0.8
 Release:       2
 License:       GPL
 Group:         Applications/System
-Source0:       http://dl.sourceforge.net/linux-ntfs/%{name}-%{version}.tar.bz2
+Source0:       https://downloads.sourceforge.net/linux-ntfs/%{name}-%{version}.tar.bz2
 # Source0-md5: bac558dc33633c746bb8c93f6861d231
-Source1:       http://dl.sourceforge.net/linux-ntfs/ldmdoc-%{docver}.tar.bz2
-# Source1-md5: e232718f1d54bd7de87456d553c9f068
+Source1:       https://downloads.sourceforge.net/linux-ntfs/ldmdoc-%{docver}.tar.gz
+# Source1-md5: 28bfcc8b591ffab48b0ef23f5e675599
 Patch0:                %{name}-build.patch
 URL:           http://linux-ntfs.sourceforge.net/
 BuildRequires: libstdc++-devel
@@ -28,20 +28,28 @@ dokumentację do partycji LDM.
 %setup -q -a1
 %patch0 -p1
 
+%{__mv} ldmdoc-%{docver} ldmdoc
+
 %build
-%{__make} \
-       CC="%{__cc}" \
+%{__make} -C ldmutil \
        CPP="%{__cxx}" \
-       OPT="%{rpmcflags} %{!?debug:-fomit-frame-pointer}" \
-       KERNEL="%{_kernelsrcdir}"
+       OPT="%{rpmcxxflags} %{!?debug:-fomit-frame-pointer}"
+
+%if 0
+# relies on kernel parts
+%{__make} -C test \
+       CC="%{__cc}" \
+       CFLAGS="%{rpmcflags} %{!?debug:-fomit-frame-pointer} -include extra.h -I../linux/fs/partitions"
+%endif
 
-mv -f ldmutil/README README.ldmutil
+%{__mv} ldmutil/README README.ldmutil
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_bindir}
 
-install test/ldminfo ldmutil/ldmutil $RPM_BUILD_ROOT%{_bindir}
+install ldmutil/ldmutil $RPM_BUILD_ROOT%{_bindir}
+#install test/ldminfo $RPM_BUILD_ROOT%{_bindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -49,4 +57,4 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README* ldmdoc
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/ldmutil