Merge "Fix rpm packaging following review 21188" into guppy

diff --git a/conf.d/packaging/deb/debian.agl-app-framework-binder-bin.install b/conf.d/packaging/deb/debian.agl-app-framework-binder-bin.install
index 05d8916..82526ed 100644 (file)
--- a/conf.d/packaging/deb/debian.agl-app-framework-binder-bin.install
+++ b/conf.d/packaging/deb/debian.agl-app-framework-binder-bin.install
@@ -6,5 +6,5 @@
 /opt/AGL/bin/afb-exprefs
 /opt/AGL/bin/afb-client-demo
 /opt/AGL/bin/afb-genskel
-/etc/profile.d/AGL-app-framework-binder.sh
+/etc/profile.d/agl-app-framework-binder.sh
 /opt/AGL/lib/*/afb/monitoring/*

diff --git a/conf.d/packaging/deb/debian.rules b/conf.d/packaging/deb/debian.rules
index ba4aeb6..eaaf59d 100644 (file)
--- a/conf.d/packaging/deb/debian.rules
+++ b/conf.d/packaging/deb/debian.rules
@@ -48,13 +48,13 @@ install: build
        # Add here commands to install the package into debian/tmp
        cd build;make install DESTDIR=/usr/src/packages/BUILD/debian/tmp
        mkdir -p debian/tmp/etc/profile.d
-       echo '#----------  AGL app-framework-binder options Start ---------" '                          > debian/tmp/etc/profile.d/AGL-app-framework-binder.sh
-       echo '# Object: AGL cmake option for  binder/bindings'                                          >> debian/tmp/etc/profile.d/AGL-app-framework-binder.sh
-       echo 'export LD_LIBRARY_PATH=/opt/AGL/lib/$(DEB_HOST_MULTIARCH):$${LD_LIBRARY_PATH}'            >> debian/tmp/etc/profile.d/AGL-app-framework-binder.sh
-       echo 'export LIBRARY_PATH=/opt/AGL/lib/$(DEB_HOST_MULTIARCH):$${LIBRARY_PATH}'                  >> debian/tmp/etc/profile.d/AGL-app-framework-binder.sh
-       echo 'export PKG_CONFIG_PATH=/opt/AGL/lib/$(DEB_HOST_MULTIARCH)/pkgconfig:$${PKG_CONFIG_PATH}'  >> debian/tmp/etc/profile.d/AGL-app-framework-binder.sh
-       echo 'export PATH=/opt/AGL/bin:$${PATH}'                                                        >> debian/tmp/etc/profile.d/AGL-app-framework-binder.sh
-       echo '#----------  AGL options End ---------'                                                   >> debian/tmp/etc/profile.d/AGL-app-framework-binder.sh
+       echo '#----------  AGL app-framework-binder options Start ---------" '                          > debian/tmp/etc/profile.d/agl-app-framework-binder.sh
+       echo '# Object: AGL cmake option for  binder/bindings'                                          >> debian/tmp/etc/profile.d/agl-app-framework-binder.sh
+       echo 'export LD_LIBRARY_PATH=/opt/AGL/lib/$(DEB_HOST_MULTIARCH):$${LD_LIBRARY_PATH}'            >> debian/tmp/etc/profile.d/agl-app-framework-binder.sh
+       echo 'export LIBRARY_PATH=/opt/AGL/lib/$(DEB_HOST_MULTIARCH):$${LIBRARY_PATH}'                  >> debian/tmp/etc/profile.d/agl-app-framework-binder.sh
+       echo 'export PKG_CONFIG_PATH=/opt/AGL/lib/$(DEB_HOST_MULTIARCH)/pkgconfig:$${PKG_CONFIG_PATH}'  >> debian/tmp/etc/profile.d/agl-app-framework-binder.sh
+       echo 'export PATH=/opt/AGL/bin:$${PATH}'                                                        >> debian/tmp/etc/profile.d/agl-app-framework-binder.sh
+       echo '#----------  AGL options End ---------'                                                   >> debian/tmp/etc/profile.d/agl-app-framework-binder.sh
        # Move all files in their corresponding package
        dh_install --list-missing -s --sourcedir=debian/tmp
        # empty dependency_libs in .la files

diff --git a/conf.d/packaging/rpm/agl-app-framework-binder.spec b/conf.d/packaging/rpm/agl-app-framework-binder.spec
index a9692eb..a8596f5 100644 (file)
--- a/conf.d/packaging/rpm/agl-app-framework-binder.spec
+++ b/conf.d/packaging/rpm/agl-app-framework-binder.spec
@@ -96,7 +96,7 @@ EOF
 
 #app-framework-binder demo
 %{_libdir}/afb/*.so
-%config(noreplace) %{_sysconfdir}/profile.d/AGL-%{name}.sh
+%config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh
 
 #app-framework-binder monitoring
 %dir %{_libdir}/afb/monitoring