From 7f5e9f9c7b131d34ae0dd9b0881460ba457ff39c Mon Sep 17 00:00:00 2001 From: Xavier Bachelot Date: Mon, 21 Jul 2025 12:50:05 +0200 Subject: [PATCH] clean rpm and deb packaging --- packaging/debian/changelog | 9 +++ packaging/debian/control | 4 +- packaging/debian/lsc-executable-plugin.docs | 1 + .../debian/lsc-executable-plugin.install | 1 - .../debian/lsc-executable-plugin.postinst | 5 -- packaging/rpm/lsc-executable-plugin.spec | 78 +++++++------------ 6 files changed, 41 insertions(+), 57 deletions(-) diff --git a/packaging/debian/changelog b/packaging/debian/changelog index b5fc2dd..3d537e6 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,3 +1,12 @@ +lsc-executable-plugin (1.4-1) unstable; urgency=low + + * Upgrade to 1.4 + * Clean deb/rpm recipe + * Properly handle Base64-encoded attributes + * Compatibility with LSC 2.3 + + -- David Coutadeur (LSC-project) Mon, 27 Jul 2026 12:00:00 +0100 + lsc-executable-plugin (1.3-1) unstable; urgency=low * Upgrade to 1.3 diff --git a/packaging/debian/control b/packaging/debian/control index 5fea5e7..c03444b 100644 --- a/packaging/debian/control +++ b/packaging/debian/control @@ -10,5 +10,5 @@ Vcs-Browser: https://github.com/lsc-project/lsc-executable-plugin Package: lsc-executable-plugin Architecture: all -Depends: ${misc:Depends}, lsc (>= 2.2) -Description: This is an Executable plugin for LSC +Depends: ${misc:Depends}, lsc (>= 2.3) +Description: This is an Executable plugin for LSC. diff --git a/packaging/debian/lsc-executable-plugin.docs b/packaging/debian/lsc-executable-plugin.docs index f7e11f5..582035f 100644 --- a/packaging/debian/lsc-executable-plugin.docs +++ b/packaging/debian/lsc-executable-plugin.docs @@ -2,3 +2,4 @@ ../LICENSE.txt reports/apidocs ../doc +../scripts diff --git a/packaging/debian/lsc-executable-plugin.install b/packaging/debian/lsc-executable-plugin.install index 2915f2b..f291f8d 100644 --- a/packaging/debian/lsc-executable-plugin.install +++ b/packaging/debian/lsc-executable-plugin.install @@ -1,2 +1 @@ lsc-executable-plugin*.jar usr/lib/lsc -../scripts/* var/lib/lsc diff --git a/packaging/debian/lsc-executable-plugin.postinst b/packaging/debian/lsc-executable-plugin.postinst index a531905..cc140d9 100644 --- a/packaging/debian/lsc-executable-plugin.postinst +++ b/packaging/debian/lsc-executable-plugin.postinst @@ -1,10 +1,5 @@ #!/bin/bash -lsc_user=lsc -lsc_group=lsc - -chown ${lsc_user}:${lsc_group} /usr/lib/lsc/lsc-executable-plugin* -chown ${lsc_user}:${lsc_group} /var/lib/lsc/* #DEBHELPER# diff --git a/packaging/rpm/lsc-executable-plugin.spec b/packaging/rpm/lsc-executable-plugin.spec index e460e38..523f55a 100644 --- a/packaging/rpm/lsc-executable-plugin.spec +++ b/packaging/rpm/lsc-executable-plugin.spec @@ -7,85 +7,65 @@ # # Copyright (c) 2009 - 2021 LSC Project #================================================= +%global lsc_min_version 2.3 -#================================================= -# Variables -#================================================= -%define lsc_executable_name lsc-executable-plugin -%define lsc_executable_version 1.3 -%define lsc_min_version 2.2 -%define lsc_user lsc -%define lsc_group lsc - -#================================================= -# Header -#================================================= -Summary: LSC Executable plugin -Name: %{lsc_executable_name} -Version: %{lsc_executable_version} +Name: lsc-executable-plugin +Version: 1.4 Release: 1%{?dist} -License: BSD -BuildArch: noarch - -Group: Applications/System +Summary: LSC Executable plugin +License: BSD-3-Clause URL: https://lsc-project.org - -Source: %{lsc_executable_name}-%{lsc_executable_version}.jar +Source0: lsc-executable-plugin-1.4.jar Source1: lsc-executable-add-modify-delete-modrdn.pl Source2: lsc-executable-csv2ldif-get.pl Source3: lsc-executable-csv2ldif-list.pl -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Requires(pre): coreutils +BuildArch: noarch +BuildRequires: coreutils +BuildRequires: perl-generators Requires: lsc >= %{lsc_min_version} + %description -This is an Executable plugin for LSC +This is an Executable plugin for LSC. + %prep -%build %install -rm -rf %{buildroot} - # Create directories mkdir -p %{buildroot}/usr/%{_lib}/lsc -mkdir -p %{buildroot}/var/lib/lsc +mkdir -p %{buildroot}%{_docdir}/%{name}/scripts # Copy files -cp -a %{SOURCE0} %{buildroot}/usr/%{_lib}/lsc -cp -a %{SOURCE1} %{buildroot}/var/lib/lsc -cp -a %{SOURCE2} %{buildroot}/var/lib/lsc -cp -a %{SOURCE3} %{buildroot}/var/lib/lsc - -%post - -/bin/chown -R %{lsc_user}:%{lsc_group} /usr/%{_lib}/lsc -/bin/chown -R %{lsc_user}:%{lsc_group} /var/lib/lsc +cp -a %{SOURCE0} %{buildroot}%{_libdir}/lsc +cp -a %{SOURCE1} %{buildroot}%{_docdir}/%{name}/scripts/ +cp -a %{SOURCE2} %{buildroot}%{_docdir}/%{name}/scripts/ +cp -a %{SOURCE3} %{buildroot}%{_docdir}/%{name}/scripts/ -%postun - -%clean -rm -rf %{buildroot} - %files -%defattr(-, root, root, 0755) -/usr/%{_lib}/lsc/lsc-executable-plugin* -/var/lib/lsc/lsc-executable* +%{_libdir}/lsc/lsc-executable-plugin* +%doc %{_docdir}/%{name}/scripts + -#================================================= -# Changelog -#================================================= %changelog +* Mon Jul 27 2026 David Coutadeur - 1.4-1 +- Upgrade to 1.4 +- Clean rpm specfile +- Properly handle Base64-encoded attributes +- Compatibility with LSC 2.3 + * Mon Jul 21 2025 - Clement Oudot - 1.3-1 - Upgrade to 1.3 - fix value comparison + add unit test for executableLdifDestinationService task + * Mon Apr 14 2025 - Clement Oudot - 1.2-1 - Upgrade to 1.2 + * Thu Jan 07 2021 - Clement Oudot - 1.1-0 - Upgrade to 1.1 + * Tue Mar 04 2014 - Clement Oudot - 1.0-0 - First package for LSC Executable plugin