Skip to content

Commit

Permalink
Fix license in .spec.
Browse files Browse the repository at this point in the history
[packaging] Match license in .spec with code. Contributes to JB#33684

Also dropped old packaging that is no longer used.

Signed-off-by: Marko Saukko <marko.saukko@jolla.com>
  • Loading branch information
saukko committed Dec 15, 2015
1 parent cf8dc2b commit 1695b3c
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 259 deletions.
36 changes: 3 additions & 33 deletions rpm/libmlocale-qt5.spec
@@ -1,21 +1,11 @@
#
# Do NOT Edit the Auto-generated Part!
# Generated by: spectacle version 0.27
#

Name: libmlocale-qt5

# >> macros
# << macros

Summary: Contains classes MLocale and friends originally from libmeegotouch
Version: 0.5.0
Release: 1
Group: System/Libraries
License: LGPLv2
URL: https://meego.gitorious.org/meegotouch/libmlocale
License: LGPLv2.1
URL: https://git.merproject.org/mer-core/libmlocale
Source0: %{name}-%{version}.tar.bz2
Source100: libmlocale-qt5.yaml
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
BuildRequires: pkgconfig(icu-uc)
Expand Down Expand Up @@ -59,30 +49,17 @@ Requires: %{name} = %{version}-%{release}
%prep
%setup -q -n %{name}-%{version}

# >> setup
# << setup

%build
# >> build pre
export QT_SELECT=5
# << build pre

%configure --disable-static
make %{?_smp_mflags}

# >> build post
# << build post

%install
rm -rf %{buildroot}
# >> install pre
export QT_SELECT=5
# << install pre
%make_install

# >> install post
# << install post

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig
Expand All @@ -93,8 +70,6 @@ export QT_SELECT=5
%{_libdir}/*.so.*
%dir %{_datadir}/mlocale5
%{_datadir}/mlocale5/icu
# >> files
# << files

%files devel
%defattr(-,root,root,-)
Expand All @@ -104,21 +79,16 @@ export QT_SELECT=5
%{_includedir}/mlocale5/*.h
%{_includedir}/mlocale5/M*
%{_libdir}/pkgconfig/*.pc
# >> files devel
# << files devel

%files tests
%defattr(-,root,root,-)
%{_libdir}/libmlocale-tests5
%dir %{_datadir}/libmlocale-tests5
%{_datadir}/libmlocale-tests5/tests.xml
# >> files tests
# << files tests

%files benchmarks
%defattr(-,root,root,-)
%{_libdir}/libmlocale-benchmarks5
%dir %{_datadir}/libmlocale-benchmarks5
%{_datadir}/libmlocale-benchmarks5/tests.xml
# >> files benchmarks
# << files benchmarks

58 changes: 0 additions & 58 deletions rpm/libmlocale-qt5.yaml

This file was deleted.

117 changes: 0 additions & 117 deletions rpm/libmlocale.spec

This file was deleted.

51 changes: 0 additions & 51 deletions rpm/libmlocale.yaml

This file was deleted.

0 comments on commit 1695b3c

Please sign in to comment.