diff --git a/.gitignore b/.gitignore index ac0a996..a84691c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,5 @@ -/xcalc-*.tar.* +xcalc-1.0.3.tar.bz2 +/xcalc-1.0.5.tar.bz2 +/xcalc-1.0.6.tar.bz2 +/xcalc-1.1.0.tar.bz2 +/xcalc-1.1.1.tar.xz diff --git a/.packit.yaml b/.packit.yaml deleted file mode 100644 index 0dab650..0000000 --- a/.packit.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# See the documentation for more information: -# https://packit.dev/docs/configuration/ - -specfile_path: xcalc.spec - -copy_upstream_release_description: false - -jobs: - - job: pull_from_upstream - trigger: release - dist_git_branches: - - fedora-rawhide - - - job: koji_build - trigger: commit - allowed_committers: ['packit','all_admins'] - dist_git_branches: - - fedora-rawhide - diff --git a/changelog b/changelog deleted file mode 100644 index 5cacaff..0000000 --- a/changelog +++ /dev/null @@ -1,97 +0,0 @@ -* Sat Jan 21 2023 Fedora Release Engineering - 1.1.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.1.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sun Apr 17 2022 Steve Traylen - 1.1.1-1 -- New upstream 1.1.1 - -* Sat Jan 22 2022 Fedora Release Engineering - 1.1.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.1.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 1.1.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Sep 02 2020 Peter Hutterer 1.1.0-4 -- Reduce the BuildRequires to the set actually needed -- update the rest of the spec a bit, drop RHEL5 conditional - -* Wed Jul 29 2020 Fedora Release Engineering - 1.1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 1.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Nov 7 2019 Steve Traylen - 1.1.0-1 -- New upstream 1.1.0 - -* Sat Jul 27 2019 Fedora Release Engineering - 1.0.6-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 1.0.6-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 1.0.6-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 1.0.6-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 1.0.6-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.0.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.0.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 1.0.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 1.0.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Mar 23 2015 Steve Traylen - 1.0.6-1 -- New upstream 1.0.6 - -* Mon Aug 18 2014 Fedora Release Engineering - 1.0.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Mon Jul 21 2014 Steve Traylen - 1.0.5-1 -- New upstream 1.0.5 - -* Sun Jun 08 2014 Fedora Release Engineering - 1.0.3-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 1.0.3-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 1.0.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 1.0.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 1.0.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 1.0.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sat Apr 3 2010 Steve Traylen - 1.0.3-5 -- Forgot to add xcalc.desktop to CVS. -* Sat Apr 3 2010 Steve Traylen - 1.0.3-4 -- Bump release for first official Fedora release. -* Sun Mar 21 2010 Steve Traylen - 1.0.3-3 -- Use desktop-validate rather than desktop-install. -- Install more with -p. -* Sun Mar 21 2010 Steve Traylen - 1.0.3-2 -- Cosmetic line removal. -* Fri Mar 19 2010 Steve Traylen - 1.0.3-1 -- Initial spec for fedora extras - diff --git a/sources b/sources index f951f4c..4178d97 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xcalc-1.1.3.tar.xz) = 26236f5d6bd37df424e2f61b00362f4cd31a55b1decf03d98053765466af1393c762ae4127fd29256d635e28c10d7713ad12c5feb72c02272144b94453115afd +SHA512 (xcalc-1.1.1.tar.xz) = a261e9798d62727f40b9aff07e68e63ba40aa7f4f9b1811d8efd8c3e73cd5912d6178c55ca3c059968191051bd20b889b06b5e92b3df70c7b5d09bd013b9ebdb diff --git a/xcalc.spec b/xcalc.spec index f27809d..c8f2cb2 100644 --- a/xcalc.spec +++ b/xcalc.spec @@ -1,51 +1,46 @@ Name: xcalc -Version: 1.1.3 -Release: %autorelease +Version: 1.1.1 +Release: 2%{?dist} Summary: Scientific Calculator X11 Client License: MIT -URL: https://xorg.freedesktop.org -Source0: https://xorg.freedesktop.org/releases/individual/app/xcalc-%{version}.tar.xz +URL: http://xorg.freedesktop.org +Source0: http://xorg.freedesktop.org/releases/individual/app/xcalc-%{version}.tar.xz Source1: xcalc.desktop -BuildRequires: desktop-file-utils -BuildRequires: gcc -BuildRequires: libX11-devel -BuildRequires: libXaw-devel -BuildRequires: libXext-devel -BuildRequires: libXmu-devel -BuildRequires: libXpm-devel -BuildRequires: libXt-devel -BuildRequires: make +BuildRequires: gcc make BuildRequires: xorg-x11-proto-devel +BuildRequires: libXaw-devel +BuildRequires: desktop-file-utils BuildRequires: xorg-x11-util-macros +BuildRequires: libX11-devel +BuildRequires: libXmu-devel +BuildRequires: libXext-devel +BuildRequires: libXt-devel +BuildRequires: libXpm-devel -Requires: xorg-x11-fonts-100dpi -Requires: xorg-x11-fonts-75dpi -Requires: xorg-x11-fonts-misc Requires: xorg-x11-xbitmaps +Requires: xorg-x11-fonts-75dpi +Requires: xorg-x11-fonts-100dpi %description xcalc is a scientific calculator X11 client. %prep -%autosetup +%setup -q cp -p %{SOURCE1} . %build %configure -%make_build +make V=1 %{?_smp_mflags} %install %make_install -install -d %{buildroot}%{_datadir}/applications -install -p -m 644 xcalc.desktop %{buildroot}%{_datadir}/applications -desktop-file-validate %{buildroot}%{_datadir}/applications/xcalc.desktop - -%check -%make_build check +install -d ${RPM_BUILD_ROOT}%{_datadir}/applications +install -p -m 644 xcalc.desktop ${RPM_BUILD_ROOT}%{_datadir}/applications +desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/xcalc.desktop %files %{_bindir}/xcalc @@ -56,4 +51,97 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/xcalc.desktop %doc ChangeLog README.md %changelog -%autochangelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sun Apr 17 2022 Steve Traylen - 1.1.1-1 +- New upstream 1.1.1 + +* Sat Jan 22 2022 Fedora Release Engineering - 1.1.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 1.1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Sep 02 2020 Peter Hutterer 1.1.0-4 +- Reduce the BuildRequires to the set actually needed +- update the rest of the spec a bit, drop RHEL5 conditional + +* Wed Jul 29 2020 Fedora Release Engineering - 1.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 1.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Nov 7 2019 Steve Traylen - 1.1.0-1 +- New upstream 1.1.0 + +* Sat Jul 27 2019 Fedora Release Engineering - 1.0.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 1.0.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 1.0.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 1.0.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 1.0.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.0.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.0.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 1.0.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 1.0.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Mar 23 2015 Steve Traylen - 1.0.6-1 +- New upstream 1.0.6 + +* Mon Aug 18 2014 Fedora Release Engineering - 1.0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Mon Jul 21 2014 Steve Traylen - 1.0.5-1 +- New upstream 1.0.5 + +* Sun Jun 08 2014 Fedora Release Engineering - 1.0.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 1.0.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 15 2013 Fedora Release Engineering - 1.0.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering - 1.0.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 1.0.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Feb 07 2011 Fedora Release Engineering - 1.0.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Apr 3 2010 Steve Traylen - 1.0.3-5 +- Forgot to add xcalc.desktop to CVS. +* Sat Apr 3 2010 Steve Traylen - 1.0.3-4 +- Bump release for first official Fedora release. +* Sun Mar 21 2010 Steve Traylen - 1.0.3-3 +- Use desktop-validate rather than desktop-install. +- Install more with -p. +* Sun Mar 21 2010 Steve Traylen - 1.0.3-2 +- Cosmetic line removal. +* Fri Mar 19 2010 Steve Traylen - 1.0.3-1 +- Initial spec for fedora extras +