Scl utils 20130529

Makefile

@@ -0,0 +1,57 @@
+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 sclbuild
+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 sclbuild $(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 $(BINDIR)/sclbuild
+	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-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]/;

rpm/macros.scl → macros.scl

@@ -3,49 +3,12 @@
 # Copyright (C) 2012 Red Hat, Inc.
 #   Written by Jindrich Novy <jnovy@redhat.com>.
 
-%scl_debug() %{expand:
-%define old_debug %{lua:print(rpm.expand("%{debug_package}"):len())}
-%undefine _debugsource_packages
-%global debug_package %{expand:
-%if "%{?old_debug}" == "0"
-       %{expand: %{nil}}
-%else
-%if "%{?scl}%{!?scl:0}" == "%{pkg_name}"
-        %{expand: %{nil}}
-%else
-%ifnarch noarch
-%package debuginfo
-Summary: Debug information for package %{name}
-Group: Development/Debug
-AutoReqProv: 0
-Requires: %scl_runtime
-Provides: scl-package(%scl)
-%{lua:
-        debuginfo=tonumber(rpm.expand("%{old_debug}"))
-        if debuginfo > 0 then
-                rpm.define("__debug_package 1")
-        end
-}
-%description debuginfo
-This package provides debug information for package %{name}.
-Debug information is useful when developing applications that use this
-package or when debugging this package.
-%files debuginfo -f debugfiles.list
-%defattr(-,root,root)
-%endif
-%endif
-%endif
-%{nil}}}
-
-%scl_prefix()   %{?scl:%(if [ "%1" = "%%1" ]; then echo "%{scl}-"; else echo "%1-"; fi)}%{!?scl:%{nil}}
-
 %scl_package() %{expand:%{!?_root_prefix:
 %global pkg_name		%1
 %global scl_name		%{scl}
+%global scl_prefix		%{scl}-
 %global scl_runtime		%{scl}-runtime
-%global scl_basedir		/opt
-%{!?scl_vendor:			%global scl_vendor rh}
-%{!?_scl_prefix:		%global _scl_prefix %{scl_basedir}/%{scl_vendor}}
+%{!?_scl_prefix:		%global _scl_prefix /opt/rh}
 %global _scl_scripts		%{_scl_prefix}/%{scl}
 %global _scl_root		%{_scl_prefix}/%{scl}/root
 %global _root_prefix		%{_prefix}
@@ -55,7 +18,7 @@ package or when debugging this package.
 %global _root_libexecdir	%{_exec_prefix}/libexec
 %global _root_datadir		%{_prefix}/share
 %global _root_sysconfdir	%{_sysconfdir}
-%global _root_sharedstatedir	%{_sharedstatedir}
+%global _root_sharedstatedir	%{_prefix}/com
 %global _root_localstatedir	%{_localstatedir}
 %global _root_libdir		%{_exec_prefix}/%{_lib}
 %global _root_includedir	%{_prefix}/include
@@ -69,44 +32,46 @@ package or when debugging this package.
 %global _libexecdir		%{_exec_prefix}/libexec
 %global _datadir		%{_prefix}/share
 %global _sysconfdir		%{_scl_root}/etc
-%{?nfsmountable:		%global _sysconfdir %{_root_sysconfdir}%{_scl_prefix}/scls/%{scl}}
-%global _sharedstatedir		%{_scl_root}/var/lib
-%{?nfsmountable:		%global _sharedstatedir %{_root_localstatedir}%{_scl_prefix}/scls/%{scl}/lib}
+%global _sharedstatedir		%{_prefix}/com
 %global _localstatedir		%{_scl_root}/var
-%{?nfsmountable:		%global _localstatedir %{_root_localstatedir}%{_scl_prefix}/scls/%{scl}}
 %global _libdir			%{_exec_prefix}/%{_lib}
 %global _includedir		%{_prefix}/include
 %global _infodir		%{_datadir}/info
 %global _mandir			%{_datadir}/man
 %global _docdir			%{_datadir}/doc
 %global _defaultdocdir		%{_docdir}
-}
-%{?scl_dependency_generators:%scl_dependency_generators}
 %global scl_pkg_name		%{scl}-%{pkg_name}
-%scl_debug
 %global __os_install_post %{expand:
     /usr/lib/rpm/brp-scl-compress %{_scl_root}
-    %{!?__debug_package:/usr/lib/rpm/brp-strip %{__strip}
-    /usr/lib/rpm/brp-strip-comment-note %{__strip} %{__objdump}
+    %{!?__debug_package:/usr/lib/rpm/redhat/brp-strip %{__strip}
+    /usr/lib/rpm/redhat/brp-strip-comment-note %{__strip} %{__objdump}
     }
-    /usr/lib/rpm/brp-strip-static-archive %{__strip}
-    /usr/lib/rpm/brp-scl-python-bytecompile %{__python3} %{?_python_bytecompile_errors_terminate_build} %{_scl_root}
-    [ -f /usr/lib/rpm/redhat/brp-python-hardlink ] && /usr/lib/rpm/redhat/brp-python-hardlink || /usr/lib/rpm/brp-python-hardlink
+    /usr/lib/rpm/redhat/brp-strip-static-archive %{__strip}
+    /usr/lib/rpm/brp-scl-python-bytecompile %{__python} %{?_python_bytecompile_errors_terminate_build} %{_scl_root}
+    /usr/lib/rpm/redhat/brp-python-hardlink
+    %{!?__jar_repack:/usr/lib/rpm/redhat/brp-java-repack-jars}
 %{nil}}
-BuildRequires: scl-utils-build
-%if "%{?scl}%{!?scl:0}" == "%{pkg_name}"
-Requires: %{scl_runtime}
-Provides: scl-package(%{scl})
+%global debug_package %{expand:
+%ifnarch noarch
+%global __debug_package 1
+%package debuginfo
+Summary: Debug information for package %{name}
+Group: Development/Debug
+AutoReqProv: 0
+Provides: scl-package(%scl)
+%description debuginfo
+This package provides debug information for package %{name}.
+Debug information is useful when developing applications that use this
+package or when debugging this package.
+%files debuginfo -f debugfiles.list
+%defattr(-,root,root)
 %endif
+%{nil}}
+BuildRequires: scl-utils-build
+}
 %{?scl_package_override:%scl_package_override}
 }
 
 %scl_require()	%{_scl_prefix}/%1/enable, %1
 %scl_require_package() %1-%2
 
-%scl_enable_script() %{expand:
-cat >> %{buildroot}%{_scl_scripts}/enable << 'EOF'
-eval `/usr/bin/modulecmd bash load %{scl}`
-EOF
-}
-