summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Fischer <eric@src.gnome.org>2001-02-15 21:20:00 +0000
committerEric Fischer <eric@src.gnome.org>2001-02-15 21:20:00 +0000
commit3ed55b9af6c533bd52f8d9ab62f42fd31a674a7c (patch)
tree9b37d806eeec9bd4fefff3d3ea99a42902932a37
parentfec21973c534c20e3e8eec9c6b78e1f5a4f972b2 (diff)
downloadnautilus-3ed55b9af6c533bd52f8d9ab62f42fd31a674a7c.tar.gz
Start building the eazel installer, and put it into its own RPM. (This
* nautilus.spec.in: Start building the eazel installer, and put it into its own RPM. (This should eventually be separate from building nautilus) * nautilus-installer/libtrilobite/Makefile.am: Add a dependency to create the .h files, since gmake complains otherwise.
-rw-r--r--ChangeLog10
-rw-r--r--nautilus-installer/libtrilobite/Makefile.am22
-rw-r--r--nautilus.spec.in13
3 files changed, 44 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 67d84e827..283678755 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-02-15 Eric Fischer <eric@eazel.com>
+
+ * nautilus.spec.in:
+ Start building the eazel installer, and put it into its own RPM.
+ (This should eventually be separate from building nautilus)
+
+ * nautilus-installer/libtrilobite/Makefile.am:
+ Add a dependency to create the .h files, since gmake complains
+ otherwise.
+
2001-02-15 Andy Hertzfeld <andy@eazel.com>
fixed bug 6589, nautilus crashes if a moderate sized text block
diff --git a/nautilus-installer/libtrilobite/Makefile.am b/nautilus-installer/libtrilobite/Makefile.am
index 696506daf..a31298443 100644
--- a/nautilus-installer/libtrilobite/Makefile.am
+++ b/nautilus-installer/libtrilobite/Makefile.am
@@ -15,6 +15,25 @@ libtrilobite_minimal_a_SOURCES = \
trilobite-md5-tools.c \
$(NULL)
+HDRS = \
+ libtrilobite.h \
+ libtrilobite-service.h \
+ trilobite-core-distribution.h \
+ trilobite-core-messaging.h \
+ trilobite-core-network.h \
+ trilobite-core-utils.h \
+ trilobite-md5-tools.h \
+ trilobite-redirect.h \
+ trilobite-root-client-private.h \
+ trilobite-root-client-public.h \
+ trilobite-root-helper.h \
+ trilobite-service.h \
+ trilobite-service-passwordquery-private.h \
+ trilobite-service-passwordquery-public.h \
+ trilobite-service-private.h \
+ trilobite-service-public.h \
+ $(NULL)
+
INCLUDES= \
-DTRILOBITE_VERSION=\"0.1.0\" \
-I. \
@@ -26,6 +45,7 @@ INCLUDES= \
@XML_CFLAGS@ \
$(NULL)
-$(libtrilobite_minimal_a_SOURCES):
+$(libtrilobite_minimal_a_SOURCES) $(HDRS):
for i in $(top_srcdir)/components/services/trilobite/libtrilobite/*.[ch]; \
do bn=`basename $$i`; rm -f $$bn; ln -s $$i $$bn; done
+
diff --git a/nautilus.spec.in b/nautilus.spec.in
index f5f605c84..052055ba6 100644
--- a/nautilus.spec.in
+++ b/nautilus.spec.in
@@ -78,6 +78,10 @@ Requires: %name-extras = %{PACKAGE_VERSION}
Requires: mozilla-mail = 0.7
Requires: mozilla-psm = 0.7
+%package installer
+Summary: Eazel installer
+Group: User Interface/Desktop
+
%description devel
This package provides the necessary development libraries and include
files to allow you to develop Nautilus components.
@@ -97,6 +101,9 @@ Nautilus, and getting multimedia to work, such as eog and mpg123.
%description extras
This is a meta-package that requires useful add-ons for Nautilus.
+%description installer
+This is the Eazel installer.
+
%changelog
* Tue Oct 10 2000 Robin Slomkowski <rslomkow@eazel.com>
- removed obsoletes from sub packages and added mozilla and trilobite
@@ -122,6 +129,7 @@ export LC_ALL LINGUAS LANG
## continuation character, or else the rpm demons will eat you.
CFLAGS="$RPM_OPT_FLAGS -DENABLE_SCROLLKEEPER_SUPPORT" ./configure $MYARCH_FLAGS --prefix=%{prefix} \
--enable-eazel-services \
+ --enable-installer \
--enable-more-warnings \
--sysconfdir=%{sysconfdir}
@@ -324,3 +332,8 @@ fi
%defattr(0444, bin, bin)
%{prefix}/share/nautilus/nautilus-suggested.placeholder
+
+%files installer
+
+%defattr(0555, bin, bin)
+%{prefix}/bin/eazel-installer.sh