patches for configure.in and nautilus.spec{.in}

From: Neil Weisenfeld <weisen ai mit edu>
To: nautilus-list gnome org
Subject: patches for configure.in and nautilus.spec{.in}
Date: 12 Mar 2003 15:04:49 -0500

I don't know from the discussion on desktop-devel if people are 
amenable to getting these patches, but here goes.

I'm also an autotools newbie, so I'm not sure if I did this right, but
the problems seem straightforward.  

Patches attached (let me know if requiring 'patch -p1' is non-standard).

This is my first attempt at this stuff, so let me know if this is
helpful or not.


Regards,
Neil



Changes summarized:

*** configure.in

- was missing a lot of AC_SUBST()'s for variables (e.g. ESOUND_REQUIRED)
that are required for correct generation of nautilus.spec 


*** nautilus.spec.in

- removed the ltmain-fixed.sh dependency as there's also a %pre script
to copy and fix ltmain.sh.  I don't know a lot about this issue, so if
people have other opinions, chime in.  All I know is that as it stood,
it was dependent on ltmain-fixed.sh existing in your (the package
end-user) SOURCES directory.

- commented out reference to omf and gnome/help files.  I have no idea
what the story is here, but they didn't seem to exist in the current
build.

- now includes locale files

- now includes gconf schema (is there supposed to be a *registration*
process here or is it enough just install the file?)

- nautilus views are now packaged from/installed to lib/bonobo and all
libnautilus-*-view.so are picked up.

- executable bonobo components in libexec are now packaged

- file(s) in  {/usr/share/}gnome/network is now packaged.



*** nautilus.spec

The above (nautilus.spec.in) changes applied using my configure script. 
I'm not including a  patch for the pre-generated configure script as
this would be more sensitive to whatever version of autoconf the
developers are using.




Neil Weisenfeld
Surgical Planning Laboratory
Brigham and Women's Hospital
neil bwh harvard edu
weisen ai mit edu

*** nautilus-2.2.2-ORIG/configure.in	Mon Mar 10 13:16:33 2003
--- nautilus-2.2.2-FIXED/configure.in	Tue Mar 11 22:59:56 2003
***************
*** 20,27 ****
--- 20,39 ----
  RSVG_REQUIRED=2.0.1
  XML_REQUIRED=2.4.7
  
+ AC_SUBST(ART_REQUIRED)
+ AC_SUBST(BONOBO_ACTIVATION_REQUIRED)
+ AC_SUBST(BONOBO_REQUIRED)
+ AC_SUBST(BONOBO_UI_REQUIRED)
  AC_SUBST(EEL_REQUIRED)
+ AC_SUBST(ESOUND_REQUIRED)
+ AC_SUBST(GLIB_REQUIRED)
+ AC_SUBST(GNOME_DESKTOP_REQUIRED)
+ AC_SUBST(GNOME_REQUIRED)
+ AC_SUBST(GNOME_UI_REQUIRED)
  AC_SUBST(GNOME_VFS_REQUIRED)
+ AC_SUBST(ORBIT_REQUIRED)
+ AC_SUBST(PANGO_REQUIRED)
+ AC_SUBST(GTK_REQUIRED)
  AC_SUBST(MEDUSA_REQUIRED)
  AC_SUBST(RSVG_REQUIRED)
  AC_SUBST(XML_REQUIRED)

*** nautilus-2.2.2-ORIG/nautilus.spec.in	Mon Dec 16 03:09:30 2002
--- nautilus-2.2.2-FIXED/nautilus.spec.in	Wed Mar 12 02:47:59 2003
***************
*** 6,12 ****
  License:          GPL
  Group:            User Interface/Desktop
  Source:           ftp://ftp.gnome.org/pub/GNOME/sources/%{name}-%{version}.tar.gz
- Source2:          fixed-ltmain.sh
  URL:              http://nautilus.eazel.com/
  BuildRoot:        %{_tmppath}/%{name}-%{version}-root
  BuildRequires:    pkgconfig >= 0.8
--- 6,11 ----
***************
*** 93,99 ****
  
  %build
  %configure
- rm ltmain.sh && cp %{SOURCE2} ltmain.sh
  make %{?_smp_mflags}
  
  %install
--- 92,97 ----
***************
*** 115,135 ****
  %defattr(-, root, root)
  %doc AUTHORS COPYING COPYING-DOCS COPYING.LIB ChangeLog INSTALL
  %doc MAINTAINERS NEWS README THANKS TODO
! %doc %{_datadir}/gnome/help/*
  %{_sysconfdir}/X11/serverconfig/.directory
  %{_sysconfdir}/X11/starthere/*
  %{_sysconfdir}/X11/starthere/.directory
  %{_sysconfdir}/X11/sysconfig/.directory
  %{_bindir}/*
  %{_libdir}/*.so*
! %{_libdir}/libnautilus-tree-view.so
  %{_libdir}/bonobo/servers/*
  %{_datadir}/applications/*
  %{_datadir}/gnome-2.0/ui/*
  %{_datadir}/idl/*
  %{_datadir}/nautilus
! %doc %{_datadir}/omf/nautilus/*
  %{_datadir}/pixmaps/*
  
  
  %files devel
--- 113,137 ----
  %defattr(-, root, root)
  %doc AUTHORS COPYING COPYING-DOCS COPYING.LIB ChangeLog INSTALL
  %doc MAINTAINERS NEWS README THANKS TODO
! #%doc %{_datadir}/gnome/help/*
! %{_sysconfdir}/gconf/*
  %{_sysconfdir}/X11/serverconfig/.directory
  %{_sysconfdir}/X11/starthere/*
  %{_sysconfdir}/X11/starthere/.directory
  %{_sysconfdir}/X11/sysconfig/.directory
  %{_bindir}/*
  %{_libdir}/*.so*
! %{_libdir}/bonobo/libnautilus-*-view.so
  %{_libdir}/bonobo/servers/*
+ %{_libexecdir}/*
  %{_datadir}/applications/*
  %{_datadir}/gnome-2.0/ui/*
  %{_datadir}/idl/*
  %{_datadir}/nautilus
! %{_datadir}/locale/*/*
  %{_datadir}/pixmaps/*
+ %{_datadir}/gnome/network/*
+ #%doc %{_datadir}/omf/nautilus/*
  
  
  %files devel
***************
*** 141,146 ****
--- 143,157 ----
  
  
  %changelog
+ * Tue Mar 12 2003 Neil Weisenfeld <weisen ai mit edu>
+ - Added various file targets: gnome/network, the libexecdir stuff,
+   locale, gconf (do we need to register this somehow?)
+ - Fixed nautilus-tree-view to come from lib/bonobo instead of lib/
+ - Actually, now pick up nautilus-*-view.so from lib/bonobo
+ - Commented out omf and gnome/help documentation.  (should this be
+   coming from somewhere else?)
+ - killed dependence on ltmain-fixed.sh as we're "fixing" it in the %prep
+ 
  * Tue Mar 05 2002 Chris Chabot <chabotc reviewboard com>
  - Fixed file list
  - ltmain.sh fix

*** nautilus-2.2.2-ORIG/nautilus.spec	Mon Mar 10 14:14:09 2003
--- nautilus-2.2.2-FIXED/nautilus.spec	Wed Mar 12 02:50:12 2003
***************
*** 6,41 ****
  License:          GPL
  Group:            User Interface/Desktop
  Source:           ftp://ftp.gnome.org/pub/GNOME/sources/%{name}-%{version}.tar.gz
- Source2:          fixed-ltmain.sh
  URL:              http://nautilus.eazel.com/
  BuildRoot:        %{_tmppath}/%{name}-%{version}-root
  BuildRequires:    pkgconfig >= 0.8
! Requires:         esound >= @ESOUND_REQUIRED@
! Requires:         bonobo-activation >= @BONOBO_ACTIVATION_REQUIRED@
  Requires:         eel2 >= 2.2.2
! Requires:         glib2 >= @GLIB_REQUIRED@
  Requires:         gnome-vfs2 >= 2.1.5
! Requires:         gtk2 >= @GTK_REQUIRED@
! Requires:         libart_lgpl >= @ART_REQUIRED@
! Requires:         libbonobo >= @BONOBO_REQUIRED@
! Requires:         libbonoboui >= @BONOBO_UI_REQUIRED@
! Requires:         libgnome >= @GNOME_REQUIRED@
! Requires:         gnome-desktop >= @GNOME_DESKTOP_REQUIRED@
! Requires:         libgnomeui >= @GNOME_UI_REQUIRED@
  Requires:         librsvg2 >= 2.0.1
  Requires:         libxml2 >= 2.4.7
! BuildRequires:    esound-devel >= @ESOUND_REQUIRED@
! BuildRequires:    bonobo-activation-devel >= @BONOBO_ACTIVATION_REQUIRED@
  BuildRequires:    eel2-devel >= 2.2.2
! BuildRequires:    glib2-devel >= @GLIB_REQUIRED@
  BuildRequires:    gnome-vfs2-devel >= 2.1.5
! BuildRequires:    gtk2-devel >= @GTK_REQUIRED@
! BuildRequires:    libart_lgpl-devel >= @ART_REQUIRED@
! BuildRequires:    libbonobo-devel >= @BONOBO_REQUIRED@
! BuildRequires:    libbonoboui-devel >= @BONOBO_UI_REQUIRED@
! BuildRequires:    libgnome-devel >= @GNOME_REQUIRED@
! BuildRequires:    gnome-desktop-devel >= @GNOME_DESKTOP_REQUIRED@
! BuildRequires:    libgnomeui-devel >= @GNOME_UI_REQUIRED@
  BuildRequires:    librsvg2-devel >= 2.0.1
  BuildRequires:    libxml2-devel >= 2.4.7
  
--- 6,40 ----
  License:          GPL
  Group:            User Interface/Desktop
  Source:           ftp://ftp.gnome.org/pub/GNOME/sources/%{name}-%{version}.tar.gz
  URL:              http://nautilus.eazel.com/
  BuildRoot:        %{_tmppath}/%{name}-%{version}-root
  BuildRequires:    pkgconfig >= 0.8
! Requires:         esound >= 0.2.27
! Requires:         bonobo-activation >= 2.1.0
  Requires:         eel2 >= 2.2.2
! Requires:         glib2 >= 2
  Requires:         gnome-vfs2 >= 2.1.5
! Requires:         gtk2 >= 2.1.1
! Requires:         libart_lgpl >= 2.3.10
! Requires:         libbonobo >= 2.1.0
! Requires:         libbonoboui >= 2.0.0
! Requires:         libgnome >= 2.1.1
! Requires:         gnome-desktop >= 2.1.0
! Requires:         libgnomeui >= 2.1.1
  Requires:         librsvg2 >= 2.0.1
  Requires:         libxml2 >= 2.4.7
! BuildRequires:    esound-devel >= 0.2.27
! BuildRequires:    bonobo-activation-devel >= 2.1.0
  BuildRequires:    eel2-devel >= 2.2.2
! BuildRequires:    glib2-devel >= 2
  BuildRequires:    gnome-vfs2-devel >= 2.1.5
! BuildRequires:    gtk2-devel >= 2.1.1
! BuildRequires:    libart_lgpl-devel >= 2.3.10
! BuildRequires:    libbonobo-devel >= 2.1.0
! BuildRequires:    libbonoboui-devel >= 2.0.0
! BuildRequires:    libgnome-devel >= 2.1.1
! BuildRequires:    gnome-desktop-devel >= 2.1.0
! BuildRequires:    libgnomeui-devel >= 2.1.1
  BuildRequires:    librsvg2-devel >= 2.0.1
  BuildRequires:    libxml2-devel >= 2.4.7
  
***************
*** 52,81 ****
  Group:            Development/Libraries
  Requires:         %name = %{version}
  Requires:         pkgconfig >= 0.8
! Requires:         esound >= @ESOUND_REQUIRED@
! Requires:         esound-devel >= @ESOUND_REQUIRED@
! Requires:         bonobo-activation >= @BONOBO_ACTIVATION_REQUIRED@
! Requires:         bonobo-activation-devel >= @BONOBO_ACTIVATION_REQUIRED@
  Requires:         eel2 >= 2.2.2
  Requires:         eel2-devel >= 2.2.2
! Requires:         glib2 >= @GLIB_REQUIRED@
! Requires:         glib2-devel >= @GLIB_REQUIRED@
  Requires:         gnome-vfs2 >= 2.1.5
  Requires:         gnome-vfs2-devel >= 2.1.5
! Requires:         gtk2 >= @GTK_REQUIRED@
! Requires:         gtk2-devel >= @GTK_REQUIRED@
! Requires:         libart_lgpl >= @ART_REQUIRED@
! Requires:         libart_lgpl-devel >= @ART_REQUIRED@
! Requires:         libbonobo >= @BONOBO_REQUIRED@
! Requires:         libbonobo-devel >= @BONOBO_REQUIRED@
! Requires:         libbonoboui >= @BONOBO_UI_REQUIRED@
! Requires:         libbonoboui-devel >= @BONOBO_UI_REQUIRED@
! Requires:         libgnome >= @GNOME_REQUIRED@
! Requires:         libgnome-devel >= @GNOME_REQUIRED@
! Requires:         gnome-desktop >= @GNOME_DESKTOP_REQUIRED@
! Requires:         gnome-desktop-devel >= @GNOME_DESKTOP_REQUIRED@
! Requires:         libgnomeui >= @GNOME_UI_REQUIRED@
! Requires:         libgnomeui-devel >= @GNOME_UI_REQUIRED@
  Requires:         librsvg2 >= 2.0.1
  Requires:         librsvg2-devel >= 2.0.1
  Requires:         libxml2 >= 2.4.7
--- 51,80 ----
  Group:            Development/Libraries
  Requires:         %name = %{version}
  Requires:         pkgconfig >= 0.8
! Requires:         esound >= 0.2.27
! Requires:         esound-devel >= 0.2.27
! Requires:         bonobo-activation >= 2.1.0
! Requires:         bonobo-activation-devel >= 2.1.0
  Requires:         eel2 >= 2.2.2
  Requires:         eel2-devel >= 2.2.2
! Requires:         glib2 >= 2
! Requires:         glib2-devel >= 2
  Requires:         gnome-vfs2 >= 2.1.5
  Requires:         gnome-vfs2-devel >= 2.1.5
! Requires:         gtk2 >= 2.1.1
! Requires:         gtk2-devel >= 2.1.1
! Requires:         libart_lgpl >= 2.3.10
! Requires:         libart_lgpl-devel >= 2.3.10
! Requires:         libbonobo >= 2.1.0
! Requires:         libbonobo-devel >= 2.1.0
! Requires:         libbonoboui >= 2.0.0
! Requires:         libbonoboui-devel >= 2.0.0
! Requires:         libgnome >= 2.1.1
! Requires:         libgnome-devel >= 2.1.1
! Requires:         gnome-desktop >= 2.1.0
! Requires:         gnome-desktop-devel >= 2.1.0
! Requires:         libgnomeui >= 2.1.1
! Requires:         libgnomeui-devel >= 2.1.1
  Requires:         librsvg2 >= 2.0.1
  Requires:         librsvg2-devel >= 2.0.1
  Requires:         libxml2 >= 2.4.7
***************
*** 93,99 ****
  
  %build
  %configure
- rm ltmain.sh && cp %{SOURCE2} ltmain.sh
  make %{?_smp_mflags}
  
  %install
--- 92,97 ----
***************
*** 115,135 ****
  %defattr(-, root, root)
  %doc AUTHORS COPYING COPYING-DOCS COPYING.LIB ChangeLog INSTALL
  %doc MAINTAINERS NEWS README THANKS TODO
! %doc %{_datadir}/gnome/help/*
  %{_sysconfdir}/X11/serverconfig/.directory
  %{_sysconfdir}/X11/starthere/*
  %{_sysconfdir}/X11/starthere/.directory
  %{_sysconfdir}/X11/sysconfig/.directory
  %{_bindir}/*
  %{_libdir}/*.so*
! %{_libdir}/libnautilus-tree-view.so
  %{_libdir}/bonobo/servers/*
  %{_datadir}/applications/*
  %{_datadir}/gnome-2.0/ui/*
  %{_datadir}/idl/*
  %{_datadir}/nautilus
! %doc %{_datadir}/omf/nautilus/*
  %{_datadir}/pixmaps/*
  
  
  %files devel
--- 113,137 ----
  %defattr(-, root, root)
  %doc AUTHORS COPYING COPYING-DOCS COPYING.LIB ChangeLog INSTALL
  %doc MAINTAINERS NEWS README THANKS TODO
! #%doc %{_datadir}/gnome/help/*
! %{_sysconfdir}/gconf/*
  %{_sysconfdir}/X11/serverconfig/.directory
  %{_sysconfdir}/X11/starthere/*
  %{_sysconfdir}/X11/starthere/.directory
  %{_sysconfdir}/X11/sysconfig/.directory
  %{_bindir}/*
  %{_libdir}/*.so*
! %{_libdir}/bonobo/libnautilus-*-view.so
  %{_libdir}/bonobo/servers/*
+ %{_libexecdir}/*
  %{_datadir}/applications/*
  %{_datadir}/gnome-2.0/ui/*
  %{_datadir}/idl/*
  %{_datadir}/nautilus
! %{_datadir}/locale/*/*
  %{_datadir}/pixmaps/*
+ %{_datadir}/gnome/network/*
+ #%doc %{_datadir}/omf/nautilus/*
  
  
  %files devel
***************
*** 141,146 ****
--- 143,157 ----
  
  
  %changelog
+ * Tue Mar 12 2003 Neil Weisenfeld <weisen ai mit edu>
+ - Added various file targets: gnome/network, the libexecdir stuff,
+   locale, gconf (do we need to register this somehow?)
+ - Fixed nautilus-tree-view to come from lib/bonobo instead of lib/
+ - Actually, now pick up nautilus-*-view.so from lib/bonobo
+ - Commented out omf and gnome/help documentation.  (should this be
+   coming from somewhere else?)
+ - killed dependence on ltmain-fixed.sh as we're "fixing" it in the %prep
+ 
  * Tue Mar 05 2002 Chris Chabot <chabotc reviewboard com>
  - Fixed file list
  - ltmain.sh fix

Follow-Ups:
- Re: patches for configure.in and nautilus.spec{.in}
  - From: Chris Chabot
- Re: patches for configure.in and nautilus.spec{.in}
  - From: Alexander Larsson

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]