[Evolution-hackers] Patch for build problems and specfile

From: Ross Golder <rossigee bigfoot com>
To: evolution-hackers helixcode com
Subject: [Evolution-hackers] Patch for build problems and specfile
Date: Tue, 23 May 2000 01:14:46 +0100

Objective: To get 'rpm -tb evolution-0.0.tar.gz' to work on the results
of a 'make dist', done in a CVS working directory.

Results: An 'evolution.spec.in' file, and a patch to fix a couple of
minor build/dist problems.

Outstanding: Could someone commit this for me? Ta.

Regards,

-- 
Ross

Deliberation, n.:
	The act of examining one's bread to determine which side it is
	buttered on.
		-- Ambrose Bierce, "The Devil's Dictionary"

Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/Makefile.am,v
retrieving revision 1.26
diff -c -b -r1.26 Makefile.am
*** Makefile.am	2000/05/10 14:46:53	1.26
--- Makefile.am	2000/05/22 23:59:54
***************
*** 7,13 ****
  	README			\
  	HACKING			\
  	MAINTAINERS		\
! 	NEWS
  
  SUBDIRS =			\
  	intl			\
--- 7,14 ----
  	README			\
  	HACKING			\
  	MAINTAINERS		\
! 	NEWS			\
! 	evolution.spec.in
  
  SUBDIRS =			\
  	intl			\
***************
*** 30,32 ****
--- 31,36 ----
  	default_user		\
  	tools			\
  	po
+ 
+ dist-hook: evolution.spec
+ 	cp evolution.spec $(distdir)
Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution/configure.in,v
retrieving revision 1.94
diff -c -b -r1.94 configure.in
*** configure.in	2000/05/22 16:29:47	1.94
--- configure.in	2000/05/22 23:59:55
***************
*** 421,426 ****
--- 421,427 ----
  
  AC_OUTPUT([
  Makefile
+ evolution.spec
  macros/Makefile
  intl/Makefile
  po/Makefile.in
Index: addressbook/gui/component/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/Makefile.am,v
retrieving revision 1.10
diff -c -b -r1.10 Makefile.am
*** addressbook/gui/component/Makefile.am	2000/05/14 14:31:21	1.10
--- addressbook/gui/component/Makefile.am	2000/05/22 23:59:55
***************
*** 54,60 ****
  endif
  
  gladedir   = $(datadir)/evolution/glade
! glade_DATA = ldap-server-dialog.glade
  
  EXTRA_DIST = 			\
  	$(glade_DATA)		\
--- 54,60 ----
  endif
  
  gladedir   = $(datadir)/evolution/glade
! glade_DATA = ldap-server-dialog.glade ldap-server-dialog.glade.h
  
  EXTRA_DIST = 			\
  	$(glade_DATA)		\
Index: addressbook/printing/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/printing/Makefile.am,v
retrieving revision 1.4
diff -c -b -r1.4 Makefile.am
*** addressbook/printing/Makefile.am	2000/05/10 14:46:59	1.4
--- addressbook/printing/Makefile.am	2000/05/22 23:59:56
***************
*** 41,47 ****
  gladedir   = $(datadir)/evolution/glade
  
  glade_DATA = 				\
! 	e-contact-print.glade
  
  EXTRA_DIST = $(glade_DATA)
  
--- 41,48 ----
  gladedir   = $(datadir)/evolution/glade
  
  glade_DATA = 				\
! 	e-contact-print.glade		\
! 	e-contact-print.glade.h
  
  EXTRA_DIST = $(glade_DATA)
  
Index: calendar/gui/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/Makefile.am,v
retrieving revision 1.115
diff -c -b -r1.115 Makefile.am
*** calendar/gui/Makefile.am	2000/05/17 17:27:12	1.115
--- calendar/gui/Makefile.am	2000/05/22 23:59:57
***************
*** 209,215 ****
  	monthview.xpm		\
  	yearview.xpm		\
  	calendar-control.gnorba	\
! 	calendar-control.oafinfo
  
  #	gnome-calendar-conduit.png
  #	todo-conduit-control-applet.desktop
--- 209,216 ----
  	monthview.xpm		\
  	yearview.xpm		\
  	calendar-control.gnorba	\
! 	calendar-control.oafinfo \
! 	event-editor-dialog.glade
  
  #	gnome-calendar-conduit.png
  #	todo-conduit-control-applet.desktop
Index: calendar/gui/calendar-commands.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/calendar-commands.c,v
retrieving revision 1.18
diff -c -b -r1.18 calendar-commands.c
*** calendar/gui/calendar-commands.c	2000/05/11 21:26:08	1.18
--- calendar/gui/calendar-commands.c	2000/05/22 23:59:58
***************
*** 20,26 ****
  #include <libgnorba/gnorba.h>
  #include <bonobo.h>
  #include <cal-util/timeutil.h>
- #include "eventedit.h"
  #include "gnome-cal.h"
  #include "calendar-commands.h"
  
--- 20,25 ----
Index: calendar/gui/e-day-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-day-view.c,v
retrieving revision 1.18
diff -c -b -r1.18 e-day-view.c
*** calendar/gui/e-day-view.c	2000/05/20 10:38:19	1.18
--- calendar/gui/e-day-view.c	2000/05/23 00:00:03
***************
*** 38,44 ****
  #include "e-day-view-main-item.h"
  #include "calendar-commands.h"
  #include "popup-menu.h"
- #include "eventedit.h"
  #include "../e-util/e-canvas.h"
  #include "../widgets/e-text/e-text.h"
  
--- 38,43 ----
Index: calendar/gui/e-week-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-week-view.c,v
retrieving revision 1.11
diff -c -b -r1.11 e-week-view.c
*** calendar/gui/e-week-view.c	2000/05/20 10:38:19	1.11
--- calendar/gui/e-week-view.c	2000/05/23 00:00:05
***************
*** 36,42 ****
  #include "e-week-view-titles-item.h"
  #include <cal-util/timeutil.h>
  #include "popup-menu.h"
- #include "eventedit.h"
  #include "../e-util/e-canvas.h"
  #include "../widgets/e-text/e-text.h"
  
--- 36,41 ----
Index: calendar/gui/eventedit.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/eventedit.c,v
retrieving revision 1.74
diff -c -b -r1.74 eventedit.c
*** calendar/gui/eventedit.c	2000/05/15 16:51:36	1.74
--- calendar/gui/eventedit.c	2000/05/23 00:00:07
***************
*** 11,17 ****
  #include <gnome.h>
  #include <string.h>
  #include <cal-util/timeutil.h>
- #include "eventedit.h"
  #include "calendar-commands.h"
  
  
--- 11,16 ----
Index: calendar/gui/evolution-calendar-control.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/evolution-calendar-control.c,v
retrieving revision 1.11
diff -c -b -r1.11 evolution-calendar-control.c
*** calendar/gui/evolution-calendar-control.c	2000/05/16 07:33:43	1.11
--- calendar/gui/evolution-calendar-control.c	2000/05/23 00:00:07
***************
*** 15,21 ****
  
  #include <cal-util/timeutil.h>
  #include <gui/alarm.h>
- #include <gui/eventedit.h>
  #include <gui/gnome-cal.h>
  #include <gui/calendar-commands.h>
  
--- 15,20 ----
Index: calendar/gui/gncal-todo.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/gncal-todo.c,v
retrieving revision 1.27
diff -c -b -r1.27 gncal-todo.c
*** calendar/gui/gncal-todo.c	2000/05/06 10:43:14	1.27
--- calendar/gui/gncal-todo.c	2000/05/23 00:00:08
***************
*** 12,18 ****
  #include "gncal-todo.h"
  #include "calendar-commands.h"
  #include "popup-menu.h"
- #include "eventedit.h"
  
  int todo_show_due_date = 0;
  int todo_show_priority = 0;
--- 12,17 ----
Index: calendar/gui/gnome-cal.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/gnome-cal.c,v
retrieving revision 1.92
diff -c -b -r1.92 gnome-cal.c
*** calendar/gui/gnome-cal.c	2000/05/16 07:53:17	1.92
--- calendar/gui/gnome-cal.c	2000/05/23 00:00:09
***************
*** 24,30 ****
  #include "alarm.h"
  #include "e-day-view.h"
  #include "e-week-view.h"
- #include "eventedit.h"
  #include "gncal-todo.h"
  #include "gnome-cal.h"
  #include "year-view.h"
--- 24,29 ----
Index: calendar/gui/main.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/main.c,v
retrieving revision 1.106
diff -c -b -r1.106 main.c
*** calendar/gui/main.c	2000/04/28 04:22:57	1.106
--- calendar/gui/main.c	2000/05/23 00:00:10
***************
*** 22,28 ****
  #include <bonobo.h>
  #include <cal-util/timeutil.h>
  #include <gui/alarm.h>
- #include <gui/eventedit.h>
  #include <gui/gnome-cal.h>
  #include <gui/calendar-commands.h>
  
--- 22,27 ----
Index: calendar/gui/month-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/month-view.c,v
retrieving revision 1.29
diff -c -b -r1.29 month-view.c
*** calendar/gui/month-view.c	2000/04/16 19:25:55	1.29
--- calendar/gui/month-view.c	2000/05/23 00:00:10
***************
*** 9,15 ****
  #include <gnome.h>
  #include <libgnomeui/gnome-canvas-text.h>
  #include <cal-util/timeutil.h>
- #include "eventedit.h"
  #include "layout.h"
  #include "month-view.h"
  #include "calendar-commands.h"
--- 9,14 ----
Index: calendar/gui/year-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/year-view.c,v
retrieving revision 1.41
diff -c -b -r1.41 year-view.c
*** calendar/gui/year-view.c	2000/04/16 19:25:55	1.41
--- calendar/gui/year-view.c	2000/05/23 00:00:11
***************
*** 10,16 ****
  #include <gtk/gtkmain.h>
  #include <gnome.h>
  #include <cal-util/timeutil.h>
- #include "eventedit.h"
  #include "year-view.h"
  #include "calendar-commands.h"
  #include "mark.h"
--- 10,15 ----
Index: composer/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/composer/Makefile.am,v
retrieving revision 1.10
diff -c -b -r1.10 Makefile.am
*** composer/Makefile.am	2000/05/02 21:33:56	1.10
--- composer/Makefile.am	2000/05/23 00:00:11
***************
*** 2,8 ****
  
  glade_DATA =					\
  	e-msg-composer-address-dialog.glade	\
! 	e-msg-composer-attachment.glade
  
  libcomposerincludedir = $(includedir)/composer
  
--- 2,10 ----
  
  glade_DATA =					\
  	e-msg-composer-address-dialog.glade	\
! 	e-msg-composer-address-dialog.glade.h	\
! 	e-msg-composer-attachment.glade		\
! 	e-msg-composer-attachment.glade.h
  
  libcomposerincludedir = $(includedir)/composer
  
Index: filter/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/filter/Makefile.am,v
retrieving revision 1.7
diff -c -b -r1.7 Makefile.am
*** filter/Makefile.am	2000/05/16 23:08:32	1.7
--- filter/Makefile.am	2000/05/23 00:00:11
***************
*** 28,34 ****
  	filter-driver.c				\
  	filter-driver.h
  
! EXTRA_DIST = blank.xpm check.xpm
  
  # basic rules.
  filterdir = $(prefix)/share/evolution
--- 28,34 ----
  	filter-driver.c				\
  	filter-driver.h
  
! EXTRA_DIST = blank.xpm check.xpm filtertypes.xml
  
  # basic rules.
  filterdir = $(prefix)/share/evolution

# Note this is NOT a relocatable thing :)
%define name		evolution
%define ver		@VERSION@
%define RELEASE		1
%define rel		%{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
%define prefix		/usr
%define sysconfdir	/etc

Name:		%name
Summary:	Integrated GNOME mail client, calendar and address book.
Version: 	%ver
Release: 	%rel
Copyright: 	GPL
Group:		System Environment/Libraries
Source: 	%{name}-%{ver}.tar.gz
URL: 		http://www.gnome.org/
BuildRoot:	/var/tmp/%{name}-%{ver}-root
Docdir: 	%{prefix}/doc

%description

%package devel
Summary:	Libraries and include files for developing Evolution components
Group:		Development/Libraries
Requires:	%name = %{PACKAGE_VERSION}
Obsoletes:	%{name}-devel

%description devel
This package provides the necessary development libraries and include
files to allow you to develop evolution components.

%changelog
* Sun May 21 2000 Ross Golder <rossigee bigfoot com>
- created spec file

%prep
%setup

%build
%ifarch alpha
  MYARCH_FLAGS="--host=alpha-redhat-linux"
%endif

LC_ALL=""
LINGUAS=""
LANG=""
export LC_ALL LINGUAS LANG

CFLAGS="$RPM_OPT_FLAGS" ./configure $MYARCH_FLAGS --prefix=%{prefix} \
	--sysconfdir=%{sysconfdir}

if [ "$SMP" != "" ]; then
  (make "MAKE=make -k -j $SMP"; exit 0)
  make
else
  make
fi

%install
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT

make prefix=$RPM_BUILD_ROOT%{prefix} sysconfdir=$RPM_BUILD_ROOT%{sysconfdir} install

for FILE in "$RPM_BUILD_ROOT/bin/*"; do
	file "$FILE" | grep -q not\ stripped && strip $FILE
done

%clean
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT

%post
if ! grep %{prefix}/lib /etc/ld.so.conf > /dev/null ; then
  echo "%{prefix}/lib" >> /etc/ld.so.conf
fi
  
/sbin/ldconfig
  
%postun -p /sbin/ldconfig

%files
%defattr(0555, bin, bin)

%doc AUTHORS COPYING ChangeLog NEWS README
%{prefix}/bin/evolution
%{prefix}/bin/evolution-mail
%{prefix}/bin/evolution-addressbook
%{prefix}/bin/evolution-calendar
%{prefix}/bin/wombat
%{prefix}/bin/killev
%{prefix}/lib/lib*.so.*
%{prefix}/lib/evolution/camel-providers/*/lib*.so.*
#%{prefix}/lib/evolution/camel-providers/*/*.url

%defattr(0644, bin, bin)
%{prefix}/share/evolution/glade/*.glade
%{prefix}/share/evolution/filtertypes.xml
%{prefix}/share/evolution/default_user/shortcuts.xml
%{prefix}/share/evolution/default_user/local/*

%defattr (0444, bin, bin)
%{prefix}/share/locale/*/LC_MESSAGES/*
%{prefix}/share/gnome/help/gnomecal/*
%{prefix}/share/images/evolution/*.png
%{sysconfdir}/CORBA/servers/*

%files devel

%defattr(0555, bin, bin)
%{prefix}/lib/*.a
%{prefix}/lib/*.so
%{prefix}/lib/*.la
%{prefix}/lib/evolution/camel-providers/*/*.a
%{prefix}/lib/evolution/camel-providers/*/*.so
%{prefix}/lib/evolution/camel-providers/*/*.la

%defattr(0444, bin, bin)
%{prefix}/include/*.h
%{prefix}/include/camel/*.h
%{prefix}/include/composer/*.h
%{prefix}/include/ename/*.h
%{prefix}/include/evolution/ebook/*.h
%{prefix}/include/evolution/cal-util/*.h
%{prefix}/include/evolution/cal-client/*.h
%{prefix}/share/idl/*.idl

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