commit 5432eae67c3c6573a5fa791bbfbfc82ae5cf833b
Author: Jakub Bogusz <[email protected]>
Date: Wed Nov 20 21:47:00 2024 +0100
- updated to 2.3
udftools-includes.patch | 30 --------------
udftools-shared.patch | 107 +++++++++++++++++++++++++++++++-----------------
udftools.spec | 32 ++++++++++-----
3 files changed, 91 insertions(+), 78 deletions(-)
---
diff --git a/udftools.spec b/udftools.spec
index df48ca6..196908c 100644
--- a/udftools.spec
+++ b/udftools.spec
@@ -5,19 +5,22 @@
Summary: Linux tools for UDF filesystems and DVD/CD-R(W) drives
Summary(pl.UTF-8): Linuksowe narzędzia do systemów plików UDF oraz
nagrywarek DVD/CD-R(W)
Name: udftools
-Version: 1.2
-Release: 2
+Version: 2.3
+Release: 1
License: GPL v2+
Group: Applications/System
-Source0:
https://github.com/pali/udftools/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: f5cbb7dffbb33778a90c08e76693651e
+#Source0Download: https://github.com/pali/udftools/releases
+Source0:
https://github.com/pali/udftools/releases/download/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: eada8dd40a675763ec71c35655cfd85e
Patch0: %{name}-shared.patch
-Patch1: %{name}-includes.patch
URL: http://linux-udf.sourceforge.net/
-BuildRequires: autoconf >= 2.53
+BuildRequires: autoconf >= 2.64
BuildRequires: automake
BuildRequires: libtool
+BuildRequires: pkgconfig
BuildRequires: readline-devel
+BuildRequires: sed >= 4.0
+BuildRequires: udev-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sbindir /sbin
@@ -60,7 +63,8 @@ Statyczna biblioteka libudffs.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
+
+%{__sed} -i -e 's,/usr/sbin/pkt,%{_sbindir}/pkt,g' pktsetup/pktsetup.rules
%build
%{__libtoolize}
@@ -92,19 +96,25 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc AUTHORS NEWS README doc/{HOWTO.udf,UDF-Specifications}
+%doc AUTHORS ChangeLog NEWS README doc/{HOWTO.udf,UDF-Specifications}
%attr(755,root,root) %{_bindir}/cdrwtool
+%attr(755,root,root) %{_bindir}/udfinfo
+%attr(755,root,root) %{_bindir}/wrudf
+%attr(755,root,root) %{_sbindir}/mkfs.udf
%attr(755,root,root) %{_sbindir}/mkudffs
+%attr(755,root,root) %{_sbindir}/pktcdvd-check
%attr(755,root,root) %{_sbindir}/pktsetup
-%attr(755,root,root) %{_sbindir}/wrudf
-%attr(755,root,root) %{_sbindir}/mkfs.udf
+%attr(755,root,root) %{_sbindir}/udflabel
%attr(755,root,root) %{_libdir}/libudffs.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libudffs.so.1
+%attr(755,root,root) %ghost %{_libdir}/libudffs.so.2
+/lib/udev/rules.d/80-pktsetup.rules
%{_mandir}/man1/cdrwtool.1*
+%{_mandir}/man1/udfinfo.1*
%{_mandir}/man1/wrudf.1*
%{_mandir}/man8/mkudffs.8*
%{_mandir}/man8/pktsetup.8*
%{_mandir}/man8/mkfs.udf.8*
+%{_mandir}/man8/udflabel.8*
%files devel
%defattr(644,root,root,755)
diff --git a/udftools-includes.patch b/udftools-includes.patch
deleted file mode 100644
index ddd8a04..0000000
--- a/udftools-includes.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- udftools-1.2/libudffs/unicode.c.orig 2016-06-29 19:13:05.000000000
+0200
-+++ udftools-1.2/libudffs/unicode.c 2016-10-27 05:35:27.516758958 +0200
-@@ -25,6 +25,7 @@
- * libudffs unicode handling functions
- */
-
-+#include <string.h>
- #include "libudffs.h"
- #include "config.h"
-
---- udftools-1.2/mkudffs/file.c.orig 2016-06-29 19:13:05.000000000 +0200
-+++ udftools-1.2/mkudffs/file.c 2016-10-27 05:39:23.523422929 +0200
-@@ -26,6 +26,7 @@
- */
-
- #include <malloc.h>
-+#include <string.h>
-
- #include "libudffs.h"
- #include "file.h"
---- udftools-1.2/cdrwtool/options.c.orig 2016-06-29 19:13:05.000000000
+0200
-+++ udftools-1.2/cdrwtool/options.c 2016-10-27 05:45:20.480085516 +0200
-@@ -22,6 +22,7 @@
-
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <malloc.h>
-
- #include "cdrwtool.h"
diff --git a/udftools-shared.patch b/udftools-shared.patch
index 65bc069..f210905 100644
--- a/udftools-shared.patch
+++ b/udftools-shared.patch
@@ -1,56 +1,59 @@
---- udftools-1.2/libudffs/Makefile.am.orig 2016-06-29 19:13:05.000000000
+0200
-+++ udftools-1.2/libudffs/Makefile.am 2016-10-26 21:15:22.510434891 +0200
-@@ -1,4 +1,4 @@
+--- udftools-2.3/libudffs/Makefile.am.orig 2024-11-20 20:00:46.474506309
+0100
++++ udftools-2.3/libudffs/Makefile.am 2024-11-20 20:25:07.696590189 +0100
+@@ -1,4 +1,5 @@
-noinst_LTLIBRARIES = libudffs.la
+lib_LTLIBRARIES = libudffs.la
- libudffs_la_SOURCES = crc.c extent.c unicode.c ../include/getopt.h
../include/libudffs.h ../include/ecma_167.h ../include/osta_udf.h
../include/defaults.h ../include/udf_endian.h ../include/bswap.h
++libudffs_la_LDFLAGS = -version-info 2:0:0
+ libudffs_la_SOURCES = crc.c extent.c misc.c unicode.c ../include/libudffs.h
../include/ecma_167.h ../include/osta_udf.h ../include/bswap.h
libudffs_la_LIBADD = @LTLIBOBJS@
- libudffs_la_LDFLAGS = -version-info 1:0:0
+
--- udftools-1.2/include/Makefile.am.orig 1970-01-01 01:00:00.000000000
+0100
+++ udftools-1.2/include/Makefile.am 2016-10-26 21:47:12.357079752 +0200
@@ -0,0 +1,4 @@
-+noinst_HEADERS = bswap.h udf_endian.h
++noinst_HEADERS = bswap.h
+EXTRA_DIST = config.in
+pkgincludedir = $(includedir)/udffs
-+pkginclude_HEADERS = ecma_167.h libudffs.h osta_udf.h udf_lib.h
---- udftools-1.2/include/libudffs.h.orig 2016-06-29 19:13:05.000000000
+0200
-+++ udftools-1.2/include/libudffs.h 2016-10-26 21:46:08.653747148 +0200
-@@ -30,7 +30,6 @@
++pkginclude_HEADERS = ecma_167.h libudffs.h osta_udf.h
+--- udftools-2.3/include/libudffs.h.orig 2024-11-20 20:00:46.477839624
+0100
++++ udftools-2.3/include/libudffs.h 2024-11-20 20:28:37.495453611 +0100
+@@ -33,7 +33,7 @@
#include "ecma_167.h"
#include "osta_udf.h"
--#include "udf_endian.h"
+-#include "bswap.h"
++#include <sys/types.h>
#define FLAG_FREED_BITMAP 0x00000001
#define FLAG_FREED_TABLE 0x00000002
---- udftools-1.2/Makefile.am.orig 2016-06-29 19:13:05.000000000 +0200
-+++ udftools-1.2/Makefile.am 2016-10-26 21:47:32.960412852 +0200
-@@ -1,2 +1,2 @@
--SUBDIRS = libudffs mkudffs cdrwtool pktsetup udffsck wrudf doc
-+SUBDIRS = libudffs mkudffs cdrwtool pktsetup udffsck wrudf doc include
+--- udftools-2.3/Makefile.am.orig 2024-11-20 20:00:46.481172940 +0100
++++ udftools-2.3/Makefile.am 2024-11-20 20:29:13.125260588 +0100
+@@ -1,3 +1,3 @@
+-SUBDIRS = libudffs mkudffs cdrwtool pktsetup udffsck udfinfo udflabel wrudf
doc
++SUBDIRS = libudffs mkudffs cdrwtool pktsetup udffsck udfinfo udflabel wrudf
doc include
dist_doc_DATA = AUTHORS COPYING NEWS README
---- udftools-1.2/configure.ac.orig 2016-06-29 19:13:05.000000000 +0200
-+++ udftools-1.2/configure.ac 2016-10-27 05:46:53.953417785 +0200
-@@ -24,6 +24,6 @@
- AC_CHECK_FUNCS(gettimeofday mktime lseek64 llseek)
- AC_SUBST(LTLIBOBJS)
+ EXTRA_DIST = autogen.sh Doxyfile
+--- udftools-2.3/configure.ac.orig 2024-11-20 20:00:46.484506255 +0100
++++ udftools-2.3/configure.ac 2024-11-20 20:29:40.551778673 +0100
+@@ -41,6 +41,6 @@ AC_SUBST(LTLIBOBJS)
+
+ AM_CONDITIONAL(USE_READLINE, test "$readline_found" = "yes")
--AC_CONFIG_FILES(Makefile libudffs/Makefile mkudffs/Makefile cdrwtool/Makefile
pktsetup/Makefile udffsck/Makefile wrudf/Makefile doc/Makefile)
-+AC_CONFIG_FILES(Makefile libudffs/Makefile mkudffs/Makefile cdrwtool/Makefile
pktsetup/Makefile udffsck/Makefile wrudf/Makefile doc/Makefile include/Makefile)
+-AC_CONFIG_FILES(Makefile libudffs/Makefile mkudffs/Makefile cdrwtool/Makefile
pktsetup/Makefile udffsck/Makefile udfinfo/Makefile udflabel/Makefile
wrudf/Makefile doc/Makefile)
++AC_CONFIG_FILES(Makefile libudffs/Makefile mkudffs/Makefile cdrwtool/Makefile
pktsetup/Makefile udffsck/Makefile udfinfo/Makefile udflabel/Makefile
wrudf/Makefile doc/Makefile include/Makefile)
AC_OUTPUT
---- udftools-1.2/cdrwtool/cdrwtool.h.orig 2016-06-29 19:13:05.000000000
+0200
-+++ udftools-1.2/cdrwtool/cdrwtool.h 2016-10-27 05:44:36.150086026 +0200
+--- udftools-2.3/cdrwtool/cdrwtool.h.orig 2024-11-20 20:00:46.487839570
+0100
++++ udftools-2.3/cdrwtool/cdrwtool.h 2024-11-20 20:30:28.708184454 +0100
@@ -13,6 +13,7 @@
- #include <inttypes.h>
+ #include <stdint.h>
#include <linux/cdrom.h>
#include "../include/libudffs.h"
+#include "../include/bswap.h"
/*
* define this to be the default cdrom device
---- udftools-1.2/mkudffs/file.h.orig 2016-06-29 19:13:05.000000000 +0200
-+++ udftools-1.2/mkudffs/file.h 2016-10-27 05:37:56.356757269 +0200
+--- udftools-2.3/mkudffs/file.h.orig 2024-11-20 20:00:46.487839570 +0100
++++ udftools-2.3/mkudffs/file.h 2024-11-20 20:31:11.884617214 +0100
@@ -25,6 +25,7 @@
#define __FILE_H
@@ -58,14 +61,44 @@
+#include "bswap.h"
tag query_tag(struct udf_disc *, struct udf_extent *, struct udf_desc *,
uint16_t);
- extern tag udf_query_tag(struct udf_disc *, uint16_t, uint16_t, uint32_t,
struct udf_data *, uint16_t);
---- udftools-1.2/wrudf/wrudf.c.orig 2016-06-29 19:13:05.000000000 +0200
-+++ udftools-1.2/wrudf/wrudf.c 2016-10-27 05:46:03.563418375 +0200
-@@ -10,6 +10,7 @@
- #include <string.h>
- #include <sys/resource.h>
+ extern tag udf_query_tag(struct udf_disc *, uint16_t, uint16_t, uint32_t,
struct udf_data *, uint32_t, uint32_t);
+--- udftools-2.3/mkudffs/mkudffs.h.orig 2021-01-04 17:19:40.000000000
+0100
++++ udftools-2.3/mkudffs/mkudffs.h 2024-11-20 20:51:29.164689308 +0100
+@@ -27,6 +27,7 @@
+ #include "ecma_167.h"
+ #include "osta_udf.h"
+ #include "libudffs.h"
++#include "bswap.h"
+
+ #define UDF_ID_APPLICATION "*Linux mkudffs " PACKAGE_VERSION
+ #define UDF_ID_DEVELOPER "*Linux UDFFS"
+--- udftools-2.3/udfinfo/readdisc.c.orig 2021-01-04 17:19:48.000000000
+0100
++++ udftools-2.3/udfinfo/readdisc.c 2024-11-20 20:52:55.780886735 +0100
+@@ -32,6 +32,7 @@
+ #include <linux/cdrom.h>
+ #include <sys/ioctl.h>
-+#include "config.h"
- #include "wrudf.h"
++#include "bswap.h"
+ #include "libudffs.h"
+ #include "readdisc.h"
+
+--- udftools-2.3/udfinfo/main.c.orig 2021-01-04 17:19:40.000000000 +0100
++++ udftools-2.3/udfinfo/main.c 2024-11-20 20:53:52.930577128 +0100
+@@ -34,6 +34,7 @@
+ #include <linux/fs.h>
+ #include <sys/ioctl.h>
+
++#include "bswap.h"
+ #include "libudffs.h"
+ #include "options.h"
+ #include "readdisc.h"
+--- udftools-2.3/udflabel/main.c.orig 2021-01-04 17:19:40.000000000 +0100
++++ udftools-2.3/udflabel/main.c 2024-11-20 21:06:40.713084360 +0100
+@@ -34,6 +34,7 @@
+ #include <linux/fs.h>
+ #include <sys/ioctl.h>
- char *devicename; /* "/dev/cdrom" or disk image filename
*/
++#include "bswap.h"
+ #include "libudffs.h"
+ #include "options.h"
+ #include "../udfinfo/readdisc.h"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/udftools.git/commitdiff/5432eae67c3c6573a5fa791bbfbfc82ae5cf833b
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
