commit git-merge-changelog for openSUSE:Factory
Hello community,
here is the log from the commit of package git-merge-changelog for
openSUSE:Factory checked in at 2014-10-15 16:20:06
Comparing /work/SRC/openSUSE:Factory/git-merge-changelog (Old)
and /work/SRC/openSUSE:Factory/.git-merge-changelog.new (New)
Package is git-merge-changelog
Changes:
--- /work/SRC/openSUSE:Factory/git-merge-changelog/git-merge-changelog.changes
2013-04-08 14:44:13.0 +0200
+++
/work/SRC/openSUSE:Factory/.git-merge-changelog.new/git-merge-changelog.changes
2014-10-15 16:21:38.0 +0200
@@ -1,0 +2,6 @@
+Tue Oct 14 10:53:39 UTC 2014 - jeng...@inai.de
+
+- Use %_smp_mflags for parallel build, and remove ancient
+ specfile tags and sections
+
+---
Other differences:
--
++ git-merge-changelog.spec ++
--- /var/tmp/diff_new_pack.Z1vdMX/_old 2014-10-15 16:21:38.0 +0200
+++ /var/tmp/diff_new_pack.Z1vdMX/_new 2014-10-15 16:21:38.0 +0200
@@ -1,23 +1,33 @@
+#
# spec file for package git-merge-changelog
#
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2008 Ivan N. Zlatev cont...@i-nz.net
#
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An Open Source License is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: git-merge-changelog
Version:20120413
-Release:1
-License:GPL-3.0+
-URL:http://www.gnu.org/software/gnulib
-Group: Development/Tools/Version Control
+Release:0
+Url:http://www.gnu.org/software/gnulib
Source: %{name}-2008.tar.xz
Summary:Git merge driver for ChangeLog files
+License:GPL-3.0+
+Group: Development/Tools/Version Control
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
-AutoReqProv:yes
-BuildRequires: gcc xz
+BuildRequires: gcc
+BuildRequires: xz
%description
Git merge driver for ChangeLog files.
@@ -44,17 +54,16 @@
%setup -q -n %{name}-2008
%build
-%configure --prefix=%{_prefix}
-%__make %{?jobs:-j%{jobs}}
+%configure
+make %{?_smp_mflags}
%install
-%makeinstall
+%make_install
gzip -9 %{buildroot}%{_mandir}/man1/%{name}.1
-%clean
-%__rm -rf %{buildroot}
-
%files
%defattr(-,root,root)
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz
+
+%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit git-merge-changelog for openSUSE:Factory
Hello community,
here is the log from the commit of package git-merge-changelog for
openSUSE:Factory checked in at 2013-04-08 14:44:14
Comparing /work/SRC/openSUSE:Factory/git-merge-changelog (Old)
and /work/SRC/openSUSE:Factory/.git-merge-changelog.new (New)
Package is git-merge-changelog, Maintainer is
Changes:
New Changes file:
--- /dev/null 2013-04-05 00:01:41.916011506 +0200
+++
/work/SRC/openSUSE:Factory/.git-merge-changelog.new/git-merge-changelog.changes
2013-04-08 14:44:13.0 +0200
@@ -0,0 +1,13 @@
+---
+Fri Apr 5 13:01:26 CEST 2013 - p...@suse.de
+
+- Change license to GPL-3.0+ (bnc#757268)
+
+---
+Fri Apr 13 16:28:18 CEST 2012 - p...@suse.de
+
+- Initial package
+- Use current gnulib git snapshot.
+- Add COPYING.
+- Add gnulib url to .spec file
+- Add manpage generated via help2man
New:
git-merge-changelog-2008.tar.xz
git-merge-changelog.changes
git-merge-changelog.spec
Other differences:
--
++ git-merge-changelog.spec ++
# spec file for package git-merge-changelog
#
# Copyright (c) 2008 Ivan N. Zlatev cont...@i-nz.net
#
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
Name: git-merge-changelog
Version:20120413
Release:1
License:GPL-3.0+
URL:http://www.gnu.org/software/gnulib
Group: Development/Tools/Version Control
Source: %{name}-2008.tar.xz
Summary:Git merge driver for ChangeLog files
BuildRoot: %{_tmppath}/%{name}-%{version}-build
AutoReqProv:yes
BuildRequires: gcc xz
%description
Git merge driver for ChangeLog files.
1. It produces no conflict when ChangeLog entries have been inserted
at the top both in the public and in the private modification. It
puts the privately added entries above the publicly added entries.
2. It respects the structure of ChangeLog files: entries are not split
into lines but kept together.
3. It also handles the case of small modifications of past ChangeLog
entries, or of removed ChangeLog entries: they are merged as one
would expect it.
4. Conflicts are presented at the top of the file, rather than where
they occurred, so that the user will see them immediately. (Unlike
for source code written in some programming language, conflict markers
that are located several hundreds lines from the top will not cause
any syntax error and therefore would be likely to remain unnoticed.)
%if %suse_version = 1020
%define _prefix /opt/gnome
%define _sysconfdir /etc/opt/gnome
%endif
%prep
%setup -q -n %{name}-2008
%build
%configure --prefix=%{_prefix}
%__make %{?jobs:-j%{jobs}}
%install
%makeinstall
gzip -9 %{buildroot}%{_mandir}/man1/%{name}.1
%clean
%__rm -rf %{buildroot}
%files
%defattr(-,root,root)
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
