[frepple/f21] New upstream release 2.2
Johan De Taeye
jdetaeye at fedoraproject.org
Mon Dec 29 12:56:27 UTC 2014
commit 4a404fe976896774e8db4bff605720164abe3bf4
Author: johan <jdetaeye at users.sourceforge.net>
Date: Sun Dec 28 19:57:26 2014 +0100
New upstream release 2.2
frepple.spec | 71 +++++++++++++++++++++++++++++++++++----------------------
sources | 2 +-
2 files changed, 44 insertions(+), 29 deletions(-)
---
diff --git a/frepple.spec b/frepple.spec
index d49dd2d..fc7afa1 100644
--- a/frepple.spec
+++ b/frepple.spec
@@ -2,22 +2,19 @@
Summary: Free Production PLanning
Name: frepple
-Version: 2.1
-Release: 3%{?dist}
-# Note on the license: frePPle is released with the AGPL license, version 3 or higher.
-# The optional plugin module mod_lpsolver depends on the GLPK package which is
-# licensed under GPL. That module is therefore disabled in this build.
+Version: 2.2
+Release: 1%{?dist}
License: AGPLv3+
Group: Applications/Productivity
URL: http://www.frepple.com
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-XXXXXX)
-# Note on dependencies: Django 1.6 is also required, but this release isn't available
-# in Fedora. Users will unfortunately need to do a custom install, outside the standard
-# package installation process.
-# For the build the version 1.5 available in Fedora is luckily sufficient.
+# Note on dependencies: We need a patched installation of Django 1.6. Users will
+# unfortunately need to do a custom install.
+# For the build the standard version available in Fedora is luckily sufficient.
Requires: xerces-c, httpd, mod_wsgi, python, python-cherrypy
-BuildRequires: python-devel, automake, autoconf, libtool, xerces-c-devel, python-django
+Requires(pre): shadow-utils
+BuildRequires: python-devel, automake, autoconf, libtool, xerces-c-devel, python-django < 1.7, python-sphinx
%description
FrePPLe stands for "Free Production PLanning". It is an application for
@@ -44,6 +41,12 @@ BuildArch: noarch
%description doc
Documentation subpackage for frePPLe - free Production PLanning.
+%pre
+# Add frepple group.
+getent group frepple >/dev/null || groupadd -r frepple
+# Add the apache user to the new group
+usermod -a -G frepple apache
+
%prep
%setup -q
@@ -52,8 +55,7 @@ Documentation subpackage for frePPLe - free Production PLanning.
%configure \
--disable-static \
--disable-dependency-tracking \
- --disable-doc \
- --disable-lp_solver
+ --enable-doc
# Remove rpath from libtool
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -64,7 +66,7 @@ make %{?_smp_mflags} all
%check
# Run test suite, skipping some long and less interesting tests
-TESTARGS="--regression -e setup_1 -e setup_2 -e setup_3 -e operation_routing -e constraints_combined_1"
+TESTARGS="--regression -e setup_1 -e setup_2 -e setup_3 -e operation_routing -e constraints_combined_1 -e wip"
export TESTARGS
make check
@@ -80,37 +82,47 @@ rm -rf %{buildroot}%{_docdir}/%{name}
's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \
>> %{name}.lang
# Remove .py script extension
-mv $RPM_BUILD_ROOT/usr/bin/frepplectl.py $RPM_BUILD_ROOT/usr/bin/frepplectl
+mv $RPM_BUILD_ROOT%{_bindir}/frepplectl.py $RPM_BUILD_ROOT%{_bindir}/frepplectl
# Install apache configuration
-mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d
-install -m 644 -p contrib/rpm/httpd.conf $RPM_BUILD_ROOT/etc/httpd/conf.d/z_frepple.conf
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
+install -m 644 -p contrib/rpm/httpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/z_frepple.conf
# Create log directory
-mkdir -p $RPM_BUILD_ROOT/var/log/frepple
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/frepple
+# Update secret key in the configuration file
+sed -i "s/RANDOMSTRING/`date`/" $RPM_BUILD_ROOT%{_sysconfdir}/frepple/djangosettings.py
%clean
rm -rf %{buildroot}
%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%postun
+sbin/ldconfig
+# Remove log directory
+rm -rf /var/log/frepple
+# Note that we don't remove the frepple group when uninstalling.
+# There's no sane way to check if files owned by it are left behind.
+# And even if there would, what would we do with them?
+
%files -f %{name}.lang
%defattr(-,root,root,-)
-%{_bindir}/frepple
-%{_bindir}/frepplectl
+%attr(0550,-,frepple) %{_bindir}/frepple
+%attr(0550,-,frepple) %{_bindir}/frepplectl
%{_libdir}/libfrepple.so.0
-%{_libdir}/libfrepple.so.0.0.0
-%dir %{_datadir}/frepple
-%{_datadir}/frepple/*
+%attr(0550,-,frepple) %{_libdir}/libfrepple.so.0.0.0
+%{_datadir}/frepple
%{_mandir}/man1/frepple.1.*
%{_mandir}/man1/frepplectl.1.*
%{python_sitelib}/freppledb*
-%attr(0770,root,adm) %dir /var/log/frepple
+%attr(0770,-,frepple) %dir %{_localstatedir}/log/frepple
%doc COPYING
-%config(noreplace) /etc/frepple/license.xml
-%config(noreplace) /etc/frepple/init.xml
-%config(noreplace) /etc/frepple/djangosettings.py*
-%config(noreplace) /etc/httpd/conf.d/z_frepple.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/z_frepple.conf
+%attr(0660,-,frepple) %config(noreplace) %{_sysconfdir}/frepple/license.xml
+%attr(0660,-,frepple) %config(noreplace) %{_sysconfdir}/frepple/init.xml
+%attr(0660,-,frepple) %config(noreplace) %{_sysconfdir}/frepple/djangosettings.py
+%ghost %attr(0660,-,frepple) %{_sysconfdir}/frepple/djangosettings.pyc
+%ghost %attr(0660,-,frepple) %{_sysconfdir}/frepple/djangosettings.pyo
%files devel
%defattr(-,root,root,-)
@@ -125,6 +137,9 @@ rm -rf %{buildroot}
%doc doc/output
%changelog
+* Sun Dec 28 2014 Johan De Taeye <jdetaeye at users.sourceforge.net> - 2.2-1
+- New upstream release
+
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index ef5208e..6dbe7a8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d3e227d46b498eb41509645201e0b2dc frepple-2.1.tar.gz
+39be451fb15bacc3b7945e58cafc43d9 frepple-2.2.tar.gz
More information about the scm-commits
mailing list