Attachment 588325 Details for Bug 827318 – diff against latest commit in the package's master branch

[patch] diff against latest commit in the package's master branch

0001-Update-to-1.1.14.patch (text/plain), 6.52 KB, created by Michel Alexandre Salim on 2012-06-01 06:18:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Alexandre Salim

Created: 2012-06-01 06:18:06 UTC

Size: 6.52 KB

patch

obsolete

>From 0bb55ff302255e3fac0c31a5251e1bb1019898a0 Mon Sep 17 00:00:00 2001
>From: Michel Alexandre Salim <salimma@fedoraproject.org>
>Date: Fri, 1 Jun 2012 13:05:53 +0700
>Subject: [PATCH] Update to 1.1.14
>
>---
> .gitignore  |    2 +-
> gnumed.spec |   65 ++++++++++++++++++++++++++++++-----------------------------
> sources     |    2 +-
> 3 files changed, 35 insertions(+), 34 deletions(-)
>
>diff --git a/.gitignore b/.gitignore
>index 2941f8a..0d851c3 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -1 +1 @@
>-/gnumed-client.0.9.9.tgz
>+/gnumed-client.1.1.14.tgz
>diff --git a/gnumed.spec b/gnumed.spec
>index c764042..c09947e 100644
>--- a/gnumed.spec
>+++ b/gnumed.spec
>@@ -1,14 +1,13 @@
>+%global major_ver 1.1
> Name:           gnumed
>-Version:        0.9.9
>-Release:        5%{?dist}
>-Summary:        The %{name} client
>+Version:        %{major_ver}.14
>+Release:        1%{?dist}
>+Summary:        The GNUmed client
> 
>-License:        GPLv2
>+License:        GPLv2+
> URL:            http://wiki.%{name}.de
>-Source0:        http://www.%{name}.de/downloads/client/0.9/%{name}-client.0.9.9.tgz
>+Source0:        http://www.%{name}.de/downloads/client/%{major_ver}/%{name}-client.%{version}.tgz
> Source2:        readme.GNUmed
>-# Email with upstream's response to License query
>-Source3:        GNUmedLicense.README
> 
> BuildRequires:  desktop-file-utils
> BuildRequires:  python-devel
>@@ -57,11 +56,15 @@ Authors:
>     GNUmed team
> 
> 
>-%package docs
>+%package doc
> Summary:    Documentation for %{name}
> BuildArch:  noarch
>+Requires:   %{name} = %{version}-%{release}
>+Provides:   %{name}-docs = %{version}-%{release}
>+# last release before rename is 0.9.9-5
>+Obsoletes:  %{name}-docs < 1.0.0
> 
>-%description docs
>+%description doc
> The documentation for %{name}
> 
> %prep
>@@ -72,45 +75,44 @@ The documentation for %{name}
> 
> %install
> mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}
>-cp client/connectors/gm_ctl_client.conf $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/gm_ctl_client.conf
>-cp client/doc/%{name}.conf.example $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.conf
>-cp client/etc/%{name}/%{name}-client.conf.example $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}-client.conf
>-cp %{SOURCE2} .
>-cp %{SOURCE3} .
>+cp -p client/connectors/gm_ctl_client.conf $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/gm_ctl_client.conf
>+cp -p client/doc/%{name}.conf.example $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.conf
>+cp -p client/etc/%{name}/%{name}-client.conf.example $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}-client.conf
>+cp -p %{SOURCE2} .
> 
> mkdir -p $RPM_BUILD_ROOT%{_bindir}
>-cp client/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
>+cp -p client/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
> 
> mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/bitmaps
>-cp  -av client/bitmaps/*.png $RPM_BUILD_ROOT%{_datadir}/%{name}/bitmaps/
>+cp  -av client/bitmaps/{e*,gnu*,serpent}.png $RPM_BUILD_ROOT%{_datadir}/%{name}/bitmaps/
> 
> # Locale files
> for i in "fr" "de" "es" "it" "nb" "nl" "pl" "pt_BR" "ru"; do
>     mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale/"$i"/LC_MESSAGES/
>-    cp client/po/"$i"-%{name}.mo $RPM_BUILD_ROOT%{_datadir}/locale/"$i"/LC_MESSAGES/%{name}.mo
>+    cp -p client/po/"$i"-%{name}.mo $RPM_BUILD_ROOT%{_datadir}/locale/"$i"/LC_MESSAGES/%{name}.mo
> done
> %find_lang %{name}
> 
> mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
>-cp client/bitmaps/%{name}.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.xpm
>+cp -p client/bitmaps/gm_icon-serpent_and_gnu.{png,svg} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
> 
> mkdir -p -m 755  $RPM_BUILD_ROOT%{python_sitelib}/Gnumed/business
>-cp -r client/business $RPM_BUILD_ROOT%{python_sitelib}/Gnumed
>+cp -pr client/business $RPM_BUILD_ROOT%{python_sitelib}/Gnumed
> 
> mkdir -p -m 755 $RPM_BUILD_ROOT%{python_sitelib}/Gnumed/exporters
>-cp -r client/exporters $RPM_BUILD_ROOT%{python_sitelib}/Gnumed
>+cp -pr client/exporters $RPM_BUILD_ROOT%{python_sitelib}/Gnumed
> 
> mkdir -p -m 755 $RPM_BUILD_ROOT/%{python_sitelib}/Gnumed/wxGladeWidgets
> # Remove shebang
> sed -i "/\/usr\/bin\/env/d" client/wxGladeWidgets/*
>-cp -r client/wxGladeWidgets  $RPM_BUILD_ROOT%{python_sitelib}/Gnumed
>+cp -pr client/wxGladeWidgets  $RPM_BUILD_ROOT%{python_sitelib}/Gnumed
> 
> mkdir -p -m 755 $RPM_BUILD_ROOT/%{python_sitelib}/Gnumed/wxpython/gui
>-cp -r client/wxpython $RPM_BUILD_ROOT%{python_sitelib}/Gnumed
>-cp -r client/wxpython/gui $RPM_BUILD_ROOT%{python_sitelib}/Gnumed/wxpython
>+cp -pr client/wxpython $RPM_BUILD_ROOT%{python_sitelib}/Gnumed
>+cp -pr client/wxpython/gui $RPM_BUILD_ROOT%{python_sitelib}/Gnumed/wxpython
> 
> sed -i "/\/usr\/bin\/env/d" client/%{name}.py
>-cp -r client/%{name}.py $RPM_BUILD_ROOT%{python_sitelib}/Gnumed
>+cp -pr client/%{name}.py $RPM_BUILD_ROOT%{python_sitelib}/Gnumed
> 
> mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications/
> mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/
>@@ -127,10 +129,6 @@ mkdir -p $RPM_BUILD_ROOT%{python_sitelib}/Gnumed/pycommon
> cp -r client/pycommon $RPM_BUILD_ROOT%{python_sitelib}/Gnumed
> cp -r client/__init__.py $RPM_BUILD_ROOT%{python_sitelib}/Gnumed
> 
>-# Docs
>-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-client/user-manual
>-cp -r client/doc/user-manual/* $RPM_BUILD_ROOT%{_docdir}/%{name}-client/user-manual
>-
> # Man pages
> mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
> cp client/doc/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/
>@@ -147,7 +145,7 @@ EOF
> install -p -m 0755 gm_ctl_client -t $RPM_BUILD_ROOT/%{_bindir}/
> 
> %files -f %{name}.lang
>-%doc readme.GNUmed client/CHANGELOG client/GnuPublicLicense.txt GNUmedLicense.README
>+%doc readme.GNUmed client/LICENSE client/CHANGELOG client/GnuPublicLicense.txt
> %{_bindir}/%{name}
> %{_bindir}/gm-print_doc
> %{_bindir}/gm_ctl_client
>@@ -155,7 +153,7 @@ install -p -m 0755 gm_ctl_client -t $RPM_BUILD_ROOT/%{_bindir}/
> %dir %{_sysconfdir}/%{name}
> %config(noreplace) %{_sysconfdir}/%{name}/*
> %{_datadir}/%{name}/
>-%{_datadir}/pixmaps/gnumed.xpm
>+%{_datadir}/pixmaps/gm_icon-serpent_and_gnu.*
> %{_datadir}/icons/%{name}logo.png
> %{_datadir}/applications/%{name}-client.desktop
> %{python_sitelib}/Gnumed/
>@@ -163,10 +161,13 @@ install -p -m 0755 gm_ctl_client -t $RPM_BUILD_ROOT/%{_bindir}/
> %{_mandir}/man1/%{name}.1*
> %{_mandir}/man1/gm-print_doc.1*
> 
>-%files docs
>-%{_docdir}/%{name}-client/user-manual
>+%files doc
>+%doc client/doc/user-manual/*
> 
> %changelog
>+* Fri Jun  1 2012 Michel Salim <salimma@fedoraproject.org> - 1.1.14-1
>+- Update to 1.1.14
>+
> * Fri Jan 06 2012 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.9.9-5
> - spec bump for gcc 4.7 rebuild
> 
>diff --git a/sources b/sources
>index 94aa935..a4ed314 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-ec0abfd95dcf8b5cfbca5368dcfcc99d  gnumed-client.0.9.9.tgz
>+19dddcb1740b13a307daca7e019900ce  gnumed-client.1.1.14.tgz
>-- 
>1.7.10.2
>

Actions: View | Diff

Attachments on bug 827318: 588325