[freemedforms] Updated to 0.9.0 beta1
Ankur Sinha
ankursinha at fedoraproject.org
Thu Aug 15 14:31:36 UTC 2013
commit 7428b0e5b1fd05b303e0b65525239fb4c1013a8b
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur at gmail.com>
Date: Fri Aug 16 00:30:56 2013 +1000
Updated to 0.9.0 beta1
Thanks Eric for spec fixes and comments.
.gitignore | 1 +
freemedforms-0.7.5-commandline-parser.patch | 11 --
freemedforms-0.7.5-remove-quazip.patch | 104 ------------------
freemedforms.spec | 153 ++++++++++++++-------------
sources | 2 +-
5 files changed, 82 insertions(+), 189 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 50e6e94..bfef419 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/freemedformsfullsources-0.5.9~alpha1.tgz
/freemedformsfullsources-0.7.5.tgz
+/freemedformsfullsources-0.9.0~beta1.tgz
diff --git a/freemedforms.spec b/freemedforms.spec
index edf9326..f3c5d84 100644
--- a/freemedforms.spec
+++ b/freemedforms.spec
@@ -1,45 +1,26 @@
%global projectname freemedforms
-%global releasetarname freemedformsfullsources
-
+%global releasetarname freemedformsfullsources
Name: freemedforms
-Version: 0.7.5
-Release: 9%{?dist}
+Version: 0.9.0
+Release: 0.1.beta1%{?dist}
Summary: The freemedforms application suite metapackage
License: GPLv3+ and LGPLv2
URL: http://www.%{name}.com
-Source0: http://freemedforms.googlecode.com/files/%{releasetarname}-%{version}.tgz
+Source0: http://freemedforms.googlecode.com/files/%{releasetarname}-%{version}~beta1.tgz
Source1: %{name}.1
-
-# the config option doesn't appear to work. It still produces a libquazip.so
-Patch0: %{name}-%{version}-remove-quazip.patch
-# patch command line parser to try fix segfault
-Patch1: %{name}-%{version}-commandline-parser.patch
-
-BuildRequires: qt-devel libXext-devel qt-mysql
+BuildRequires: qt-devel libXext-devel
BuildRequires: desktop-file-utils
-BuildRequires: quazip-devel libzip-devel
-BuildRequires: minizip-devel
-BuildRequires: zlib-devel
+BuildRequires: quazip-devel
+BuildRequires: opencv-devel
# pull in emr
Requires: %{projectname}-emr%{?_isa} >= %{version}-%{release}
# pull in freediams
Requires: freediams%{?_isa} >= %{version}-%{release}
-# filter provides and requires. The so files are private plugins
-%{?filter_setup:
-%filter_provides_in %{_libdir}/%{name}/
-%filter_provides_in %{_libdir}/%{projectname}-common/
-%filter_requires_in %{_libdir}/%{name}/
-%filter_requires_in %{_libdir}/%{projectname}-common/
-
-%filter_from_requires /libUtils/d ; /libExtensionSystem/d ; /libTranslationUtils/d ; /libAggregation/d
-
-%filter_setup
-}
%description
FreeMedForms aims to be a open Electronic Medical Record Manager.
FreeMedForms is also a lot of derivatives sub-project, which are
@@ -47,35 +28,34 @@ just standalone compilation of FreeMedForms plugins.
This project is a free and open source project. A community grows up
around it. FreeMedForms and derivatives is released under the terms
-of the new BSD License. Some parts of the code are LGPL v2.1.
+of the GPLv3 License. Some parts of the code are LGPL v2.1.
-FreeMedForms and Derivatives are coded in C++/Qt4.4.3 at least.
+FreeMedForms and Derivatives are coded in C++/Qt4.8+.
FreeMedForms and Derivatives are available for :
-- MacOs X universal
+- MacOs X
- Linux : Ubuntu, Debian, OpenSuse, standalone binary
-- FreeBSD : need compilation of SVN trunk (please contact author)
+- FreeBSD : need compilation of git repo (please contact author)
- Windows
-This is a meta package that pulls in the EMR freediams and freeaccounts
+This is a meta package that pulls in the EMR and FreeDiams
%package emr
-Summary: The freemedforms EMR
-# noarch requires
-Requires: %{projectname}-emr-data >= %{version}-%{release}
-Requires: %{projectname}-common-resources >= %{version}-%{release}
-
-Requires: %{projectname}-common-libs%{?_isa} >= %{version}-%{release}
+Summary: The FreeMedForms EMR
+Requires: %{projectname}-emr-data >= %{version}-%{release}
+Requires: %{projectname}-common-resources >= %{version}-%{release}
+Requires: %{projectname}-common-libs%{?_isa} >= %{version}-%{release}
+Requires: qt-mysql
# Obsolete previous packages since we've split into new subpackage scheme
Obsoletes: %{name} < 0.5.9-0.7.alpha1
Obsoletes: %{name}-devel < 0.5.9-0.7.alpha1
%description emr
-The freemedforms main EMR
+The FreeMedForms EMR
Please install the freemedforms-emr-docs-en,fr
-or the freemedforms-emr-translations packages if required
+or the freemedforms-common-translations packages if required
%package emr-data
Summary: Architecture independant data used by the freemedforms EMR
@@ -108,7 +88,8 @@ This package contains translation files for the freemedforms suite.
Languages contained are: English, Frence and Deutsch
%package common-libs
-Summary: Common files utilized by the freemedforms suite
+Summary: Common files utilized by the freemedforms suite
+Requires: qt-sqlite quazip
%description common-libs
These are files that are shared between the applications of the freemedforms
@@ -120,8 +101,9 @@ packaged for Fedora instead of re-generating these files. See the freediams
package for hints on how to do this.
%package common-resources
-Summary: Common resources used by the frreemedforms suite
-BuildArch: noarch
+Summary: Common resources used by the frreemedforms suite
+BuildArch: noarch
+Requires: %{projectname}-common-translations >= %{version}-%{release}
%description common-resources
This package contains textfiles that are shared between the applications of the
@@ -132,18 +114,24 @@ All applications of the suite should require this package when they are
packaged for Fedora instead of re-generating these files. See the freediams
package for hints on how to do this.
-
%prep
-%setup -q
-%patch0 -p1 -b .removes_bundled_quazip_req
-%patch1 -p0 -b .patches_command_line
+%setup -q -n %{name}-%{version}~beta1
+
+# Information about libquazip in FreeMedForms.
+# libquazip code is bundled in the source package but we can
+# avoid its compilation using the CONFIG+=dontbuildquazip in the qmake commandline
+# or by editing the buildspecs/optionalfeatures.pri
+# (uncommenting the '# CONFIG += dontbuildquazip' line)
-# contrib/quazip is the location of the bundled quazip library
-# delete everything other than the modified global.h and global.cpp files
-find ./contrib/ ! -name "global.*" ! -name "exporter.h" -exec rm -fv '{}' \;
+# Information about the build system.
+# The new build system of the FreeMedForms project (0.8+) creates the
+# buildpsecs/compiling.pri
+# during the qmake step. This file differs from apps to apps, so we need
+# cache it and reuse it before doing any make steps.
-# correct include : could've used a patch too I guess
-sed -i 's|#include <quazip/quazip/quazipfile.h>|#include <quazip/quazipfile.h>|' plugins/saverestoreplugin/saverestorepage.cpp
+# You can find a complete guide to the FreeMedForms build process here:
+# http://freemedforms.com/en/code/buildsystem
+# For internal libraries you can keep the defined rpath.
# correct end of file rpmlint error
sed -i 's/\r//' README.txt COPYING.txt
@@ -151,33 +139,42 @@ sed -i 's/\r//' README.txt COPYING.txt
%build
export PATH=$PATH:/usr/%{_lib}/qt4/bin/
+# Create all translations
lrelease global_resources/translations/*.ts
-qmake %{name}.pro -r -config release "CONFIG+=LINUX_INTEGRATED" "CONFIG+=dontbuildquazip" "INSTALL_ROOT_PATH=$RPM_BUILD_ROOT%{_prefix}" "LOWERED_APPNAME=%{name}" "LIBRARY_BASENAME=%{_lib}"
-make %{?_smp_mflags}
+# Build FreeMedForms EMR
+pushd freemedforms
+ qmake freemedforms.pro -r \
+ "CONFIG+=release" "CONFIG-=debug" \
+ "CONFIG+=LINUX_INTEGRATED" "CONFIG+=dontbuildquazip" \
+ "LIBRARY_BASENAME=%{_lib}" \
+ "INSTALL_ROOT_PATH=$RPM_BUILD_ROOT%{_prefix}"
+ #cp ../buildspecs/compiling.pri build/compiling_freemedforms.pri
+ make %{?_smp_mflags}
+popd
%install
-make install DESTDIR=$RPM_BUILD_ROOT
+# Install FreeMedForms EMR
+pushd freemedforms
+ make install DESTDIR=$RPM_BUILD_ROOT
+popd
+
+# Install man pages 'by-hand'
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1/
-install -p -m 0644 %{SOURCE1} -t $RPM_BUILD_ROOT/%{_mandir}/man1/
+install -p -m 0644 global_resources/package_helpers/freemedforms.1 -t $RPM_BUILD_ROOT/%{_mandir}/man1/
-chmod -v 0755 $RPM_BUILD_ROOT/%{_libdir}/%{name}/*.so*
-chmod -v 0755 $RPM_BUILD_ROOT/%{_libdir}/%{name}-common/*.so*
-chmod -v 0755 $RPM_BUILD_ROOT/%{_bindir}/%{name}
-# internal libraries, let rpath be
-#chrpath --delete $RPM_BUILD_ROOT/%{_libdir}/FreeMedForms/*.so*
-#chrpath --delete $RPM_BUILD_ROOT/%{_bindir}/FreeMedForms
+# Change the mod of bins/libs to rwxr-xr-x
+chmod -v 0755 $RPM_BUILD_ROOT/%{_libdir}/freemedforms-common/*.so*
+chmod -v 0755 $RPM_BUILD_ROOT/%{_libdir}/freemedforms/*.so*
+chmod -v 0755 $RPM_BUILD_ROOT/%{_bindir}/freemedforms
-# fix up desktop file
+# Fix up and validate desktop file
sed -r -i "s/Categories=Office;MedicalSoftware/Categories=Office;/" ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
sed -r -i "/Version/d" ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
-# validate desktop file
-desktop-file-validate \
-${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
-
-# remove packagehelpers part
+# Remove packagehelpers part
rm -fvr $RPM_BUILD_ROOT/%{_datadir}/%{name}/package_helpers/
%files
@@ -192,7 +189,7 @@ rm -fvr $RPM_BUILD_ROOT/%{_datadir}/%{name}/package_helpers/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.svg
%{_mandir}/man1/%{name}.*
-%{_docdir}/%{projectname}-project/%{name}/
+%dir %{_docdir}/%{projectname}-project/%{name}/
%files emr-data
%{_datadir}/%{name}/forms/
@@ -214,14 +211,23 @@ rm -fvr $RPM_BUILD_ROOT/%{_datadir}/%{name}/package_helpers/
%files common-resources
%dir %{_docdir}/%{projectname}-project/
+%{_datadir}/%{projectname}/datapacks/
+%{_datadir}/%{projectname}/pixmap/
%{_datadir}/%{projectname}/textfiles/
-%{_datadir}/%{name}/sql/
-%{_datadir}/%{name}/datapacks/
-%{_datadir}/%{name}/pixmap/
+%{_datadir}/%{projectname}/sql/
+
%changelog
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.5-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+* Thu Aug 15 2013 Ankur Sinha <ankursinha AT fedoraproject DOT org> 0.9.0-0.1.beta1
+- Based on Eric's spec
+- Update to 0.9.0~beta1
+- Update build system 0.9.0
+- Adding some comments
+- Correcting some package content
+- Rpaths, but internal libraries so OK
+
+* Sun May 19 2013 Ankur Sinha <ankursinha AT fedoraproject DOT org> 0.8.2.1-1
+- Update to 0.8.2.1
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.5-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
@@ -280,3 +286,4 @@ rm -fvr $RPM_BUILD_ROOT/%{_datadir}/%{name}/package_helpers/
- Initial rpm build
- Based on the spec used for OpenSUSE maintained by Sascha Manns.
+
diff --git a/sources b/sources
index 3290993..3e019d6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e014e81b349ef5d41bdb956653fb18ab freemedformsfullsources-0.7.5.tgz
+83fb62353aa843c75ff829104772b7f4 freemedformsfullsources-0.9.0~beta1.tgz
More information about the scm-commits
mailing list