Hello community, here is the log from the commit of package barcode for openSUSE:Factory checked in at 2014-11-26 10:33:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/barcode (Old) and /work/SRC/openSUSE:Factory/.barcode.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "barcode" Changes: -------- --- /work/SRC/openSUSE:Factory/barcode/barcode.changes 2014-01-23 15:40:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.barcode.new/barcode.changes 2014-11-26 10:33:27.000000000 +0100 @@ -1,0 +2,9 @@ +Fri Nov 21 02:48:54 UTC 2014 - malcolmlewis@opensuse.org + +- Reintroduce devel package, header file needed for development of + other packages, eg glabels. +- Add barcode-fix-renamed-include.patch: Fix renamed gettext + include header reference. +- Spec and changes file tidy up. + +------------------------------------------------------------------- @@ -4 +13 @@ -- Update to version 0.99 +- Update to version 0.99: @@ -9,13 +18,14 @@ -- Removed patchs fixed by upstream - + barcode-0.98.patch - + barcode-0.98-bookland.patch - + barcode-0.98-gcc_warning.patch - + barcode-0.98-memoryleak.patch - + barcode-0.98-nohtmltoinfo.patch -- Adapt barcode-0.98-info.patch patch to upstream changes -- Change license tag to GPL-3.0+ because of license change by upstream -- Use %configure instead of pass options "by-hand" -- Remove devel subpackage; it was already useless and upstream doesn't - provide development files anymore -- info file has to be provided with linked binary -- Upstream doesn't provide any manpage anymore +- Removed patchs fixed by upstream: + + barcode-0.98.patch. + + barcode-0.98-bookland.patch. + + barcode-0.98-gcc_warning.patch. + + barcode-0.98-memoryleak.patch. + + barcode-0.98-nohtmltoinfo.patch. +- Adapt barcode-0.98-info.patch patch to upstream changes. +- Change license tag to GPL-3.0+ because of license change by + upstream. +- Use %configure instead of pass options "by-hand". +- Remove devel subpackage; it was already useless and upstream + doesn't provide development files anymore. +- info file has to be provided with linked binary. +- Upstream doesn't provide any manpage anymore. @@ -26 +36 @@ -- Build requires texinfo as well as makeinfo +- Build requires texinfo as well as makeinfo. @@ -31 +41 @@ -- Make it build with latest TeXLive 2012 with new package layout +- Make it build with latest TeXLive 2012 with new package layout. @@ -36 +46 @@ -- use original tar and apply previous patch +- use original tar and apply previous patch. @@ -41 +51 @@ -- memory leak fixed (bnc#546020) +- memory leak fixed (bnc#546020). @@ -46 +56 @@ -- added leak-fix.patch (bnc#537525) +- added leak-fix.patch (bnc#537525). @@ -57,2 +67,2 @@ -- fixed executable perm of info page -- not removing RPM_BUILD_ROOT in %install section +- fixed executable perm of info page. +- not removing RPM_BUILD_ROOT in %install section. @@ -65 +75 @@ - (*nohtmltoinfo.patch) + (*nohtmltoinfo.patch). @@ -81 +91 @@ -- converted neededforbuild to BuildRequires +- converted neededforbuild to BuildRequires. @@ -86 +96 @@ -- fixed gcc warning +- fixed gcc warning. @@ -96 +106 @@ -- build as user +- build as user. @@ -101,3 +111,3 @@ -- updated sources to 0.98 -- install bookland.py script -- correctly install info pages +- updated sources to 0.98. +- install bookland.py script. +- correctly install info pages. @@ -108,2 +118,2 @@ -- used macro %{_libdir} to fix for lib64 -- cleaned up spec file +- used macro %{_libdir} to fix for lib64. +- cleaned up spec file. @@ -114 +124 @@ -- update to version 0.97 +- update to version 0.97. @@ -119,2 +129,2 @@ -- initial package version 0.96 -- fixed paths in Makefile.in, added DESTDIR +- initial package version 0.96. +- fixed paths in Makefile.in, added DESTDIR. New: ---- barcode-fix-renamed-include.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ barcode.spec ++++++ --- /var/tmp/diff_new_pack.Msie0I/_old 2014-11-26 10:33:28.000000000 +0100 +++ /var/tmp/diff_new_pack.Msie0I/_new 2014-11-26 10:33:28.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package barcode # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,6 +17,19 @@ Name: barcode +Version: 0.99 +Release: 0 +Summary: Text-Mode Barcode Creation Utility +License: GPL-3.0+ +Group: Productivity/Graphics/Other +Url: http://www.gnu.org/software/barcode +Source: ftp://ftp.gnu.org/pub/gnu/%{name}/%{name}-%{version}.tar.xz +# PATCH-FIX-OPENSUSE barcode-0.99-info.patch +Patch2: %{name}-0.99-info.patch +# PATCH-FIX-UPSTREAM barcode-0.98-leak-fix.patch bnc#537525 -- Fix memory leak by adding call to free. +Patch5: %{name}-0.98-leak-fix.patch +# PATCH-FIX-UPSTREAM barcode-fix-renamed-include.patch malcolmlewis@opensuse.org -- Fix renamed gettext include header reference. +Patch6: barcode-fix-renamed-include.patch %if %suse_version <= 1220 BuildRequires: texlive %else @@ -28,16 +41,6 @@ %endif BuildRequires: xz Requires(pre): %install_info_prereq -Version: 0.99 -Release: 0 -Summary: Text-Mode Barcode Creation Utility -License: GPL-3.0+ -Group: Productivity/Graphics/Other -Url: http://www.gnu.org/software/barcode/barcode.html -Source: ftp://ftp.gnu.org/pub/gnu/%{name}/%{name}-%{version}.tar.xz -Patch2: %{name}-0.99-info.patch -# PATCH-FIX-UPSTREAM fix mem leak (bnc#537525) -Patch5: %{name}-0.98-leak-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -47,10 +50,22 @@ as a few other formats. Output is generated in either PostScript or Encapsulated PostScript format. +%package devel +Summary: Text-Mode Barcode Creation Utility - Development files +Group: Development/Libraries + +%description devel +GNU Barcode is meant to meet most barcode creation needs with a +conventional printer. It can create printouts for the conventional +product tagging standards: UPC-A, UPC-E, EAN-13, EAN-8, ISBN, as well +as a few other formats. Output is generated in either PostScript or +Encapsulated PostScript format. + %prep -%setup +%setup -q %patch2 %patch5 +%patch6 -p1 %build %configure @@ -58,6 +73,8 @@ %install make DESTDIR=%{buildroot} install +install -Dm0644 barcode.h %{buildroot}%{_includedir}/barcode.h +install -Dm0644 .libs/libbarcode.a %{buildroot}%{_libdir}/libbarcode.a %post %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz @@ -66,10 +83,15 @@ %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %files -%defattr(-, root, root) +%defattr(-,root,root) %doc COPYING README TODO %{_bindir}/barcode %{_bindir}/sample %{_infodir}/%{name}.info.gz +%files devel +%defattr(-,root,root) +%{_includedir}/barcode.h +%{_libdir}/libbarcode.a + %changelog ++++++ barcode-fix-renamed-include.patch ++++++

From aefc0d09f48dc85202cbf24fac4fd40c5908f1e6 Mon Sep 17 00:00:00 2001 From: Malcolm <malcolmlewis@opensuse.org> Date: Thu, 20 Nov 2014 20:13:37 -0600 Subject: [PATCH][BUILD] Fix renamed gettext include header reference

Signed-off-by: Malcolm <malcolmlewis@opensuse.org> --- barcode.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/barcode.h b/barcode.h index ed90e0c..ff8574d 100644 --- a/barcode.h +++ b/barcode.h @@ -26,7 +26,7 @@ #include "config.h" #include <stdio.h> -#include <gettext.h> +#include <gettext-po.h> #define _(X) gettext (X) #define _N(X) (X) -- 1.8.5.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org