Re: [master] put the analog script into the RPM

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

 



On 03/19/2010 10:57 AM, Hans de Goede wrote:
Hi,

On 03/19/2010 10:46 AM, Ales Kozumplik wrote:
On 03/17/2010 03:07 PM, Chris Lumens wrote:
diff --git a/anaconda.spec.in b/anaconda.spec.in
index 115f19c..1e7d61f 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -200,6 +200,7 @@ update-desktop-database&> /dev/null || :
%doc docs/anaconda-release-notes.txt
/lib/udev/rules.d/70-anaconda.rules
%{_sbindir}/anaconda
+%{_bindir}/analog
%ifarch i386 i486 i586 i686 x86_64
%{_sbindir}/gptsync
%{_sbindir}/showpart
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 1c59338..a2b53e6 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -25,4 +25,7 @@ dist_scripts_DATA = mk-images.* pyrc.py
dist_noinst_SCRIPTS = getlangnames.py upd-bootimage upd-initrd
upd-kernel \
makeupdates

+analogdir = $(bindir)/
+dist_analog_SCRIPTS = analog
+
MAINTAINERCLEANFILES = Makefile.in

I was looking for this just yesterday, in fact. However I worry that
"analog" might be too generic of a name and something else may be using
it or want to use it in the near future. Does it absolutely need to
live in /usr/bin, or can it live in /usr/share/anaconda/ instead?


Yes we can! People just need to remember to execute it from there:

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 1c59338..e50d1f0 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -25,4 +25,7 @@ dist_scripts_DATA = mk-images.* pyrc.py
dist_noinst_SCRIPTS = getlangnames.py upd-bootimage upd-initrd
upd-kernel \
makeupdates

+analogdir = $(datadir)/$(PACKAGE_NAME)
+dist_analog_SCRIPTS = analog
+
MAINTAINERCLEANFILES = Makefile.in


<ugh>

Can we please make that /usr/libexec/anaconda/analog ? Scripts don't
belong under /usr/share, even if they are not arch specific.

Regards,

Hans


K how about now:

diff --git a/anaconda.spec.in b/anaconda.spec.in
index 115f19c..e0c1084 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -207,6 +207,7 @@ update-desktop-database &> /dev/null || :
 %{_datadir}/anaconda
 %{_prefix}/lib/anaconda
 %{_prefix}/lib/anaconda-runtime
+%{_prefix}/libexec/anaconda
 %ifarch %livearches
 %{_bindir}/liveinst
 %{_sbindir}/liveinst
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 1c59338..6d3562d 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -25,4 +25,7 @@ dist_scripts_DATA    = mk-images.* pyrc.py
dist_noinst_SCRIPTS = getlangnames.py upd-bootimage upd-initrd upd-kernel \
                        makeupdates

+analogdir = $(libexecdir)/$(PACKAGE_NAME)
+dist_analog_SCRIPTS = analog
+
 MAINTAINERCLEANFILES = Makefile.in

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux