[freemedforms] Major changes:
Ankur Sinha
ankursinha at fedoraproject.org
Wed Sep 17 11:45:07 UTC 2014
commit 02c399773cf52d58bcefb9c8156467c09d5fab18
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur at gmail.com>
Date: Wed Sep 17 21:44:04 2014 +1000
Major changes:
- Update to latest upstream release
- freediams merged to the same spec
- freediams retired
- package names are same and therefore no obsolete is required
- all plugins other than webcam built. Webcam crashes and upstream has
been informed
.gitignore | 1 +
freemedforms.1 | 42 ---------------
freemedforms.spec | 151 +++++++++++++++++++++++++++++++++++++++++++----------
sources | 2 +-
4 files changed, 126 insertions(+), 70 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bfef419..9f8ffef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/freemedformsfullsources-0.5.9~alpha1.tgz
/freemedformsfullsources-0.7.5.tgz
/freemedformsfullsources-0.9.0~beta1.tgz
+/freemedforms-project-src_0.9.4.tgz
diff --git a/freemedforms.spec b/freemedforms.spec
index d0e73b9..03179f1 100644
--- a/freemedforms.spec
+++ b/freemedforms.spec
@@ -1,15 +1,13 @@
%global projectname freemedforms
-%global releasetarname freemedformsfullsources
Name: freemedforms
-Version: 0.9.0
-Release: 0.3.beta1%{?dist}
-Summary: The freemedforms application suite metapackage
+Version: 0.9.4
+Release: 1%{?dist}
+Summary: The freemedforms application suite meta package
License: GPLv3+ and LGPLv2
URL: http://www.%{name}.com
-Source0: http://freemedforms.googlecode.com/files/%{releasetarname}-%{version}~beta1.tgz
-Source1: %{name}.1
+Source0: http://downloads.sourceforge.net/%{projectname}/%{projectname}-project-src_%{version}.tgz
BuildRequires: qt-devel libXext-devel
BuildRequires: desktop-file-utils
@@ -21,6 +19,19 @@ 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_provides_in %{_libdir}/freediams/
+%filter_requires_in %{_libdir}/freediams/
+
+%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
@@ -54,7 +65,7 @@ Obsoletes: %{name}-devel < 0.5.9-0.7.alpha1
%description emr
The FreeMedForms EMR
-Please install the freemedforms-emr-docs-en,fr
+Please install the freemedforms-emr-docs-en,fr
or the freemedforms-common-translations packages if required
%package emr-data
@@ -62,7 +73,7 @@ Summary: Architecture independant data used by the freemedforms EMR
BuildArch: noarch
%description emr-data
-This package contains the data packs, images and other architecture independant
+This package contains the data packs, images and other architecture independant
data used by the freemedforms EMR
%package emr-docs-en
@@ -101,7 +112,7 @@ 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
+Summary: Common resources used by the freemedforms suite
BuildArch: noarch
Requires: %{projectname}-common-translations >= %{version}-%{release}
@@ -114,27 +125,59 @@ 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 -n %{name}-%{version}~beta1
+%package -n freediams
+Summary: The pharmaceutical prescription assistant
+
+Requires: %{projectname}-common-libs%{?_isa} >= %{version}-%{release}
+Requires: %{projectname}-common-resources >= %{version}-%{release}
+
+%description -n freediams
+FreeDiams prescriber is the result of FreeMedForms prescriber plugins built
+into a standalone application. FreeDiams is a multi-platform (MacOS, Linux,
+FreeBSD, Windows), free and open source released under the GPLv3 license.
+
+It is mainly developed by medical doctors and is intended for use by these same
+professionals. It can be used alone to prescribe and / or test drug
+interactions within a prescription. It can be linked to any application thanks
+to its command line parameters.
+
+FreeDiams can manage multiple drugs databases. Some drugs databases are already
+available:
+
+ French (sources: AFSSAPS)
+ Canadian (sources: HCDPD)
+ USA (sources: FDA)
+ South African (sources: AEPI)
-# 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)
+The interactions database (source: AFSSAPS) give access to many informations:
-# 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.
+ interactions by themselves
+ risk level
+ nature of the risk
+ management of the interaction
-# 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.
+This is part of the freemedforms suite of applications
+
+%package -n freediams-docs-en
+Summary: English documentation for freediams
+BuildArch: noarch
+
+%description -n freediams-docs-en
+This package contains HTML documentation in English for freediams
+
+%package -n freediams-docs-fr
+Summary: French documentation for freediams
+BuildArch: noarch
+
+%description -n freediams-docs-fr
+This package contains HTML documentation in French for freediams
+
+%prep
+%setup -q -n %{name}-project-%{version}
-# correct end of file rpmlint error
sed -i 's/\r//' README.txt COPYING.txt
+# 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
%build
export PATH=$PATH:/usr/%{_lib}/qt4/bin/
@@ -144,18 +187,45 @@ lrelease global_resources/translations/*.ts
# Build FreeMedForms EMR
pushd freemedforms
+ # Plugin broken. Disabled at the moment. Upstream is aware.
+ #"CONFIG+=with-webcam" \
qmake freemedforms.pro -r \
"CONFIG+=release" "CONFIG-=debug" \
"CONFIG+=LINUX_INTEGRATED" "CONFIG+=dontbuildquazip" \
+ "CONFIG+=with-plugin" "CONFIG+=with-account" \
+ "CONFIG+=with-agenda" "CONFIG+=with-alerts" \
+ "CONFIG+=with-feedback" "CONFIG+=with-pmh" \
"LIBRARY_BASENAME=%{_lib}" \
"INSTALL_ROOT_PATH=$RPM_BUILD_ROOT%{_prefix}"
- #cp ../buildspecs/compiling.pri build/compiling_freemedforms.pri
+ cp ../buildspecs/compiling.pri ../build/compiling_freemedforms.pri
+ make %{?_smp_mflags}
+popd
+
+# Build Freediams
+pushd freediams
+ # Plugin broken. Disabled at the moment. Upstream is aware.
+ #"CONFIG+=with-webcam" \
+ qmake freediams.pro -r \
+ "CONFIG+=release" "CONFIG-=debug" \
+ "CONFIG+=dontbuildlibs" "CONFIG+=dontinstallresources" "CONFIG+=dontinstalllibs" \
+ "CONFIG+=LINUX_INTEGRATED" "CONFIG+=dontbuildquazip" \
+ "CONFIG+=with-plugin" "CONFIG+=with-account" \
+ "CONFIG+=with-agenda" "CONFIG+=with-alerts" \
+ "CONFIG+=with-feedback" "CONFIG+=with-pmh" \
+ "LIBRARY_BASENAME=%{_lib}" \
+ "INSTALL_ROOT_PATH=$RPM_BUILD_ROOT%{_prefix}"
+ cp ../buildspecs/compiling.pri ../build/compiling_freediams.pri
make %{?_smp_mflags}
popd
%install
-# Install FreeMedForms EMR
pushd freemedforms
+ cp ../build/compiling_freemedforms.pri ../buildspecs/compiling.pri
+ make install DESTDIR=$RPM_BUILD_ROOT
+popd
+
+pushd freediams
+ cp ../build/compiling_freediams.pri ../buildspecs/compiling.pri
make install DESTDIR=$RPM_BUILD_ROOT
popd
@@ -163,16 +233,22 @@ popd
# Install man pages 'by-hand'
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1/
install -p -m 0644 global_resources/package_helpers/freemedforms.1 -t $RPM_BUILD_ROOT/%{_mandir}/man1/
+install -p -m 0644 global_resources/package_helpers/freediams.1 -t $RPM_BUILD_ROOT/%{_mandir}/man1/
# 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
+chmod -v 0755 $RPM_BUILD_ROOT/%{_libdir}/freediams/*.so*
+chmod -v 0755 $RPM_BUILD_ROOT/%{_bindir}/freediams
# 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
+sed -r -i "s/Categories=Office;MedicalSoftware/Categories=Office;/" ${RPM_BUILD_ROOT}%{_datadir}/applications/freediams.desktop
+sed -r -i "/Version/d" ${RPM_BUILD_ROOT}%{_datadir}/applications/freediams.desktop
desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/freediams.desktop
# Remove packagehelpers part
rm -fvr $RPM_BUILD_ROOT/%{_datadir}/%{name}/package_helpers/
@@ -216,8 +292,29 @@ rm -fvr $RPM_BUILD_ROOT/%{_datadir}/%{name}/package_helpers/
%{_datadir}/%{projectname}/textfiles/
%{_datadir}/%{projectname}/sql/
+%files -n freediams
+%doc COPYING.txt README.txt
+%{_bindir}/freediams
+%{_datadir}/applications/freediams.desktop
+%{_datadir}/pixmaps/freediams.svg
+%{_mandir}/man1/freediams.*
+%dir %{_libdir}/freediams
+%{_libdir}/freediams/*.so
+%{_libdir}/freediams/*pluginspec
+%dir %{_docdir}/%{projectname}-project/freediams/
+
+%files -n freediams-docs-en
+%{_docdir}/%{projectname}-project/freediams/en
+
+
+%files -n freediams-docs-fr
+%{_docdir}/%{projectname}-project/freediams/fr
%changelog
+* Tue Sep 16 2014 Ankur Sinha <ankursinha AT fedoraproject DOT org> 0.9.4-1
+- Update to latest upstream release
+- Merge freediams to this spec too
+
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.0-0.3.beta1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index 3e019d6..0eb5578 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-83fb62353aa843c75ff829104772b7f4 freemedformsfullsources-0.9.0~beta1.tgz
+47b38648d3f581cb8627c175c2c01693 freemedforms-project-src_0.9.4.tgz
More information about the scm-commits
mailing list