Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' into 'master'
[gnome-common] Upgrade to 3.14.0. Fixes JB#35382

Depends on: https://git.merproject.org/mer-core/automake/merge_requests/2

Fixes build also for libsoup and pygobject2.

See merge request !1
  • Loading branch information
Igor Zhbanov committed Aug 4, 2016
2 parents 5d0e62b + 549af52 commit 1da0d89
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion gnome-common
Submodule gnome-common updated from a4af25 to 5d61b5
8 changes: 3 additions & 5 deletions rpm/gnome-common.spec
@@ -1,11 +1,11 @@
Name: gnome-common
Version: 3.6.0
Version: 3.14.0
Release: 1
Summary: Useful things common to building gnome packages from scratch

Group: Development/Tools
BuildArch: noarch
License: GPLv3
License: GPLv2
URL: http://developer.gnome.org
Source0: http://download.gnome.org/sources/%{name}/3.6/%{name}-%{version}.tar.xz

Expand Down Expand Up @@ -33,14 +33,12 @@ a GNOME application.
%autogen
make %{?_smp_mflags}
cp doc-build/README doc-README
# No sense making a doc subdir in the rpm pkg for one file.
cp doc/usage.txt usage.txt

%install
make install DESTDIR=$RPM_BUILD_ROOT

%files
%doc doc-README README usage.txt
%doc doc-README README
%{_bindir}/*
%{_datadir}/aclocal/*
%{_datadir}/%{name}
Expand Down

0 comments on commit 1da0d89

Please sign in to comment.