clog

Makefile

@@ -1,6 +1,6 @@
-# Makefile for source rpm: e-smith-devtools
+# Makefile for source rpm: smeserver-devtools
 # $Id: Makefile,v 1.1 2016/02/04 22:54:13 vip-ire Exp $
-NAME := e-smith-devtools
+NAME := smeserver-devtools
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common

README.md

@@ -1,12 +1,13 @@
-# <img src="https://www.koozali.org/images/koozali/Logo/Png/Koozali_logo_2016.png" width="25%" vertical="auto" style="vertical-align:bottom"> e-smith-devtools
+# <img src="https://www.koozali.org/images/koozali/Logo/Png/Koozali_logo_2016.png" width="25%" vertical="auto" style="vertical-align:bottom"> smeserver-devtools
 
-SMEServer Koozali developed git repo for e-smith-devtools smeserver
+SMEServer Koozali developed git repo for smeserver-devtools smeserver
 
 ## Wiki
 <br />https://wiki.koozali.org/
 
 ## Bugzilla
-Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=e-smith-devtools&product=SME%20Server%2010.X&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)
+Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=smeserver-devtools&product=SME%20Server%2010.X&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)\
+And a list of outstanding Legacy bugs: (e-smith-devtools) [here](https://bugs.koozali.org/buglist.cgi?component=e-smith-devtools&product=SME%20Server%2010.X&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)
 
 ## Description
 
@@ -14,4 +15,4 @@ Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?compo
 *Once it has been checked, then this comment will be deleted*
 <br />
 
-e-smith-devtools is an open source software package that makes it easy to develop web applications and websites. It includes components like a web server, database, programming language, and framework that can be used to develop web applications. With e-smith-devtools, developers can quickly create dynamic web applications and websites with minimal coding. The software also includes many tools such as a source code editor, a debugger, a code profiler, and a web framework. With these tools, developers can quickly develop interactive web applications with complex functionality. e-smith-devtools is easy to use and simplifies the task of web application development.
+smeserver-devtools is an open source software package that makes it easy to develop web applications and websites. It includes components like a web server, database, programming language, and framework that can be used to develop web applications. With smeserver-devtools, developers can quickly create dynamic web applications and websites with minimal coding. The software also includes many tools such as a source code editor, a debugger, a code profiler, and a web framework. With these tools, developers can quickly develop interactive web applications with complex functionality. smeserver-devtools is easy to use and simplifies the task of web application development.

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
+	if ( ($brppython) and ( not $path =~ m{^/etc/e-smith/templates} ))
+	{
         	# 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

@@ -1,22 +1,38 @@
 # $Id: e-smith-devtools.spec,v 1.15 2022/07/30 04:30:09 jpp Exp $
 
-Summary: e-smith tools for building RPMs
+Summary: smeserver tools for building RPMs
-%define name e-smith-devtools
+%define name smeserver-devtools
 Name: %{name}
 %define version 2.6.0
-%define release 15
+%define release 20
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
 
+Provides: e-smith-devtools
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: perl, perl(Test::Inline) >= 0.12, perl(XML::Parser)
+Requires: perl(Pod::Tests)
 AutoReqProv: no
 
 %changelog
+* Fri Mar 15 2024 Jean-Philippe Pialasse <jpp@koozali.org> 2.6.0-20.sme
+- 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]
+
 * Wed Jul 12 2023 cvs2git.sh aka Brian Read <brianr@koozali.org> 2.6.0-15.sme
 - Roll up patches and move to git repo [SME: 12338]
 
@@ -249,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]
 
@@ -434,7 +450,7 @@ AutoReqProv: no
 - initial release
 
 %description
-Tools for use in building RPMs for the e-smith serverand gateway.
+Tools for use in building RPMs for the smeserver serverand gateway.
 
 Use "genfilelist" to create a filelist file with correct ownerships and
 permissions.