summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2026-01-28 14:27:39 +0100
committerRemi Collet <remi@php.net>2026-01-28 14:27:39 +0100
commit4468dcb3d30ea23d6122de0824d2edd87861d35e (patch)
tree91e01110d588ccc3132c8c0860d582febc8b46c3
parent6ba279a57a0ae2f6b4f0fabe4c8f80f3edae274a (diff)
update to 0.100
re-license spec file to CECILL-2.1 use git snapshot as no usable sources tarball, reported as https://github.com/qelectrotech/qelectrotech-source-mirror/issues/418 open https://bugzilla.redhat.com/2433755 Please build kf5-kcoreaddons for EPEL 10 (and 10.1) open https://bugzilla.redhat.com/2433762 Please build kf5-kwidgetsaddons for EPEL-10 (and 10.1)
-rwxr-xr-xmakesrc.sh19
-rwxr-xr-xmksrc.sh27
-rw-r--r--qelectrotech.spec81
3 files changed, 41 insertions, 86 deletions
diff --git a/makesrc.sh b/makesrc.sh
new file mode 100755
index 0000000..8111001
--- /dev/null
+++ b/makesrc.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+NAME=$(basename $PWD)
+VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec)
+
+if [ -f $NAME-$VERSION.tar.xz ]; then
+ echo Already done
+else
+ echo "Cloning..."
+ rm -rf $NAME-$VERSION
+ git clone --recursive --depth 1 --shallow-submodules https://github.com/qelectrotech/qelectrotech-source-mirror.git --branch $VERSION $NAME-$VERSION
+
+ echo "Archiving..."
+ tar czf $NAME-$VERSION.tar.xz --exclude-vcs $NAME-$VERSION
+
+ echo "Cleaning..."
+ rm -rf $NAME-$VERSION
+fi
+
+
diff --git a/mksrc.sh b/mksrc.sh
deleted file mode 100755
index 7c8ae5c..0000000
--- a/mksrc.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "" ]; then
- echo usage $0 REVISION [ VER ]
- exit 1
-fi
-REV=$1
-VER=${2-0.6}
-PRE=rc1
-RPM=$(php -r "printf('%.2f', $VER);")
-
-svn export -r $REV svn://svn.tuxfamily.org/svnroot/qet/qet/trunk qelectrotech-${VER}${PRE}-svn${REV}
-
-sed -e "/displayedVersion/s/\"[^\"]*\"/\"${VER}-dev (Revision ${REV})\"/" \
- -i qelectrotech-${VER}-svn${REV}/sources/qet.h
-
-grep 'displayedVersion' qelectrotech-${VER}-svn${REV}/sources/qet.h
-
-tar czf qelectrotech-${VER}-svn${REV}.tgz qelectrotech-${VER}-svn${REV}
-rm -rf qelectrotech-${VER}-svn${REV}
-
-vendor="Remi Collet <remi@remirepo.net>"
-rpmdate=$(LC_ALL="C" date +"%a %b %d %Y")
-
-sed -e "s/%changelog/%changelog\n* $rpmdate $vendor - ${RPM}-2.svn${REV}\n- Update to ${VER} snapshot revision ${REV}\n/" \
- -e "/global svnrel/s/svnrel.*/svnrel $1/" \
- -i *spec
diff --git a/qelectrotech.spec b/qelectrotech.spec
index 04dc003..ff85e1c 100644
--- a/qelectrotech.spec
+++ b/qelectrotech.spec
@@ -1,13 +1,11 @@
# fedora/remirepo spec file for qelectrotech
#
-# Copyright (c) 2009-2023 Remi Collet
-# License: CC-BY-SA-4.0
-# http://creativecommons.org/licenses/by-sa/4.0/
+# SPDX-FileCopyrightText: Copyright 2009-2026 Remi Collet
+# SPDX-License-Identifier: CECILL-2.1
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
#
# Please, preserve the changelog entries
#
-#global svnrel 4947
-%global upver 0.9
%undefine _package_note_file
Name: qelectrotech
@@ -29,32 +27,18 @@ Summary(pl): Edytor schematów elektrycznych
Summary(pt): Um editor de esquemas eléctricos
Summary(ru): Редактор электрических схем
-%if 0%{?mageia}
-Epoch: 3
-%else
-Epoch: 0
-%endif
-# Upstream version is a float so 0.11 < 0.2 < 0.21 < 0.3
-# So use %.2f with upstream acknowledgment
-# Remember to check upver macro on each update
-Version: 0.90
-%if 0%{?svnrel}
-Release: 2.svn%{svnrel}%{?dist}
-%else
+Epoch: 0
+Version: 0.100
Release: 1%{?dist}
-%endif
# Prog is GPLv2 - Symbols/Elements are Creative Commons Attribution
License: GPL-2.0-or-later
Url: http://qelectrotech.org/
-%if 0%{?svnrel}
-# run mksrc.sh <revision>
-Source0: qelectrotech-%{upver}-svn%{?svnrel}.tgz
-Source1: mksrc.sh
-%else
-Source0: https://git.tuxfamily.org/qet/qet.git/snapshot/qet-%{upver}.tar.gz
-%endif
+# No usable sources tarball, see
+# https://github.com/qelectrotech/qelectrotech-source-mirror/issues/418
+Source0: %{name}-%{version}.tar.xz
+Source1: makesrc.sh
BuildRequires: make
BuildRequires: gcc
@@ -200,11 +184,7 @@ Colecção de elementos para QElectroTech.
%prep
-%if 0%{?svnrel}
-%setup -q -n %{name}-%{upver}-svn%{svnrel}
-%else
-%setup -q -n qet-%{upver}
-%endif
+%setup -q
sed -e s,/usr/local/,%{_prefix}/, \
-e /QET_MAN_PATH/s,'man/','share/man', \
@@ -235,43 +215,16 @@ mv %{buildroot}%{_mandir}/fr.UTF-8 %{buildroot}%{_mandir}/fr
desktop-file-install --vendor="" \
--add-category=Electronics \
--dir=%{buildroot}%{_datadir}/applications/ \
- %{buildroot}%{_datadir}/applications/%{name}.desktop
+ %{buildroot}%{_datadir}/applications/*.desktop
# QT translation provided by QT.
rm -f %{buildroot}%{_datadir}/%{name}/lang/qt_*.qm
-%if 0%{?mageia}
-echo '%{_datadir}/%{name}/lang/*' >qet.lang
-%else
%find_lang qet --with-qt
-%endif
%find_lang qelectrotech --with-man
cat qet.lang >>qelectrotech.lang
-%if 0%{?fedora} < 30 && 0%{?rhel} < 8
-%post
-/usr/bin/update-desktop-database &>/dev/null || :
-/bin/touch --no-create %{_datadir}/icons/hicolor
-/bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || :
-
-%postun
-/usr/bin/update-desktop-database &>/dev/null || :
-if [ $1 -eq 0 ] ; then
- /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
- /bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || :
- /usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
-fi
-
-%posttrans
-/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
-/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
-%endif
-
-
-%{!?_licensedir:%global license %%doc}
-
%files -f %{name}.lang
%doc CREDIT examples
%license LICENSE
@@ -281,7 +234,7 @@ fi
%else
%{_datadir}/appdata/%{name}.appdata.xml
%endif
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/*.desktop
%{_datadir}/mime/packages/%{name}.xml
%{_datadir}/icons/hicolor/*/*/*.png
%dir %{_datadir}/%{name}
@@ -296,6 +249,16 @@ fi
%changelog
+* Mon Jan 26 2026 Remi Collet <remi@remirepo.net> - 0.100-1
+- update to 0.100
+- re-license spec file to CECILL-2.1
+- use git snapshot as no usable sources tarball, reported as
+ https://github.com/qelectrotech/qelectrotech-source-mirror/issues/418
+- open https://bugzilla.redhat.com/2433755
+ Please build kf5-kcoreaddons for EPEL 10 (and 10.1)
+- open https://bugzilla.redhat.com/2433762
+ Please build kf5-kwidgetsaddons for EPEL-10 (and 10.1)
+
* Fri Jan 6 2023 Remi Collet <remi@remirepo.net> - 0.90-1
- update to 0.90
- use SPDX license id