[frepple/f18] new upstream release

[Johan De Taeye]

commit 4ecfd86b7f985e93d238d53eea9b476a5e1b5d5a
Author: johan <jdetaeye at users.sourceforge.net>
Date:   Mon Jan 6 22:16:51 2014 +0100

    new upstream release

 frepple.spec |   42 ++++++++++++++++++++++++++++++------------
 sources      |    2 +-
 2 files changed, 31 insertions(+), 13 deletions(-)
---
diff --git a/frepple.spec b/frepple.spec
index 0edfd1e..7d41dbd 100644
--- a/frepple.spec
+++ b/frepple.spec
@@ -2,7 +2,7 @@
 
 Summary: Free Production PLanning
 Name: frepple
-Version: 2.0
+Version: 2.1
 Release: 1%{?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 
@@ -12,8 +12,12 @@ 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)
-Requires: xerces-c, Django
-BuildRequires: python-devel, xerces-c-devel, Django
+# 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.
+Requires: xerces-c, httpd, mod_wsgi, python, python-cherrypy
+BuildRequires: python-devel, automake, autoconf, libtool, xerces-c-devel, python-django
 
 %description
 FrePPLe stands for "Free Production PLanning". It is an application for
@@ -66,7 +70,7 @@ make check
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} 
+make install DESTDIR=%{buildroot}
 # Do not package .la files created by libtool
 find %{buildroot} -name '*.la' -exec rm {} \;
 # Use percent-doc instead of install to create the documentation
@@ -75,6 +79,13 @@ rm -rf %{buildroot}%{_docdir}/%{name}
 (cd $RPM_BUILD_ROOT && find . -name 'django*.mo') | %{__sed} -e 's|^.||' | %{__sed} -e \
   '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
+# 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
+# Create log directory
+mkdir -p $RPM_BUILD_ROOT/var/log/frepple
 
 %clean
 rm -rf %{buildroot}
@@ -86,20 +97,24 @@ rm -rf %{buildroot}
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_bindir}/frepple
-%{_bindir}/manage.py
-%dir %{_libdir}/frepple
-%{_libdir}/frepple/libfrepple.so.0
-%{_libdir}/frepple/libfrepple.so.0.0.0
+%{_bindir}/frepplectl
+%{_libdir}/libfrepple.so.0
+%{_libdir}/libfrepple.so.0.0.0
 %dir %{_datadir}/frepple
-%{_datadir}/frepple/*.xsd
-%{_datadir}/frepple/*.xml
+%{_datadir}/frepple/*
 %{_mandir}/man1/frepple.1.*
+%{_mandir}/man1/frepplectl.1.*
 %{python_sitelib}/freppledb*
+%attr(0770,root,adm) %dir /var/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
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/frepple/libfrepple.so
+%{_libdir}/libfrepple.so
 %dir %{_includedir}/frepple
 %{_includedir}/frepple/*
 %{_includedir}/frepple.h
@@ -107,9 +122,12 @@ rm -rf %{buildroot}
 
 %files doc
 %defattr(-,root,root,-)
-%doc doc/html
+%doc doc/output
 
 %changelog
+* Mon Jan 06 2014 Johan De Taeye <jdetaeye at users.sourceforge.net> - 2.1-1
+- New upstream release
+
 * Mon Jun 3 2013 Johan De Taeye <jdetaeye at users.sourceforge.net> - 2.0-1
 - New upstream release
 
diff --git a/sources b/sources
index ae54b00..ef5208e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-070239adc7334e8f53b26793c00657f4  frepple-2.0.tar.gz
+d3e227d46b498eb41509645201e0b2dc  frepple-2.1.tar.gz