diff --git a/.gitignore b/.gitignore index b6020cd..78ce908 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ -/xschem-*.tar.gz +/xschem-2.8.2.tar.gz +/xschem-2.9.0.tar.gz +/xschem-2.9.2.tar.gz diff --git a/.packit.yaml b/.packit.yaml deleted file mode 100644 index 21cb72a..0000000 --- a/.packit.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# See the documentation for more information: -# https://packit.dev/docs/configuration/ - -specfile_path: xschem.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 e1c9d79..0000000 --- a/changelog +++ /dev/null @@ -1,62 +0,0 @@ -* Sat Jan 17 2026 Fedora Release Engineering - 3.1.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 3.1.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 3.1.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 3.1.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 3.1.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 3.1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 3.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Tue Aug 02 2022 Alain Vigne 3.1.0-1 -- Bump to upstream version 3.1.0 - -* Sat Jul 23 2022 Fedora Release Engineering - 2.9.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 2.9.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 2.9.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jan 28 2021 Fedora Release Engineering - 2.9.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 2.9.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 2.9.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 2.9.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Jul 21 2019 Alain - 2.9.2-1 -- Upstream new release - -* Sun Jul 14 2019 Alain - 2.9.0-1 -- Upstream new release - -* Sun Feb 17 2019 Alain - 2.8.2-2 -- apply suggestions from package reviewers - -* Sun Jan 27 2019 Alain - 2.8.2-1 -- Upstream new release - -* Sun Dec 02 2018 Alain - 2.8.1-1 -- Upstream new release - -* Tue Nov 06 2018 Alain - 2.8.0-1 -- Initial proposal diff --git a/sources b/sources index 5946973..ec898a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xschem-3.4.7.tar.gz) = 1f2cbc0b703c0101f2db62ad1bae32623699e3ae0c48f619b1c91ecae84161fabf28a0b1d744368e4b705bbde71933653e2ddb3cf378c2224aa00a1dc4f0ee84 +SHA512 (xschem-2.9.2.tar.gz) = f722b6ba6496d99598ef26846997ab6a5e175c713eda34d6cf11914aa094c132b86da7bcdc8315b97f372907f310f9592ca3ad21d3a95efaf7036fb4745561ce diff --git a/xschem-cairo-jpg-32bit.patch b/xschem-cairo-jpg-32bit.patch deleted file mode 100644 index fae509d..0000000 --- a/xschem-cairo-jpg-32bit.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/src/cairo_jpg.c -+++ b/src/cairo_jpg.c -@@ -153,6 +153,7 @@ - JSAMPROW row_pointer[1]; - cairo_surface_t *other = NULL; - cairo_t *ctx; -+ unsigned long outsize = 0; - - /* check valid input format (must be IMAGE_SURFACE && (ARGB32 || RGB24)) */ - if (cairo_surface_get_type(sfc) != CAIRO_SURFACE_TYPE_IMAGE || -@@ -188,7 +189,7 @@ - jpeg_create_compress(&cinfo); - - /* set compression parameters */ -- jpeg_mem_dest(&cinfo, data, len); -+ jpeg_mem_dest(&cinfo, data, &outsize); - cinfo.image_width = cairo_image_surface_get_width(sfc); - cinfo.image_height = cairo_image_surface_get_height(sfc); - #ifdef LIBJPEG_TURBO_VERSION -@@ -230,6 +231,8 @@ - jpeg_finish_compress(&cinfo); - jpeg_destroy_compress(&cinfo); - -+ *len = outsize; -+ - /* destroy temporary image surface (if available) */ - if (other != NULL) - cairo_surface_destroy(sfc); diff --git a/xschem.spec b/xschem.spec index c9fc1cc..21935be 100644 --- a/xschem.spec +++ b/xschem.spec @@ -1,26 +1,34 @@ +# xschem Package description for Fedora/Free Electronic Lab +# +%global rpm_has_recommends %(rpm --version | awk -e '{print ($3 > 4.12)}') +# Name: xschem -Version: 3.4.7 -Release: %autorelease +Version: 2.9.2 +Release: 6%{?dist} Summary: Schematic capture and Netlisting EDA tool -License: GPL-2.0-or-later +License: GPLv2+ URL: http://repo.hu/projects/xschem Source0: http://repo.hu/projects/xschem/releases/xschem-%{version}.tar.gz -Patch: xschem-cairo-jpg-32bit.patch -BuildRequires: bison -BuildRequires: flex -BuildRequires: gawk +BuildRequires: make BuildRequires: gcc -BuildRequires: libjpeg-turbo-devel -BuildRequires: make -BuildRequires: pkgconfig(cairo-xcb) -BuildRequires: pkgconfig(xpm) +BuildRequires: gawk +BuildRequires: flex, bison +#BuildRequires: flex-devel BuildRequires: tcl-devel BuildRequires: tk-devel +BuildRequires: pkgconfig(xpm) +BuildRequires: pkgconfig(cairo-xcb) +#BuildRequires: cairo-devel +#BuildRequires: xcb-util-devel + +%if %rpm_has_recommends Recommends: %{name}-doc = %{version}-%{release} -Requires: tcl -Requires: tk +%endif + +#Requires: tcl, tk + %description %{name} is a schematic capture program, it allows creation of hierarchical @@ -42,22 +50,7 @@ Documentation for %{name}. %prep -%setup -q - -# Fix wrong line encoding (CRLF to LF) of C files to apply patches cleanly -sed -i 's/\r$//' src/cairo_jpg.c - -%patch -P 0 -p1 - -# Fix wrong line encoding (CRLF to LF) -sed -i 's/\r$//' src/make_sym_lcc.awk - -# Remove shebang from non-executable script -sed -i '1{\@^#!/@d}' src/make_sym_lcc.awk - -# Ensure LDFLAGS are passed when building rawtovcd to enable PIE/hardening -sed -i 's/rawtovcd rawtovcd.o/rawtovcd rawtovcd.o $(LDFLAGS)/' src/Makefile.in - +%autosetup %build @@ -71,21 +64,47 @@ sed -i 's/rawtovcd rawtovcd.o/rawtovcd rawtovcd.o $(LDFLAGS)/' src/Makefile.in %files -%license LICENSE -%doc AUTHORS Changelog README +%license COPYING +%doc AUTHORS Changelog LICENSE README %{_bindir}/%{name} -%{_bindir}/rawtovcd %{_datadir}/%{name} %{_mandir}/man1/xschem.1* %files doc %{_docdir}/%{name} -%exclude %{_docdir}/%{name}/AUTHORS -%exclude %{_docdir}/%{name}/Changelog -%exclude %{_docdir}/%{name}/README - %changelog -%autochangelog +* Fri Jul 23 2021 Fedora Release Engineering - 2.9.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jan 28 2021 Fedora Release Engineering - 2.9.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 2.9.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 2.9.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 2.9.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Jul 21 2019 Alain - 2.9.2-1 +- Upstream new release + +* Sun Jul 14 2019 Alain - 2.9.0-1 +- Upstream new release + +* Sun Feb 17 2019 Alain - 2.8.2-2 +- apply suggestions from package reviewers + +* Sun Jan 27 2019 Alain - 2.8.2-1 +- Upstream new release + +* Sun Dec 02 2018 Alain - 2.8.1-1 +- Upstream new release + +* Tue Nov 06 2018 Alain - 2.8.0-1 +- Initial proposal