clog

additional/genfilelist

@@ -28,7 +28,13 @@ sub process;
 
 sub usage
 {
-    die "t [--ignoredir dir] [--dir dir spec] [--file file spec] root\n";
+    die "usage: genfilelist [-p] [--ignoredir dir] [--dir dir spec] [--file file spec] root\n"
+	."    -p              : add python compiled binaries at brp bytecompile\n"
+	."    --ignoredir dir : ignore dir as already owned by another rpm\n"
+	."    --dir dir spec  : add dir with spec, e.g.  /var/log/yum 'attr(2750,root,root)'\n"
+	."    --file file spec: add file with spec, e.g. '/sbin/e-smith/yum' 'attr(0755,root,root)'\n"
+	."    root            : is usually \$RPM_BUILD_ROOT\n"
+	."    known paths will have usual attributes applied (e.g. /etc/e-smith/events/actions/*)\n";
 }
 
 my @ignoredirs = ('', qw(
@@ -151,6 +157,7 @@ my @ignoredirs = ('', qw(
 );
 
 my $startdirectory = undef;
+my $brppython = 0;
 while (my $arg = shift)
 {
     if ($arg eq "--ignoredir")
@@ -177,6 +184,10 @@ while (my $arg = shift)
 	    if exists $::fileperms{$file};
         $::fileperms{$file} = '%' . $spec;
     }
+    elsif ($arg eq "-p")
+    {
+	$brppython = 1;	
+    }
     else
     {
 	$startdirectory = $arg;
@@ -184,7 +195,7 @@ while (my $arg = shift)
 }
 
 defined $startdirectory
-    or die "Must give directory arg";
+    or die usage();
 
 # Change to the build root directory
 chdir $startdirectory
@@ -231,10 +242,13 @@ sub process
 	return if $path =~ m{\.orig$};
 
         my (@paths) = ($path);
-
+	# add compiled python path (ie by brp bytecompile), if desired, and if outside of /etc/e-smith/templates
-        # Add compiled python files
+	if ( ($brppython) and ( not $path =~ m{^/etc/e-smith/templates} ))
-        push @paths, "${path}c" if $path =~ m{\.py$};
+	{
-        push @paths, "${path}o" if $path =~ m{\.py$};
+        	# Add compiled python files
+        	push @paths, "${path}c" if $path =~ m{\.py$};
+        	push @paths, "${path}o" if $path =~ m{\.py$};
+	}
 
         foreach $path (@paths) {
             # Some files get special permissions and ownership

smeserver-devtools.spec

@@ -4,7 +4,7 @@ Summary: smeserver tools for building RPMs
 %define name smeserver-devtools
 Name: %{name}
 %define version 2.6.0
-%define release 18
+%define release 20
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -19,10 +19,17 @@ Requires: perl(Pod::Tests)
 AutoReqProv: no
 
 %changelog
-* Mon Mar 11 2024 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-18.sme
+* Fri Mar 15 2024 Jean-Philippe Pialasse <jpp@koozali.org> 2.6.0-20.sme
-- fix missing deps for perl(Pod::Tests) [SME: 12501]
+- do not add python compiled files by default, option to add them [SME: 11380]
+  ignore .py files in /etc/e-smith/templates
+  also added better usage output
+
+* Tue Mar 12 2024 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-19.sme
 - add Provides: e-smith-devtools
 
+* Mon Mar 11 2024 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-17.sme
+- fix missing deps for perl(Pod::Tests) [SME: 12501]
+
 * Mon Mar 11 2024 rename-e-smith-pkg.sh by Trevor Batley <trevor@batley.id.au> 2.6.0-16.sme
 - Rename to smeserver-devtools [SME: 12359]
 
@@ -258,7 +265,7 @@ AutoReqProv: no
 - Added validate-lexicon which exits non-zero if the lexicon
   doesn't parse properly [gordonr 3155]
 
-* Sat Apr 05 2002 Gordon Rowell <gordonr@e-smith.com>
+* Fri Apr 05 2002 Gordon Rowell <gordonr@e-smith.com>
 - [1.7.1-01]
 - New development stream. Added /sbin/e-smith/quicktest [gordonr]