[packages/apfsprogs] - updated to 0.2.0

qboosh qboosh at pld-linux.org
Mon Nov 11 10:35:36 CET 2024


commit c25ddc0562917657b30d0a7615c583c33562a24c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Nov 11 09:27:08 2024 +0100

    - updated to 0.2.0

 apfsprogs-verbose.patch | 108 ++++++++++++++++++++++++++++++++++++++++++++++++
 apfsprogs.spec          |  29 +++++++++----
 2 files changed, 129 insertions(+), 8 deletions(-)
---
diff --git a/apfsprogs.spec b/apfsprogs.spec
index 7b4590f..eb4ef73 100644
--- a/apfsprogs.spec
+++ b/apfsprogs.spec
@@ -1,15 +1,14 @@
 Summary:	Userland programs to work with the APFS (Apple File System)
 Summary(pl.UTF-8):	Programy przestrzeni użytkownika do pracy z APFS (Apple File System)
 Name:		apfsprogs
-Version:	0
-%define	gitref	e6591615e4ceff37a43575b1255ab64954a10a28
-%define	snap	20230310
-%define	rel	1
-Release:	0.%{snap}.%{rel}
+Version:	0.2.0
+Release:	1
 License:	GPL v2
 Group:		Applications/System
-Source0:	https://github.com/linux-apfs/apfsprogs/archive/%{gitref}/%{name}-%{snap}.tar.gz
-# Source0-md5:	6c55f283f41ac4bbd341f7985d4f1bf9
+#Source0Download: https://github.com/linux-apfs/apfsprogs/tags
+Source0:	https://github.com/linux-apfs/apfsprogs/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	b33d9efe2494536addc7ec49a63c5660
+Patch0:		%{name}-verbose.patch
 URL:		https://github.com/linux-apfs/apfsprogs
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -28,24 +27,36 @@ funkcjami. Zgodność z implementacjami Apple była słabo testowana -
 należy próbować ostrożnie i zgłaszać napotkane problemy.
 
 %prep
-%setup -q -n %{name}-%{gitref}
+%setup -q
+%patch0 -p1
 
 %build
+%{__make} -C apfs-label \
+	CC="%{__cc}" \
+	CFLAGS="%{rpmcflags}" \
+	LDFLAGS="%{rpmldflags}"
+
 %{__make} -C apfs-snap \
+	CC="%{__cc}" \
 	CFLAGS="%{rpmcflags}" \
 	LDFLAGS="%{rpmldflags}"
 
 %{__make} -C apfsck \
+	CC="%{__cc}" \
 	CFLAGS="%{rpmcflags}" \
 	LDFLAGS="%{rpmldflags}"
 
 %{__make} -C mkapfs \
+	CC="%{__cc}" \
 	CFLAGS="%{rpmcflags}" \
 	LDFLAGS="%{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
+%{__make} -C apfs-label install \
+	DESTDIR=$RPM_BUILD_ROOT%{_prefix}
+
 %{__make} -C apfs-snap install \
 	DESTDIR=$RPM_BUILD_ROOT%{_prefix}
 
@@ -61,11 +72,13 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README
+%attr(755,root,root) %{_bindir}/apfs-label
 %attr(755,root,root) %{_bindir}/apfs-snap
 %attr(755,root,root) %{_bindir}/apfsck
 %attr(755,root,root) %{_bindir}/fsck.apfs
 %attr(755,root,root) %{_bindir}/mkapfs
 %attr(755,root,root) %{_bindir}/mkfs.apfs
+%{_mandir}/man8/apfs-label.8*
 %{_mandir}/man8/apfs-snap.8*
 %{_mandir}/man8/apfsck.8*
 %{_mandir}/man8/fsck.apfs.8*
diff --git a/apfsprogs-verbose.patch b/apfsprogs-verbose.patch
new file mode 100644
index 0000000..4e17771
--- /dev/null
+++ b/apfsprogs-verbose.patch
@@ -0,0 +1,108 @@
+--- apfsprogs-0.2.0/lib/Makefile.orig	2024-11-06 23:51:38.000000000 +0100
++++ apfsprogs-0.2.0/lib/Makefile	2024-11-11 08:49:12.755416869 +0100
+@@ -9,11 +9,11 @@ override CFLAGS += -Wall -fno-strict-ali
+ 
+ libapfs.a: $(OBJS)
+ 	@echo '  Assembling library archive...'
+-	@$(AR) rcs $@ $^
++	$(AR) rcs $@ $^
+ 
+ %.o: %.c
+ 	@echo '  Compiling $<...'
+-	@$(CC) $(CFLAGS) -o $@ -MMD -MP -c $<
++	$(CC) $(CFLAGS) -o $@ -MMD -MP -c $<
+ ifdef SPARSE_VERSION
+ 	@sparse $(CFLAGS) $<
+ endif
+--- apfsprogs-0.2.0/apfs-label/Makefile.orig	2024-11-06 23:51:38.000000000 +0100
++++ apfsprogs-0.2.0/apfs-label/Makefile	2024-11-11 08:51:44.137930093 +0100
+@@ -17,19 +17,19 @@ override CFLAGS += -Wall -Wno-address-of
+ 
+ apfs-label: $(OBJS) $(LIBRARY)
+ 	@echo '  Linking...'
+-	@$(CC) $(CFLAGS) $(LDFLAGS) -o apfs-label $(OBJS) $(LIBRARY)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o apfs-label $(OBJS) $(LIBRARY)
+ 	@echo '  Build complete'
+ 
+ # Build the common libraries
+ $(LIBRARY): FORCE
+ 	@echo '  Building libraries...'
+-	@$(MAKE) -C $(LIBDIR) --silent --no-print-directory
++	$(MAKE) -C $(LIBDIR) --no-print-directory
+ 	@echo '  Library build complete'
+ FORCE:
+ 
+ %.o: %.c
+ 	@echo '  Compiling $<...'
+-	@$(CC) $(CFLAGS) -o $@ -MMD -MP -c $<
++	$(CC) $(CFLAGS) -o $@ -MMD -MP -c $<
+ ifdef SPARSE_VERSION
+ 	@sparse $(CFLAGS) $<
+ endif
+--- apfsprogs-0.2.0/apfs-snap/Makefile.orig	2024-11-06 23:51:38.000000000 +0100
++++ apfsprogs-0.2.0/apfs-snap/Makefile	2024-11-11 08:52:53.330888576 +0100
+@@ -14,12 +14,12 @@ override CFLAGS += -Wall -Wno-address-of
+ 
+ apfs-snap: $(OBJS)
+ 	@echo '  Linking...'
+-	@$(CC) $(CFLAGS) $(LDFLAGS) -o apfs-snap $(OBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o apfs-snap $(OBJS)
+ 	@echo '  Build complete'
+ 
+ %.o: %.c
+ 	@echo '  Compiling $<...'
+-	@$(CC) $(CFLAGS) -o $@ -MMD -MP -c $<
++	$(CC) $(CFLAGS) -o $@ -MMD -MP -c $<
+ ifdef SPARSE_VERSION
+ 	@sparse $(CFLAGS) $<
+ endif
+--- apfsprogs-0.2.0/apfsck/Makefile.orig	2024-11-06 23:51:38.000000000 +0100
++++ apfsprogs-0.2.0/apfsck/Makefile	2024-11-11 08:53:41.043963425 +0100
+@@ -18,19 +18,19 @@ override CFLAGS += -Wall -Wno-address-of
+ 
+ apfsck: $(OBJS) $(LIBRARY)
+ 	@echo '  Linking...'
+-	@$(CC) $(CFLAGS) $(LDFLAGS) -o apfsck $(OBJS) $(LIBRARY)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o apfsck $(OBJS) $(LIBRARY)
+ 	@echo '  Build complete'
+ 
+ # Build the common libraries
+ $(LIBRARY): FORCE
+ 	@echo '  Building libraries...'
+-	@$(MAKE) -C $(LIBDIR) --silent --no-print-directory
++	$(MAKE) -C $(LIBDIR) --no-print-directory
+ 	@echo '  Library build complete'
+ FORCE:
+ 
+ %.o: %.c
+ 	@echo '  Compiling $<...'
+-	@$(CC) $(CFLAGS) -o $@ -MMD -MP -c $<
++	$(CC) $(CFLAGS) -o $@ -MMD -MP -c $<
+ ifdef SPARSE_VERSION
+ 	@sparse $(CFLAGS) $<
+ endif
+--- apfsprogs-0.2.0/mkapfs/Makefile.orig	2024-11-06 23:51:38.000000000 +0100
++++ apfsprogs-0.2.0/mkapfs/Makefile	2024-11-11 08:54:05.477164393 +0100
+@@ -17,19 +17,19 @@ override CFLAGS += -Wall -Wno-address-of
+ 
+ mkapfs: $(OBJS) $(LIBRARY)
+ 	@echo '  Linking...'
+-	@$(CC) $(CFLAGS) $(LDFLAGS) -o mkapfs $(OBJS) $(LIBRARY)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o mkapfs $(OBJS) $(LIBRARY)
+ 	@echo '  Build complete'
+ 
+ # Build the common libraries
+ $(LIBRARY): FORCE
+ 	@echo '  Building libraries...'
+-	@$(MAKE) -C $(LIBDIR) --silent --no-print-directory
++	$(MAKE) -C $(LIBDIR) --no-print-directory
+ 	@echo '  Library build complete'
+ FORCE:
+ 
+ %.o: %.c
+ 	@echo '  Compiling $<...'
+-	@$(CC) $(CFLAGS) -o $@ -MMD -MP -c $<
++	$(CC) $(CFLAGS) -o $@ -MMD -MP -c $<
+ ifdef SPARSE_VERSION
+ 	@sparse $(CFLAGS) $<
+ endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/apfsprogs.git/commitdiff/c25ddc0562917657b30d0a7615c583c33562a24c



More information about the pld-cvs-commit mailing list