Scl utils 20120927

Makefile

@@ -0,0 +1,56 @@
+NAME=scl-utils
+VERSION=`date +%Y%m%d`
+WARNINGS?=-Wall -Wshadow -Wcast-align -Winline -Wextra -Wmissing-noreturn
+CFLAGS?=-O2
+CFILES=scl.c
+OTHERFILES=Makefile scl_enabled macros.scl scl.1 scldeps.sh scl.attr brp-scl-compress brp-scl-python-bytecompile scl.bash
+SOURCES=$(CFILES) $(OTHERFILES)
+
+BINDIR?=/usr/bin
+MANDIR?=/usr/share/man
+RPMCONFDIR?=/usr/lib/rpm
+CNFDIR?=/etc
+
+all: scl
+
+scl: $(SOURCES) $(OTHERFILES)
+	$(CC) $(CFLAGS) $(LDFLAGS) $(WARNINGS) $(CFILES) -o $@
+
+clean:
+	rm -f *.o scl
+
+distclean: clean
+	rm -f *~
+
+dist: all
+	LANG=C
+	rm -rf $(NAME)-$(VERSION)
+	mkdir $(NAME)-$(VERSION)
+	cp $(SOURCES) $(NAME)-$(VERSION)
+	tar fcz $(NAME)-$(VERSION).tar.gz $(NAME)-$(VERSION)
+	rm -rf $(NAME)-$(VERSION)
+
+install: all
+	mkdir -p $(DESTDIR)/$(BINDIR)
+	mkdir -p $(DESTDIR)/$(CNFDIR)/rpm
+	mkdir -p $(DESTDIR)/$(CNFDIR)/bash_completion.d
+	mkdir -p $(DESTDIR)/$(RPMCONFDIR)/fileattrs
+	cp macros.scl $(DESTDIR)/$(CNFDIR)/rpm
+	cp scl $(DESTDIR)/$(BINDIR)
+	cp scl_enabled $(DESTDIR)/$(BINDIR)
+	cp scl.1 $(DESTDIR)/$(MANDIR)/man1
+	cp scl.attr $(DESTDIR)/$(RPMCONFDIR)/fileattrs
+	cp scldeps.sh $(DESTDIR)/$(RPMCONFDIR)
+	cp brp-scl-compress $(DESTDIR)/$(RPMCONFDIR)
+	cp brp-scl-python-bytecompile $(DESTDIR)/$(RPMCONFDIR)
+	cp scl.bash $(DESTDIR)/$(CNFDIR)/bash_completion.d
+
+uninstall:
+	rm -f $(BINDIR)/scl $(BINDIR)/scl_enabled
+	rm -f $(CNFDIR)/rpm/macros.scl
+	rm -f $(MANDIR)/man1/scl.1
+	rm -f $(RPMCONFDIR)/fileattrs/scl.attr
+	rm -f $(RPMCONFDIR)/scldeps.sh
+	rm -f $(RPMCONFDIR)/brp-scl-compress
+	rm -f $(RPMCONFDIR)/brp-scl-python-bytecompile
+	rm -f $(CNFDIR)/bash_completion.d/scl.bash

rpm/brp-scl-compress → brp-scl-compress

@@ -5,7 +5,7 @@ if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
 	exit 0
 fi
 
-scl_path=${1:-opt/*}
+scl_path=${1:-/opt/rh}
 
 cd "$RPM_BUILD_ROOT"
 

rpm/brp-scl-python-bytecompile → brp-scl-python-bytecompile

@@ -10,7 +10,7 @@ fi
 [ "0$scl_path" = "0" ] && exit 0
 
 # If we don't have a python interpreter, avoid changing anything.
-default_python=${1:-/usr/bin/python3}
+default_python=${1:-/usr/bin/python}
 if [ ! -x "$default_python" ]; then
 	exit 0
 fi
@@ -26,15 +26,15 @@ fi
 # .pyc/.pyo files embed a "magic" value, identifying the ABI version of Python
 # bytecode that they are for.
 #
-# The files below RPM_BUILD_ROOT could be targeting multiple versions of
+# The files below RPM_BUILD_ROOT could be targetting multiple versions of
 # python (e.g. a single build that emits several subpackages e.g. a
 # python26-foo subpackage, a python31-foo subpackage etc)
 #
 # Support this by assuming that below each /usr/lib/python$VERSION/, all
 # .pyc/.pyo files are to be compiled for /usr/bin/python$VERSION.
 # 
-# For example, below /usr/lib/python2.6/, we're targeting /usr/bin/python2.6
-# and below /usr/lib/python3.1/, we're targeting /usr/bin/python3.1
+# For example, below /usr/lib/python2.6/, we're targetting /usr/bin/python2.6
+# and below /usr/lib/python3.1/, we're targetting /usr/bin/python3.1
 
 shopt -s nullglob
 for python_libdir in "$RPM_BUILD_ROOT"/usr/lib{,64}/python[0-9].[0-9]/ "$RPM_BUILD_ROOT"/$scl_path/usr/lib{,64}/python[0-9].[0-9]/;