- updated gcdmaster-paths patch for /usr (untested)

- added nolibs patch to avoid unnecessary -lnsl
- added missing files
- BR: lame-libs-devel

Changed files:
    cdrdao-gcdmaster-paths.patch -> 1.4
    cdrdao-nolibs.patch -> 1.1
    cdrdao.spec -> 1.30

diff --git a/cdrdao-gcdmaster-paths.patch b/cdrdao-gcdmaster-paths.patch
index bcad813b90c828d47e174797432fae907c66e3e9..b4c8c1eb414cef3444719304a0de0d42fbe83437 100644 (file)
--- a/cdrdao-gcdmaster-paths.patch
+++ b/cdrdao-gcdmaster-paths.patch
@@ -1,27 +1,5 @@
 --- cdrdao-1.1.7/xdao/Makefile.in.orig Wed Dec 25 21:09:53 2002
 +++ cdrdao-1.1.7/xdao/Makefile.in      Wed Dec 25 21:12:03 2002
-@@ -8,16 +8,16 @@
- # 
- # Source and Installation Paths
- #
--prefix  =      @prefix@
--exec_prefix =  @exec_prefix@
-+prefix  =      /usr/X11R6
-+exec_prefix =  /usr/X11R6
- srcdir =       @srcdir@
--datadir  =     @datadir@
-+datadir  =     /usr/X11R6/share
- VPATH =        @srcdir@
- #
- # Installation directories for binaries and manual pages
- #
--bindir  =      @bindir@
--mandir  =      @mandir@
-+bindir  =      /usr/X11R6/bin
-+mandir  =      /usr/X11R6/man
- man1dir =      $(mandir)/man1
- #
- # install program
 @@ -72,7 +72,7 @@
  
  install: all installdirs
@@ -36,14 +14,14 @@
        $(INSTALL_DATA) pixmap_zoom-selection.xpm $(DESTDIR)$(PIXMAPS_DIR)/pixmap_zoom-selection.xpm
        $(INSTALL_DATA) pixmap_zoom-fit.xpm $(DESTDIR)$(PIXMAPS_DIR)/pixmap_zoom-fit.xpm
 -      $(INSTALL_DATA) gcdmaster.desktop $(DESTDIR)$(datadir)/gnome/apps/Applications/gcdmaster.desktop
-+      $(INSTALL_DATA) gcdmaster.desktop $(DESTDIR)$(datadir)/applnk/Applications/gcdmaster.desktop
++      $(INSTALL_DATA) gcdmaster.desktop $(DESTDIR)$(datadir)/applnk/Utilities/CD-RW/gcdmaster.desktop
  
  installdirs:
        $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir)
        $(srcdir)/../mkinstalldirs $(DESTDIR)$(man1dir)
        $(srcdir)/../mkinstalldirs $(DESTDIR)$(PIXMAPS_DIR)
 -      $(srcdir)/../mkinstalldirs $(DESTDIR)$(datadir)/gnome/apps/Applications
-+      $(srcdir)/../mkinstalldirs $(DESTDIR)$(datadir)/applnk/Applications/
++      $(srcdir)/../mkinstalldirs $(DESTDIR)$(datadir)/applnk/Utilities/CD-RW
  
  uninstall:
        rm -f $(bindir)/$(PRG) $(man1dir)/xcdrdao.1

diff --git a/cdrdao-nolibs.patch b/cdrdao-nolibs.patch
new file mode 100644 (file)
index 0000000..21433df
--- /dev/null
+++ b/cdrdao-nolibs.patch
@@ -0,0 +1,20 @@
+--- cdrdao-1.1.7/configure.in.orig     Sun Oct  6 20:53:55 2002
++++ cdrdao-1.1.7/configure.in  Thu Mar 13 21:06:12 2003
+@@ -65,12 +65,12 @@
+ AC_CHECK_FUNC(sched_setscheduler,AC_DEFINE(HAVE_SCHED_SETSCHEDULER),
+   AC_CHECK_LIB(posix4,sched_setscheduler,[use_libposix4=yes;AC_DEFINE(HAVE_SCHED_SETSCHEDULER)]))
+ 
+-AC_CHECK_LIB(socket,socket,[use_libsocket=yes])
+-AC_CHECK_LIB(socket,connect,[use_libsocket=yes])
++AC_CHECK_FUNC(socket, , [AC_CHECK_LIB(socket,socket,[use_libsocket=yes])])
++AC_CHECK_FUNC(connect, , [AC_CHECK_LIB(socket,connect,[use_libsocket=yes])])
+ 
+-AC_CHECK_LIB(nsl,gethostbyname,[use_libnsl=yes])
+-AC_CHECK_LIB(nsl,inet_addr,[use_libnsl=yes])
+-AC_CHECK_LIB(nsl,inet_ntoa,[use_libnsl=yes])
++AC_CHECK_FUNC(gethostbyname, , [AC_CHECK_LIB(nsl,gethostbyname,[use_libnsl=yes])])
++AC_CHECK_FUNC(inet_addr, , [AC_CHECK_LIB(nsl,inet_addr,[use_libnsl=yes])])
++AC_CHECK_FUNC(inet_ntoa, , [AC_CHECK_LIB(nsl,inet_ntoa,[use_libnsl=yes])])
+ 
+ dnl Add 'libsocket' if required
+ if test "$use_libsocket" = yes; then

diff --git a/cdrdao.spec b/cdrdao.spec
index 15def34768ee53b7766007b3589a0811dd990e25..7c61180e01270102572f633b98ed4894c9a1b125 100644 (file)
--- a/cdrdao.spec
+++ b/cdrdao.spec
@@ -13,6 +13,7 @@ Group:                Applications/System
 Source0:       ftp://ftp.sourceforge.net/pub/sourceforge/cdrdao/%{name}-%{version}.src.tar.bz2
 Patch0:                %{name}-destdir.patch
 Patch1:                %{name}-opt.patch
+Patch2:                %{name}-nolibs.patch
 Patch3:                %{name}-gcdmaster-paths.patch
 URL:           http://cdrdao.sourceforge.net/
 BuildRequires: autoconf
@@ -20,6 +21,7 @@ BuildRequires:        automake
 %{!?_without_gnome:BuildRequires:      gnome-libs-devel >= 1.2.3}
 %{!?_without_gnome:BuildRequires:      gnomemm-devel >= 1.1.17}
 %{!?_without_gnome:BuildRequires:      gtkmm-devel >= 1.2.5}
+BuildRequires: lame-libs-devel
 BuildRequires: libstdc++-devel
 BuildRequires: pccts >= 1.33MR33-4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -64,6 +66,7 @@ niedestruktywne ci
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %patch3 -p1
 
 %build
@@ -94,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc CREDITS README README.PlexDAE Release*
 %attr(755,root,root) %{_bindir}/cdrdao
+%attr(755,root,root) %{_bindir}/toc2*
+%dir %{_datadir}/cdrdao
+%{_datadir}/cdrdao/drivers
 %{_mandir}/man1/cdrdao.*
 
 %if %{?_without_gnome:0}%{!?_without_gnome:1}