From 52f0ab9fd485f6be0e3b071f2a533e82b99ac607 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Mon, 11 Jun 2018 14:28:49 -0400 Subject: [PATCH] Regroup source files --- pki-servlet-container.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pki-servlet-container.spec b/pki-servlet-container.spec index 850bde4..27c511f 100644 --- a/pki-servlet-container.spec +++ b/pki-servlet-container.spec @@ -71,9 +71,9 @@ Source3: %{name}-%{major_version}.%{minor_version}.sysconfig Source4: %{name}-%{major_version}.%{minor_version}.wrapper Source6: %{name}-%{major_version}.%{minor_version}-digest.script Source7: %{name}-%{major_version}.%{minor_version}-tool-wrapper.script -Source8: servlet-api-OSGi-MANIFEST.MF -Source9: jsp-api-OSGi-MANIFEST.MF -Source11: %{name}-%{major_version}.%{minor_version}.service +Source8: %{name}-%{major_version}.%{minor_version}.service +Source9: servlet-api-OSGi-MANIFEST.MF +Source11: jsp-api-OSGi-MANIFEST.MF Source12: el-api-OSGi-MANIFEST.MF Source13: jasper-el-OSGi-MANIFEST.MF Source14: jasper-OSGi-MANIFEST.MF @@ -203,10 +203,10 @@ export OPT_JAR_LIST="xalan-j2-serializer" # inject OSGi manifests mkdir -p META-INF -cp -p %{SOURCE8} META-INF/MANIFEST.MF +cp -p %{SOURCE9} META-INF/MANIFEST.MF touch META-INF/MANIFEST.MF zip output/build/lib/servlet-api.jar META-INF/MANIFEST.MF -cp -p %{SOURCE9} META-INF/MANIFEST.MF +cp -p %{SOURCE11} META-INF/MANIFEST.MF touch META-INF/MANIFEST.MF zip output/build/lib/jsp-api.jar META-INF/MANIFEST.MF cp -p %{SOURCE12} META-INF/MANIFEST.MF @@ -265,7 +265,7 @@ popd > ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name} %{__install} -m 0644 %{SOURCE4} \ ${RPM_BUILD_ROOT}%{_sbindir}/%{name} -%{__install} -m 0644 %{SOURCE11} \ +%{__install} -m 0644 %{SOURCE8} \ ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \