Commit 8bbdacb1 authored by Eskil Heyn Olsen's avatar Eskil Heyn Olsen

Ensured that the current stuff in cvs builds a working installer. (closing


	* components/services/install/lib/eazel-install-rpm-glue.c:
	(do_rpm_install):
	* components/services/install/lib/eazel-install-types.c:
	(packagedata_new_from_rpm_header):
	* nautilus-installer/src/Makefile:
	* nautilus-installer/src/prescript:
	Ensured that the current stuff in cvs builds a working installer.
	(closing bug#969)
parent ba852fa3
2000-06-02 Eskil Heyn Olsen <eskil@eazel.com>
* components/services/install/lib/eazel-install-rpm-glue.c:
(do_rpm_install):
* components/services/install/lib/eazel-install-types.c:
(packagedata_new_from_rpm_header):
* nautilus-installer/src/Makefile:
* nautilus-installer/src/prescript:
Ensured that the current stuff in cvs builds a working installer.
(closing bug#969)
2000-06-02 Ramiro Estrugo <ramiro@eazel.com> 2000-06-02 Ramiro Estrugo <ramiro@eazel.com>
* nautilus-widgets/nautilus-preferences.c: * nautilus-widgets/nautilus-preferences.c:
......
...@@ -556,7 +556,32 @@ do_rpm_install (EazelInstall *service, ...@@ -556,7 +556,32 @@ do_rpm_install (EazelInstall *service,
PackageData *pd; PackageData *pd;
g_warning ("Source Package installs not supported!\n" g_warning ("Source Package installs not supported!\n"
"Package %s skipped.", pkg_file); "Package %s skipped.", pkg_file);
pd = packagedata_new_from_rpm_header (binary_headers[num_binary_packages]);
/*
FIXME: bugzilla.eazel.com 1093:
this call fails.
pd = packagedata_new_from_rpm_header (binary_headers[num_binary_packages]);
*/
pd = g_new0 (PackageData, 1);
headerGetEntry (binary_headers[num_binary_packages],
RPMTAG_NAME, NULL,
(void **) &pd->name, NULL);
headerGetEntry (binary_headers[num_binary_packages],
RPMTAG_VERSION, NULL,
(void **) &pd->version, NULL);
headerGetEntry (binary_headers[num_binary_packages],
RPMTAG_RELEASE, NULL,
(void **) &pd->minor, NULL);
headerGetEntry (binary_headers[num_binary_packages],
RPMTAG_ARCH, NULL,
(void **) &pd->archtype, NULL);
headerGetEntry (binary_headers[num_binary_packages],
RPMTAG_SIZE, NULL,
(void **) &pd->bytesize, NULL);
headerGetEntry (binary_headers[num_binary_packages],
RPMTAG_SUMMARY, NULL,
(void **) &pd->summary, NULL);
eazel_install_emit_install_failed (service, pd, RPM_SRC_NOT_SUPPORTED, NULL); eazel_install_emit_install_failed (service, pd, RPM_SRC_NOT_SUPPORTED, NULL);
packagedata_destroy (pd); packagedata_destroy (pd);
} }
...@@ -627,7 +652,9 @@ do_rpm_install (EazelInstall *service, ...@@ -627,7 +652,9 @@ do_rpm_install (EazelInstall *service,
GList *deps; GList *deps;
deps = build_packagedata_list_from_deps (conflicts, num_conflicts); deps = build_packagedata_list_from_deps (conflicts, num_conflicts);
pd = packagedata_new_from_rpm_header (binary_headers[i]); pd = g_new0 (PackageData, 1);
pd->name = g_strdup (conflicts[0].byName);
g_message ("Dep failed for %s",pd->name); g_message ("Dep failed for %s",pd->name);
eazel_install_emit_install_failed (service, pd, RPM_DEP_FAIL, deps); eazel_install_emit_install_failed (service, pd, RPM_DEP_FAIL, deps);
......
...@@ -64,7 +64,7 @@ packagedata_new_from_rpm_header (Header hd) ...@@ -64,7 +64,7 @@ packagedata_new_from_rpm_header (Header hd)
(void **) &pd->archtype, NULL); (void **) &pd->archtype, NULL);
headerGetEntry (hd, headerGetEntry (hd,
RPMTAG_SIZE, NULL, RPMTAG_SIZE, NULL,
(void **) &pd->bytesize, NULL); (void **) &pd->bytesize, NULL);
headerGetEntry (hd, headerGetEntry (hd,
RPMTAG_SUMMARY, NULL, RPMTAG_SUMMARY, NULL,
(void **) &pd->summary, NULL); (void **) &pd->summary, NULL);
......
...@@ -61,7 +61,7 @@ host_alias = i686-pc-linux-gnu ...@@ -61,7 +61,7 @@ host_alias = i686-pc-linux-gnu
host_triplet = i686-pc-linux-gnu host_triplet = i686-pc-linux-gnu
AS = @AS@ AS = @AS@
BONOBO_CFLAGS = -I/gnome/include -DNEED_GNOMESUPPORT_H -I/gnome/lib/gnome-libs/include -I/gnome/lib/glib/include -I/usr/X11R6/include -I/gnome/include/gnome-xml BONOBO_CFLAGS = -I/gnome/include -DNEED_GNOMESUPPORT_H -I/gnome/lib/gnome-libs/include -I/gnome/lib/glib/include -I/usr/X11R6/include -I/gnome/include/gnome-xml
BONOBO_LIBS = -rdynamic -L/gnome/lib -L/usr/X11R6/lib -L/usr/lib -lbonobo -lgdk_pixbuf -ltiff -ljpeg -lpng -lgnomeprint -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -ldb1 -ldl -lxml -lz -loaf -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib -lnsl -lm BONOBO_LIBS = -rdynamic -L/gnome/lib -L/usr/X11R6/lib -L/usr/lib -lbonobo -lgnomeprint -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -ldb1 -lgmodule -ldl -lgdk_pixbuf -ltiff -ljpeg -lpng -lxml -lz -loaf -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib -lnsl -lm
CATALOGS = CATALOGS =
CATOBJEXT = .gmo CATOBJEXT = .gmo
CC = gcc CC = gcc
...@@ -97,7 +97,7 @@ GNOME_LIBS = -L/gnome/lib -L/usr/lib -lgnome -lgnomesupport -lesd -laudiofile -l ...@@ -97,7 +97,7 @@ GNOME_LIBS = -L/gnome/lib -L/usr/lib -lgnome -lgnomesupport -lesd -laudiofile -l
GNORBA_CFLAGS = GNORBA_CFLAGS =
GNORBA_LIBS = GNORBA_LIBS =
GTKHTML_CFLAGS = -I/gnome/include -I/gnome/lib/glib/include -DNEED_GNOMESUPPORT_H -I/gnome/lib/gnome-libs/include -I/usr/X11R6/include -I/gnome/include/gnome-xml GTKHTML_CFLAGS = -I/gnome/include -I/gnome/lib/glib/include -DNEED_GNOMESUPPORT_H -I/gnome/lib/gnome-libs/include -I/usr/X11R6/include -I/gnome/include/gnome-xml
GTKHTML_LIBS = -rdynamic -L/gnome/lib -L/usr/X11R6/lib -L/usr/lib -lgtkhtml -lgdk_pixbuf -ltiff -ljpeg -lpng -lgnomeprint -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl -lxml -lz GTKHTML_LIBS = -rdynamic -L/gnome/lib -L/usr/X11R6/lib -L/usr/lib -lgtkhtml -lgnomeprint -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lgmodule -lglib -ldl -lgdk_pixbuf -ltiff -ljpeg -lpng -lxml -lz
GTK_CFLAGS = GTK_CFLAGS =
GTK_LIBS = GTK_LIBS =
GT_NO = GT_NO =
......
...@@ -8,7 +8,7 @@ if test $UID -ne 0; then ...@@ -8,7 +8,7 @@ if test $UID -ne 0; then
echo "" echo ""
echo "Please enter root password at the prompt" echo "Please enter root password at the prompt"
xhost + localhost xhost + localhost
su - -c "export DISPLAY=$DISPLAY && cd $PWD && sh $0" su - -c "export DISPLAY=$DISPLAY && cd $PWD && echo Uncompressing... && sh $0"
xhost - localhost xhost - localhost
exit exit
fi fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment