Changeset 815 for spec/trunk/SPECS/gettext.spec

Timestamp:

Jun 29, 2016, 6:10:46 PM (9 years ago)

Author:

Yuri Dario

Message:

spec: gettext updated to version 0.19.8.1, build fixes.

File:

• spec/trunk/SPECS/gettext.spec (modified) (2 diffs)

spec/trunk/SPECS/gettext.spec

@@ -144 +144 @@
 %setup -q
 %else
+<<<<<<< .mine
+%setup -n "%{name}-%{version}" -Tc -a 1
+=======
 %setup -n "%{name}-%{version}" -Tc
+>>>>>>> .r814
 svn export %{?svn_rev:-r %{svn_rev}} %{svn_url} . --force
 rm -f "%{_sourcedir}/%{name}-%{version}%{?svn_rev:-r%{svn_rev}}.zip"
@@ -375 +379 @@
 
 %changelog
-* Mon Jun 27 2016 yd <silvan.scherrer@aroa.ch> 0.19.8.1-1
+* Mon Jun 27 2016 Silvan Scherrer <silvan.scherrer@aroa.ch> 0.19.8.1-1
 - updated to version 0.19.8.1