- updated to 0.6.4.pl00

- updated link patch, added info patch

Changed files:
    libisoburn-info.patch -> 1.1
    libisoburn-link.patch -> 1.3
    libisoburn.spec -> 1.4

diff --git a/libisoburn-info.patch b/libisoburn-info.patch
new file mode 100644 (file)
index 0000000..5e011ad
--- /dev/null
+++ b/libisoburn-info.patch
@@ -0,0 +1,14 @@
+--- libisoburn-0.6.4/xorriso/xorriso.texi.orig 2010-10-26 11:31:25.000000000 +0200
++++ libisoburn-0.6.4/xorriso/xorriso.texi      2010-11-11 16:03:35.879104128 +0100
+@@ -5,9 +5,9 @@
+ @c %**end of header
+ @c
+ @c man-ignore-lines begin
+-@dircategory Archiving
++@dircategory File utilities:
+ @direntry
+-* Xorriso: (xorriso).           Burns ISO 9660 on CD, DVD, BD.
++* Xorriso: (xorriso).                 Burns ISO 9660 on CD, DVD, BD
+ @end direntry
+ @c man-ignore-lines end
+ @c

diff --git a/libisoburn-link.patch b/libisoburn-link.patch
index 0549988f68cb42070c457b28579494d7c22acd22..7979cf42048961964c4d3e386038992649ba6755 100644 (file)
--- a/libisoburn-link.patch
+++ b/libisoburn-link.patch
@@ -1,16 +1,15 @@
---- libisoburn-0.3.8/configure.ac.orig 2009-04-18 14:32:46.000000000 +0200
-+++ libisoburn-0.3.8/configure.ac      2009-06-09 18:21:48.185229777 +0200
-@@ -99,14 +99,13 @@
- dnl Check whether there is readline-devel and readline-runtime.
- dnl If not, erase this macro which would enable use of readline(),add_history()
-     READLINE_DEF="-DXorriso_with_readlinE"
--dnl The empty yes case obviously causes -lreadline to be linked
--    AC_CHECK_HEADER(readline/readline.h, AC_CHECK_LIB(readline, readline, , READLINE_DEF= ), READLINE_DEF= )
--dnl The X= in the yes case prevents that -lreadline gets linked twice
--    AC_CHECK_HEADER(readline/history.h, AC_CHECK_LIB(readline, add_history, X= , READLINE_DEF= ), READLINE_DEF= )
-+    AC_CHECK_HEADER(readline/readline.h, AC_CHECK_LIB(readline, readline, READLINE_LIBS=-lreadline, READLINE_DEF= ), READLINE_DEF= )
-+    AC_CHECK_HEADER(readline/history.h, AC_CHECK_LIB(readline, add_history, READLINE_LIBS=-lreadline, READLINE_DEF= ), READLINE_DEF= )
- else
+--- libisoburn-0.6.4/configure.ac.orig 2010-10-26 12:19:52.000000000 +0200
++++ libisoburn-0.6.4/configure.ac      2010-11-11 15:41:46.855097423 +0100
+@@ -129,7 +129,7 @@
+ 
+     else
+ dnl The empty yes case obviously causes -lreadline to be linked
+-        AC_CHECK_HEADER(readline/readline.h, AC_CHECK_LIB(readline, readline, , READLINE_DEF= ), READLINE_DEF= )
++        AC_CHECK_HEADER(readline/readline.h, AC_CHECK_LIB(readline, readline, READLINE_LIBS=-lreadline, READLINE_DEF= ), READLINE_DEF= )
+ dnl The X= in the yes case prevents that -lreadline gets linked twice
+         AC_CHECK_HEADER(readline/history.h, AC_CHECK_LIB(readline, add_history, X= , READLINE_DEF= ), READLINE_DEF= )
+     fi
+@@ -137,6 +137,7 @@
      READLINE_DEF=
  fi
  AC_SUBST(READLINE_DEF)

diff --git a/libisoburn.spec b/libisoburn.spec
index 00938ee8b793b53272a2750a92f4e5bc0795e434..814e366ffea0ffcfe55a1e203f2beac32ac5e149 100644 (file)
--- a/libisoburn.spec
+++ b/libisoburn.spec
@@ -1,23 +1,24 @@
 Summary:       Multi-session filesystem extension to libisofs, libburn
 Summary(pl.UTF-8):     Wielosesyjne rozszerzenie systemu plików do libisofs i libburn
 Name:          libisoburn
-Version:       0.3.8.pl00
+Version:       0.6.4.pl00
 Release:       1
-License:       GPL v2
+License:       GPL v2+
 Group:         Libraries
 Source0:       http://files.libburnia-project.org/releases/%{name}-%{version}.tar.gz
-# Source0-md5: 950f75f33c5e7133506c2399b4e3ba39
+# Source0-md5: 5c90840bfbaed6274303d3faab95d536
 Patch0:                %{name}-link.patch
 URL:           http://libburnia.pykix.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
-BuildRequires: libburn-devel >= 0.6.4
-BuildRequires: libisofs-devel >= 0.6.18
+BuildRequires: libburn-devel >= 0.8.8
+BuildRequires: libisofs-devel >= 0.6.38
 BuildRequires: libtool
 BuildRequires: pkgconfig >= 1:0.9.0
 BuildRequires: readline-devel
-Requires:      libburn >= 0.6.4
-Requires:      libisofs >= 0.6.18
+BuildRequires: texinfo
+Requires:      libburn >= 0.8.8
+Requires:      libisofs >= 0.6.38
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -49,8 +50,8 @@ Summary:      Header files for libisoburn library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki libisoburn
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      libburn-devel >= 0.6.4
-Requires:      libisofs-devel >= 0.6.18
+Requires:      libburn-devel >= 0.8.8
+Requires:      libisofs-devel >= 0.6.38
 
 %description devel
 Header files for libisoburn library.
@@ -71,7 +72,7 @@ Static libisoburn library.
 Statyczna biblioteka libisoburn.
 
 %prep
-%setup -q -n %{name}-0.3.8
+%setup -q -n %{name}-0.6.4
 %patch0 -p1
 
 %build
@@ -91,12 +92,17 @@ rm -rf $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post  -p /sbin/ldconfig
-%postun        -p /sbin/ldconfig
+%post  -p /sbin/postshell
+/sbin/ldconfig
+-/usr/sbin/fix-info-dir -c %{_infodir}
+
+%postun        -p /sbin/postshell
+/sbin/ldconfig
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYRIGHT README TODO
+%doc AUTHORS COPYRIGHT ChangeLog README TODO
 %attr(755,root,root) %{_bindir}/osirrox
 %attr(755,root,root) %{_bindir}/xorrecord
 %attr(755,root,root) %{_bindir}/xorriso
@@ -104,6 +110,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libisoburn.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libisoburn.so.1
 %{_mandir}/man1/xorriso.1*
+%{_infodir}/xorriso.info*
 
 %files devel
 %defattr(644,root,root,755)