passenger.spec

@@ -2,18 +2,15 @@
 %{!?_httpd_confdir:     %{expand: %%global _httpd_confdir     %%{_sysconfdir}/httpd/conf.d}}
 %{!?_httpd_modconfdir:  %{expand: %%global _httpd_modconfdir  %%{_sysconfdir}/httpd/conf.d}}
 %{!?_httpd_moddir:      %{expand: %%global _httpd_moddir      %%{_libdir}/httpd/modules}}
-%{!?ruby_vendorlibdir: %global ruby_vendorlibdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorlibdir"]')}
-%{!?ruby_vendorarchdir: %global ruby_vendorarchdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorarchdir"]')}
-%global passenger_ruby_libdir %{ruby_vendorlibdir}
 
 Name:passenger
 Summary: Phusion Passenger application server
-Version: 6.0.17
+Version: 6.0.8
 Release: 3
 License: Boost and BSD and MIT and zlib
 URL: https://www.phusionpassenger.com
 
-Source: http://github.com/phusion/passenger/archive/refs/tags/release-6.0.17.tar.gz
+Source: http://s3.amazonaws.com/phusion-passenger/releases/%{name}-%{version}.tar.gz
 Source10: passenger.logrotate
 Source11: passenger-selinux.te
 Source100: apache-passenger.conf.in
@@ -26,7 +23,7 @@ BuildRequires: gcc, gcc-c++ httpd-devel ruby ruby-devel rubygems rubygems-devel
 BuildRequires: rubygem(rake) >= 0.8.1 rubygem(rack) zlib-devel pcre-devel
 BuildRequires: openssl-devel libcurl-devel jsoncpp-devel perl
 
-Provides: bundled(boost)  = 1.81.0
+Provides: bundled(boost)  = 1.69.0
 
 Obsoletes: rubygem-passenger < %{version}-%{release}
 Provides:  rubygem-passenger = %{version}-%{release}
@@ -75,16 +72,11 @@ BuildArch: noarch
 This package contains documentation files for Phusion Passenger®.
 
 %prep
-%autosetup -n %{name}-release-%{version}
+%autosetup -n %{name}-%{version}
 
 %build
-%ifarch loongarch64 riscv64
-%configure || :
-%endif
 export EXTRA_CFLAGS="${CFLAGS:-%optflags} -Wno-deprecated"
 export EXTRA_CXXFLAGS="${CXXFLAGS:-%optflags} -Wno-deprecated"
-export EXTRA_LDFLAGS="${EXTRA_LDFLAGS} -fPIE -pie -fPIC"
-export EXTRA_CXX_LDFLAGS="${EXTRA_CXX_LDFLAGS} -fPIE -pie -fPIC"
 
 export EXTRA_CFLAGS=`echo "$EXTRA_CFLAGS" | sed 's|-O2||g'`
 export EXTRA_CXXFLAGS=`echo "$EXTRA_CXXFLAGS" | sed 's|-O2||g'`
@@ -107,8 +99,8 @@ rake -m fakeroot \
     FS_DATADIR=%{_datadir} \
     FS_LIBDIR=%{_libdir} \
     FS_DOCDIR=%{_docdir} \
-    RUBYLIBDIR=%{ruby_vendorlibdir} \
-    RUBYARCHDIR=%{ruby_vendorarchdir} \
+    RUBYLIBDIR=%{_datadir}/passenger \
+    RUBYARCHDIR=%{_libdir}/passenger \
     APACHE2_MODULE_PATH=%{_httpd_moddir}/mod_passenger.so
 
 
@@ -125,10 +117,6 @@ export LC_ALL=en_US.UTF-8
 %{__sed} -e 's|@PASSENGERROOT@|%{_datadir}/passenger/phusion_passenger/locations.ini|g' %{SOURCE100} > passenger.conf
 %{__sed} -i -e '/^# *Require all granted/d' passenger.conf
 
-./dev/install_scripts_bootstrap_code.rb --ruby %{passenger_ruby_libdir} \
-    %{buildroot}%{_bindir}/* \
-    %{buildroot}%{_sbindir}/* \
-    `find %{buildroot} -name rack_handler.rb`
 
 %if "%{_httpd_modconfdir}" == "%{_httpd_confdir}"
     %{__cat} %{SOURCE101} passenger.conf > passenger-combined.conf
@@ -162,7 +150,7 @@ sed -i 's|^#!/usr/bin/env python$|#!/usr/bin/python3|' %{buildroot}%{_datadir}/p
 
 %files
 %doc LICENSE CONTRIBUTORS CHANGELOG
-%{_bindir}/*
+%{_bindir}/%{name}*
 %exclude %{_bindir}/%{name}-install-*-module
 %{_sbindir}/*
 %{_usr}/lib/tmpfiles.d/passenger.conf
@@ -172,14 +160,15 @@ sed -i 's|^#!/usr/bin/env python$|#!/usr/bin/python3|' %{buildroot}%{_datadir}/p
 %{_datadir}/passenger/node
 %{_datadir}/passenger/*.types
 %{_datadir}/passenger/*.crt
+%{_datadir}/passenger/*.txt
 %{_datadir}/passenger/*.pem
 %{_datadir}/passenger/*.p12
 %dir %{_localstatedir}/log/passenger-analytics
 %dir %attr(755, root, root) %{_localstatedir}/run/passenger-instreg
 %{_sysconfdir}/logrotate.d/passenger
-%{passenger_ruby_libdir}/*
+%{_datadir}/passenger/*
 %{_libdir}/passenger/support-binaries
-%{ruby_vendorarchdir}/passenger_native_support.so
+%{_libdir}/passenger/passenger_native_support.so
 
 %files devel
 %{_datadir}/passenger/ngx_http_passenger_module
@@ -200,21 +189,6 @@ sed -i 's|^#!/usr/bin/env python$|#!/usr/bin/python3|' %{buildroot}%{_datadir}/p
 %{_mandir}/*/*
 
 %changelog
-* Wed Jul 05 2023 wujie <wujie@nj.iscas.ac.cn> - 6.0.17-3
-- fix riscv configure
-
-* Wed Jun 07 2023 chenchen <chen_aka_jan@163.com> - 6.0.17-2
-- add PIE compiler option
-
-* Mon Apr 17 2023 Ge Wang <wang--ge@126.com> - 6.0.17-1
-- update to version 6.0.17
-
-* Tue Dec 13 2022 huajingyun <huajingyun@loongson.cn> - 6.0.8-5
-- fix passenger build error for loongarch64
-
-* Sat Sep 10 2022 yangchenguang <yangchenguang@uniontech.com> - 6.0.8-4
-- fix passenger load error
-
 * Mon Apr 25 2022 caodongxia<caodongxia@h-partners.com> - 6.0.8-3
 - add buildRequires to resolve compilation failure