Compare commits

...

No commits in common. "c8s" and "c9-beta" have entirely different histories.
c8s ... c9-beta

21 changed files with 65 additions and 19 deletions

6
.gitignore vendored
View File

@ -1,3 +1,3 @@
/xsane-0.999-7-autoconf.patch.bz2
/xsane-0.999.tar.gz
/xsane-256x256.png
SOURCES/xsane-0.999-7-autoconf.patch.bz2
SOURCES/xsane-0.999.tar.gz
SOURCES/xsane-256x256.png

3
.xsane.metadata Normal file
View File

@ -0,0 +1,3 @@
8984dbb732b8b0f98d9bd50fdb16d3510d7d2eef SOURCES/xsane-0.999-7-autoconf.patch.bz2
633150e4e690c1e8c18d6b82886c2fb4daba4bc9 SOURCES/xsane-0.999.tar.gz
ab0517cb7fa9a7fc30499f56f7e9aac628d9bc40 SOURCES/xsane-256x256.png

View File

@ -10,7 +10,7 @@
Name: xsane
Summary: X Window System front-end for the SANE scanner interface
Version: 0.999
Release: 30%{?dist}
Release: 42%{?dist}
Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
Source1: xsane-256x256.png
# use "xdg-open" instead of "netscape" to launch help browser
@ -74,7 +74,12 @@ URL: http://www.xsane.org/
# gcc is no longer in buildroot by default
BuildRequires: gcc
# uses make
BuildRequires: make
%if 0%{?rhel} <= 8 || 0%{?fedora}
BuildRequires: gimp-devel
%endif
BuildRequires: gtk2-devel
BuildRequires: lcms2-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
@ -91,6 +96,7 @@ library, which provides access to scanners, digital cameras, and other
capture devices. XSane is written in GTK+ and provides control for
performing the scan and then manipulating the captured image.
%if 0%{?rhel} <= 8 || 0%{?fedora}
%package gimp
Summary: GIMP plug-in providing the SANE scanner interface
Requires: gimp >= 2:2.2.12-4
@ -100,6 +106,7 @@ Requires: xsane-common
This package provides the regular XSane frontend for the SANE scanner
interface, but it works as a GIMP plug-in. You must have GIMP
installed to use this package.
%endif
%package common
Summary: Common files for xsane packages
@ -146,10 +153,12 @@ mkdir build-without-gimp
CFLAGS='%optflags -fno-strict-aliasing -DXSANE_BUGTRACKER_URL=\"%{bugtracker_url}\"'
export CFLAGS
%if 0%{?rhel} <= 8 || 0%{?fedora}
pushd build-with-gimp
%configure --enable-gimp
make %{?_smp_mflags}
%make_build
popd
%endif
pushd build-without-gimp
%configure --disable-gimp
@ -161,12 +170,14 @@ cp %{SOURCE1} src/
%install
pushd build-without-gimp
make DESTDIR=%{buildroot} install
%make_install
popd
%if 0%{?rhel} <= 8 || 0%{?fedora}
# install GIMP plugin
install -m 0755 -d %{buildroot}%{gimpplugindir}
install -m 0755 build-with-gimp/src/xsane %{buildroot}%{gimpplugindir}
%endif
# install customized desktop file
rm %{buildroot}%{_datadir}/applications/xsane.desktop
@ -219,11 +230,13 @@ EOF
%find_lang %{name} XSANE.lang
%if 0%{?rhel} <= 8 || 0%{?fedora}
%pre gimp
# remove obsolete gimp-plugin-mgr managed symlink
if [ -L "%{gimpplugindir}/xsane" ]; then
rm -f "%{gimpplugindir}/xsane"
fi
%endif
%files -f XSANE.lang
%doc xsane.ACCELKEYS xsane.AUTHOR xsane.BEGINNERS-INFO xsane.BUGS xsane.CHANGES xsane.FAQ xsane.LANGUAGES xsane.LOGO xsane.NEWS xsane.ONLINEHELP xsane.PROBLEMS xsane.ROOT xsane.TODO
@ -240,8 +253,10 @@ fi
%{_datadir}/pixmaps/xsane.xpm
%{iconrootdir}/*/apps/%{name}.png
%if 0%{?rhel} <= 8 || 0%{?fedora}
%files gimp
%{gimpplugindir}/xsane
%endif
%files common
%doc xsane.AUTHOR
@ -250,12 +265,50 @@ fi
%{_datadir}/sane/xsane
%changelog
* Thu Aug 16 2018 Josef Ridky <jridky@redhat.com> - 0.999-30
- rebuild for new GIMP module
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.999-42
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Tue Jul 24 2018 Zdenek Dohnal <zdohnal@redhat.com> - 0.999-29
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.999-41
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.999-40
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Thu Jan 14 2021 Zdenek Dohnal <zdohnal@redhat.com> - 0.999-39
- remove gimp plugin for eln, put explicit requirement for GTK2
* Thu Nov 05 2020 Zdenek Dohnal <zdohnal@redhat.com> - 0.999-38
- make is no longer in buildroot by default
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.999-37
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 0.999-36
- Use make macros
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.999-35
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.999-34
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Tue Apr 09 2019 Zdenek Dohnal <zdohnal@redhat.com> - 0.999-33
- rebuilt again (because bodhi cannot remove builds from even unpushed updates)
* Mon Apr 08 2019 Zdenek Dohnal <zdohnal@redhat.com> - 0.999-32
- rebuilt for gimp-2.10.10
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.999-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Jul 24 2018 Zdenek Dohnal <zdohnal@redhat.com> - 0.999-30
- correcting license
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.999-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon Apr 09 2018 Zdenek Dohnal <zdohnal@redhat.com> - 0.999-28
- remove dependency on ImageMagick and netpbm-progs, because they were needed for
tests during %%build phase, which were removed in commit SHA 0595c15da29

View File

@ -1,7 +0,0 @@
--- !Policy
product_versions:
- rhel-8
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}

View File

@ -1,3 +0,0 @@
SHA512 (xsane-0.999-7-autoconf.patch.bz2) = e24a81661921e6c003204bf54c62e00df3fc326bd79910cc752aaa69fcc6580991fa1c449a6b4158fc826489b470086ad0cdcf22a6c032a5a0217daf24683741
SHA512 (xsane-0.999.tar.gz) = 73ec961fce1a86b5d6f5bac0995d222785eb4b077dc8e72492b092d2bf4500455426e80e4d27233721cd38ec84f77fb9f92190a6afe45bdaf7ffd1ee50b431ed
SHA512 (xsane-256x256.png) = 7bd63a701a4776b395689799ad98b7619917a9b40367c980bebaa116e6c5c2bfeffb8b996a8295b07f3483aa689c9040d8a68bb21376af65b1c0e8f69294f2e5