Missing bin/ directory in packages (#126)

ltb-project · May 17, 2023 · 59fec15 · 59fec15
1 parent dc79961
commit 59fec15
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
@@ -1,3 +1,9 @@
+ltb-project-white-pages (0.4-2) unstable; urgency=low
+
+    * gh#126: Missing bin/ directory in packages
+
+ -- Clement Oudot <clem@ltb-project.org>  Wed, 17 May 2023 12:00:00 +0200
+
 ltb-project-white-pages (0.4-1) unstable; urgency=low
 
     * gh#75: Display account : empty result

diff --git a/packaging/debian/white-pages.install b/packaging/debian/white-pages.install
@@ -1,4 +1,5 @@
 # Program files
+../bin/*       usr/share/white-pages/bin/
 ../conf/*      usr/share/white-pages/conf/
 ../htdocs/*    usr/share/white-pages/htdocs/
 ../lang/*      usr/share/white-pages/lang/

diff --git a/packaging/makedist.sh b/packaging/makedist.sh
@@ -18,6 +18,7 @@ rm -f $NAME*
 
 # Create dist dir
 mkdir -p $NAME-$VERSION
+mkdir -p $NAME-$VERSION/bin
 mkdir -p $NAME-$VERSION/cache
 mkdir -p $NAME-$VERSION/conf
 mkdir -p $NAME-$VERSION/htdocs
@@ -31,6 +32,7 @@ mkdir -p $NAME-$VERSION/vendor
 cp    ../AUTHORS     $NAME-$VERSION
 cp    ../LICENCE     $NAME-$VERSION
 cp    ../README.md   $NAME-$VERSION
+cp -a ../bin/*       $NAME-$VERSION/bin
 cp -a ../conf/*      $NAME-$VERSION/conf
 cp -a ../htdocs/*    $NAME-$VERSION/htdocs
 cp -a ../lang/*      $NAME-$VERSION/lang

diff --git a/packaging/rpm/SPECS/white-pages.spec b/packaging/rpm/SPECS/white-pages.spec
@@ -24,7 +24,7 @@
 Summary: LDAP white pages web interface
 Name: %{wp_name}
 Version: %{wp_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 BuildArch: noarch
 
@@ -56,6 +56,7 @@ rm -rf %{buildroot}
 
 # Create directories
 mkdir -p %{buildroot}/%{wp_destdir}
+mkdir -p %{buildroot}/%{wp_destdir}/bin
 mkdir -p %{buildroot}/%{wp_cachedir}/cache
 mkdir -p %{buildroot}/%{wp_destdir}/conf
 mkdir -p %{buildroot}/%{wp_destdir}/htdocs
@@ -68,6 +69,7 @@ mkdir -p %{buildroot}/etc/httpd/conf.d
 
 # Copy files
 ## Program
+install -m 755 bin/*          %{buildroot}/%{wp_destdir}/bin
 install -m 644 conf/*         %{buildroot}/%{wp_destdir}/conf
 install -m 644 htdocs/*.php   %{buildroot}/%{wp_destdir}/htdocs
 cp -a          htdocs/css     %{buildroot}/%{wp_destdir}/htdocs
@@ -114,6 +116,8 @@ rm -rf %{buildroot}
 # Changelog
 #=================================================
 %changelog
+* Wed May 17 2023 - Clement Oudot <clem@ltb-project.org> - 0.4-2
+- gh#126: Missing bin/ directory in packages
 * Thu May 04 2023 - Clement Oudot <clem@ltb-project.org> - 0.4-1
 - gh#75: Display account : empty result
 - gh#76: add a option to change timeout of ldap connexion