This email list is read-only. Emails sent to this list will be discarded
----------------------------------
Makefile.am | 4 ++--
debian/changelog | 3 ++-
debian/rules | 1 +
gui/Makefile.am | 1 -
image-creator.desktop.in | 4 ++--
moblin-image-creator.spec | 13 +++++++++----
6 files changed, 16 insertions(+), 10 deletions(-)
New commits:
commit 5343d64e26cdc72e471cf5f100be47fe8db6cc77
Author: Mitsutaka Amano <[EMAIL PROTECTED]>
Date: Thu Sep 4 12:37:31 2008 +0900
* Fixed image-creator installation in deb and rpm.
Diff in this email is a maximum of 400 lines.
diff --git a/Makefile.am b/Makefile.am
index d0eb453..9264e95 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I m4
#EXTRA_DIST = config.rpath m4/ChangeLog config.rpath m4/ChangeLog
-executedir = ${bindir}
+executedir = ${sbindir}
execute_SCRIPTS = \
image-creator
@@ -22,4 +22,4 @@ desktop_DATA = $(Desktop_Files:.desktop.in=.desktop)
# We patch the path for the python modules post installation:
install-exec-hook:
- sed -i "s|@PATH_PKGDATADIR@|${pkgdatadir}|g"
$(DESTDIR)$(bindir)/image-creator
+ sed -i "s|@PATH_PKGDATADIR@|${pkgdatadir}|g"
$(DESTDIR)$(sbindir)/image-creator
diff --git a/debian/changelog b/debian/changelog
index be37a50..9784e40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -162,8 +162,9 @@ moblin-image-creator (0.45) UNRELEASED; urgency=low
[ Mitsutaka Amano ]
* Fixed installation path of deb and rpm. When manual install process, MIC
install in /usr/local.
* I forgot add chagnelog in spec file.
+ * Fixed image-creator installation in deb and rpm.
- -- Mitsutaka Amano <[EMAIL PROTECTED]> Wed, 27 Aug 2008 14:15:23 +0900
+ -- Mitsutaka Amano <[EMAIL PROTECTED]> Thu, 04 Sep 2008 12:35:40 +0900
moblin-image-creator (0.44) gaston; urgency=low
diff --git a/debian/rules b/debian/rules
index 552db38..83926db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,7 @@ install-stamp:
dh_testroot
dh_clean -k
dh_installdirs
+ sed -i "s|Exec=.*|Exec=gksu /usr/sbin/image-creator|"
image-creator.desktop
$(MAKE) DESTDIR=$(CURDIR)/debian/moblin-image-creator install
rm -fR $(CURDIR)/debian/moblin-image-creator/usr/lib/
diff --git a/gui/Makefile.am b/gui/Makefile.am
index 79714d7..e5191a8 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -20,7 +20,6 @@ extra_DATA = \
pixmapsdir = ${pkgdatadir}
pixmaps_DATA = \
- pixmaps/README \
pixmaps/image-creator-32x32.xcf \
pixmaps/image-creator-32x32.xpm \
pixmaps/mic-assistant.xcf \
diff --git a/image-creator.desktop.in b/image-creator.desktop.in
index 0faf951..49b841c 100644
--- a/image-creator.desktop.in
+++ b/image-creator.desktop.in
@@ -2,9 +2,9 @@
Encoding=UTF-8
_Name=Moblin Image Creator
_Comment=Developer tool for creating mobile Linux device stacks
-Exec=gksu /usr/bin/image-creator
+Exec=image-creator
Terminal=false
Type=Application
Categories=Development;
StartupNotify=false
-Icon=/usr/share/pdk/pixmaps/image-creator-32x32.xpm
+Icon=/usr/share/pdk/image-creator-32x32.xpm
diff --git a/moblin-image-creator.spec b/moblin-image-creator.spec
index 28248eb..4e7f68d 100644
--- a/moblin-image-creator.spec
+++ b/moblin-image-creator.spec
@@ -18,20 +18,20 @@ The moblin-image-creator utility enables developers to
build full mobile
or single purposed Linux stacks using a mainstream distribution.
%prep
+rm -rf $RPM_BUILD_ROOT
%setup -q
%build
./autogen.sh
-./configure \
- --prefix=$RPM_BUILD_ROOT/usr \
- --sysconfdir=$RPM_BUILD_ROOT/etc \
- --localstatedir=$RPM_BUILD_ROOT/var
+%configure
%install
make DESTDIR=$RPM_BUILD_ROOT install
+%{find_lang} %{name}
mkdir -p $RPM_BUILD_ROOT/etc/pam.d
mkdir -p $RPM_BUILD_ROOT/etc/security/console.apps
mkdir -p $RPM_BUILD_ROOT/usr/sbin
+mkdir -p $RPM_BUILD_ROOT/usr/bin
cp %_builddir/%{name}-%{version}/image-creator.helperconsole \
$RPM_BUILD_ROOT/etc/security/console.apps/image-creator
cp %_builddir/%{name}-%{version}/image-creator.pam.d \
@@ -39,6 +39,7 @@ cp %_builddir/%{name}-%{version}/image-creator.pam.d \
cp %_builddir/%{name}-%{version}/suse/image-creator* \
$RPM_BUILD_ROOT/usr/sbin
ln -f -s /usr/bin/consolehelper $RPM_BUILD_ROOT/usr/bin/image-creator
+sed -i "s|Exec=.*|Exec=/usr/bin/image-creator|"
$RPM_BUILD_ROOT/usr/share/applications/image-creator.desktop
%clean
rm -rf %{buildroot}
@@ -49,6 +50,7 @@ rm -rf %{buildroot}
/etc/pam.d/image-creator
/etc/security/console.apps/image-creator
/usr/bin/image-creator
+/usr/sbin/image-creator
/usr/sbin/image-creator-suse-install
/usr/sbin/image-creator-suse-mount
/usr/sbin/image-creator-suse-start
@@ -58,6 +60,9 @@ rm -rf %{buildroot}
/usr/share/pdk/*
%changelog
+* Mon Sep 04 2008 Mitsutaka Amano <[EMAIL PROTECTED]>
+- Fixed image-creator installation in deb and rpm.
+
* Mon Aug 27 2008 Mitsutaka Amano <[EMAIL PROTECTED]>
- Added configure process on %build section.
_______________________________________________
Commits mailing list
[email protected]
https://www.moblin.org/mailman/listinfo/commits
