remove some cruft from the spec file

This commit is contained in:
Nils Philippsen 2016-10-25 17:56:25 +02:00
parent 54557cbc96
commit 5f5f38c591

View File

@ -108,9 +108,7 @@ License: GPLv3+ and GPLv3
%else %else
License: GPLv3+ License: GPLv3+
%endif %endif
Group: Applications/Multimedia
URL: http://www.gimp.org/ URL: http://www.gimp.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
%if %{with aalib} %if %{with aalib}
BuildRequires: aalib-devel BuildRequires: aalib-devel
%endif %endif
@ -220,7 +218,6 @@ with multi-level undo.
%package libs %package libs
Summary: GIMP libraries Summary: GIMP libraries
Group: System Environment/Libraries
License: LGPLv3+ License: LGPLv3+
%description libs %description libs
@ -229,7 +226,6 @@ Manipulation Program (GIMP).
%package devel %package devel
Summary: GIMP plugin and extension development kit Summary: GIMP plugin and extension development kit
Group: Development/Libraries
License: LGPLv3+ License: LGPLv3+
Requires: gimp-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: gimp-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: gimp-devel-tools = %{?epoch:%{epoch}:}%{version}-%{release} Requires: gimp-devel-tools = %{?epoch:%{epoch}:}%{version}-%{release}
@ -245,7 +241,6 @@ extensions.
%package devel-tools %package devel-tools
Summary: GIMP plugin and extension development tools Summary: GIMP plugin and extension development tools
Group: Development/Tools
License: LGPLv3+ License: LGPLv3+
Requires: gimp-devel = %{?epoch:%{epoch}:}%{version}-%{release} Requires: gimp-devel = %{?epoch:%{epoch}:}%{version}-%{release}
@ -256,7 +251,6 @@ Image Manipulation Program (GIMP) plug-ins and extensions.
%if %{with helpbrowser} %if %{with helpbrowser}
%package help-browser %package help-browser
Summary: GIMP help browser plug-in Summary: GIMP help browser plug-in
Group: Applications/Multimedia
License: GPLv3+ License: GPLv3+
Requires: gimp%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: gimp%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
@ -416,7 +410,6 @@ cat << EOF > macros.gimp
EOF EOF
%install %install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install make DESTDIR=%{buildroot} install
install -D -m0644 macros.gimp %{buildroot}%{_rpmconfigdir}/macros.d/macros.gimp install -D -m0644 macros.gimp %{buildroot}%{_rpmconfigdir}/macros.d/macros.gimp
@ -439,8 +432,7 @@ find %buildroot -name \*.la -exec %__rm -f {} \;
# #
# Plugins and modules change often (grab the executeable ones) # Plugins and modules change often (grab the executeable ones)
# #
echo "%defattr (-, root, root)" > gimp-plugin-files find %{buildroot}%{_libdir}/gimp/%{lib_api_version} -type f | sed "s@^%{buildroot}@@g" | grep -v '\.a$' > gimp-plugin-files
find %{buildroot}%{_libdir}/gimp/%{lib_api_version} -type f | sed "s@^%{buildroot}@@g" | grep -v '\.a$' >> gimp-plugin-files
# .pyc and .pyo files don't exist yet # .pyc and .pyo files don't exist yet
grep "\.py$" gimp-plugin-files > gimp-plugin-files-py grep "\.py$" gimp-plugin-files > gimp-plugin-files-py
@ -451,8 +443,7 @@ for file in $(cat gimp-plugin-files-py); do
done >> gimp-plugin-files done >> gimp-plugin-files
%if %{with static} %if %{with static}
echo "%defattr (-, root, root)" > gimp-static-files find %{buildroot}%{_libdir}/gimp/%{lib_api_version} -type f | sed "s@^%{buildroot}@@g" | grep '\.a$' > gimp-static-files
find %{buildroot}%{_libdir}/gimp/%{lib_api_version} -type f | sed "s@^%{buildroot}@@g" | grep '\.a$' >> gimp-static-files
%endif %endif
# #
@ -509,9 +500,6 @@ popd
%endif %endif
make check make check
%clean
rm -rf %{buildroot}
%post %post
update-desktop-database &> /dev/null || : update-desktop-database &> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@ -530,7 +518,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%postun libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig
%files -f gimp.files %files -f gimp.files
%defattr(-, root, root, 0755)
%license COPYING %license COPYING
%doc AUTHORS ChangeLog NEWS README %doc AUTHORS ChangeLog NEWS README
%doc docs/*.xcf* %doc docs/*.xcf*
@ -597,7 +584,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/icons/hicolor/*/apps/gimp.png %{_datadir}/icons/hicolor/*/apps/gimp.png
%files libs %files libs
%defattr(-, root, root, 0755)
%license COPYING %license COPYING
%doc AUTHORS ChangeLog NEWS README %doc AUTHORS ChangeLog NEWS README
%{_libdir}/libgimp-%{lib_api_version}.so.%{interface_age}.%{lib_minor}.%{lib_micro} %{_libdir}/libgimp-%{lib_api_version}.so.%{interface_age}.%{lib_minor}.%{lib_micro}
@ -624,7 +610,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%else %else
%files devel %files devel
%endif %endif
%defattr (-, root, root, 0755)
%doc HACKING README.i18n %doc HACKING README.i18n
%doc %{_datadir}/gtk-doc %doc %{_datadir}/gtk-doc
@ -642,7 +627,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_rpmconfigdir}/macros.d/macros.gimp %{_rpmconfigdir}/macros.d/macros.gimp
%files devel-tools %files devel-tools
%defattr (-, root, root, 0755)
%{_bindir}/gimptool-%{lib_api_version} %{_bindir}/gimptool-%{lib_api_version}
%{_mandir}/man1/gimptool-%{lib_api_version}.1* %{_mandir}/man1/gimptool-%{lib_api_version}.1*
@ -653,7 +637,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%if %{with helpbrowser} %if %{with helpbrowser}
%files help-browser %files help-browser
%defattr (-, root, root, 0755)
%{_libdir}/gimp/%{lib_api_version}/plug-ins/help-browser %{_libdir}/gimp/%{lib_api_version}/plug-ins/help-browser
%endif %endif
@ -661,6 +644,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
* Tue Oct 25 2016 Nils Philippsen <nils@redhat.com> * Tue Oct 25 2016 Nils Philippsen <nils@redhat.com>
- build without help-browser from Fedora 26 on (#1375809) - build without help-browser from Fedora 26 on (#1375809)
- use %%license for license text - use %%license for license text
- remove some cruft from the spec file
* Sat Jul 16 2016 Nils Philippsen <nils@redhat.com> - 2:2.8.18-1 * Sat Jul 16 2016 Nils Philippsen <nils@redhat.com> - 2:2.8.18-1
- version 2.8.18 - version 2.8.18