robert pushed to dislocker (epel9). "- Perform integer comparision in
%preun scriptlet (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-02-01 00:04:19 UTC
From 14084d97ae59bf8f436bc6852b1b57e6f2ce1ea6 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert(a)fedoraproject.org>
Date: Mar 07 2021 19:21:21 +0000
Subject: - Perform integer comparision in %preun scriptlet
- Use %{_sbindir}/alternatives rather a symlink to it
---
diff --git a/dislocker.spec b/dislocker.spec
index 784fa23..5003181 100644
--- a/dislocker.spec
+++ b/dislocker.spec
@@ -11,8 +11,8 @@ Patch0: dislocker-0.7.3-duplicate-variable-name.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: ruby(release)
Requires: ruby(runtime_executable)
-Requires(post): %{_sbindir}/update-alternatives
-Requires(preun): %{_sbindir}/update-alternatives
+Requires(post): %{_sbindir}/alternatives
+Requires(preun): %{_sbindir}/alternatives
Provides: %{_bindir}/%{name}
BuildRequires: gcc
BuildRequires: cmake
@@ -51,8 +51,8 @@ Provides: %{_bindir}/%{name}
Provides: dislocker-fuse = %{version}-%{release}
Provides: dislocker-fuse%{?_isa} = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-Requires(post): %{_sbindir}/update-alternatives
-Requires(preun): %{_sbindir}/update-alternatives
+Requires(post): %{_sbindir}/alternatives
+Requires(preun): %{_sbindir}/alternatives
BuildRequires: fuse-devel
%description -n fuse-dislocker
@@ -92,21 +92,21 @@ for file in *.md; do mv -f $file ${file%.md}; done
for file in *.txt; do mv -f $file ${file%.txt}; done
%post
-%{_sbindir}/update-alternatives --install %{_bindir}/%{name} %{name} %{_bindir}/%{name}-file 60
+%{_sbindir}/alternatives --install %{_bindir}/%{name} %{name} %{_bindir}/%{name}-file 60
%preun
-if [ $1 = 0 ]; then
- %{_sbindir}/update-alternatives --remove %{name} %{_bindir}/%{name}-file
+if [ $1 -eq 0 ]; then
+ %{_sbindir}/alternatives --remove %{name} %{_bindir}/%{name}-file
fi
%ldconfig_scriptlets libs
%post -n fuse-dislocker
-%{_sbindir}/update-alternatives --install %{_bindir}/%{name} %{name} %{_bindir}/%{name}-fuse 80
+%{_sbindir}/alternatives --install %{_bindir}/%{name} %{name} %{_bindir}/%{name}-fuse 80
%preun -n fuse-dislocker
-if [ $1 = 0 ]; then
- %{_sbindir}/update-alternatives --remove %{name} %{_bindir}/%{name}-fuse
+if [ $1 -eq 0 ]; then
+ %{_sbindir}/alternatives --remove %{name} %{_bindir}/%{name}-fuse
fi
%files
https://src.fedoraproject.org/rpms/dislocker/c/14084d97ae59bf8f436bc6852b...
2Â years, 4Â months
robert pushed to dislocker (epel9). "Spec file cleanup"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-02-01 00:04:19 UTC
From 916525aec8f13e49bf90f8fb8a9d98dfe22eae3e Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert(a)fedoraproject.org>
Date: Dec 13 2020 17:04:31 +0000
Subject: Spec file cleanup
---
diff --git a/.gitignore b/.gitignore
index 14d84fc..25299ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/dislocker-*.tar.bz2
+/dislocker-*.tar.*
/v*.tar.gz
diff --git a/dislocker.spec b/dislocker.spec
index 176504b..4019ee2 100644
--- a/dislocker.spec
+++ b/dislocker.spec
@@ -4,14 +4,10 @@ Version: 0.7.3
Release: 1%{?dist}
License: GPLv2+
URL: https://github.com/Aorimn/dislocker
-Source0: https://github.com/Aorimn/dislocker/archive/v%{version}.tar.gz
+Source0: https://github.com/Aorimn/dislocker/archive/v%{version}/%{name}-%{version...
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-%if 0%{?fedora} || 0%{?rhel} >= 7
Requires: ruby(release)
Requires: ruby(runtime_executable)
-%else
-Requires: %{_bindir}/ruby
-%endif
Requires(post): %{_sbindir}/update-alternatives
Requires(preun): %{_sbindir}/update-alternatives
Provides: %{_bindir}/%{name}
@@ -129,8 +125,9 @@ fi
%{_mandir}/man1/%{name}-fuse.1*
%changelog
-* Tue 01 Dec 2020 Eshin Kunishima <ek(a)esh.ink> 0.7.3-1
-- Upgrade to 0.7.3
+* Sun Dec 13 2020 Robert Scheck <robert(a)fedoraproject.org> 0.7.3-1
+- Spec file cleanup
+- Upgrade to 0.7.3 (#1876804, thanks to Eshin Kunishima)
* Tue Aug 04 2020 Robert Scheck <robert(a)fedoraproject.org> 0.7.1-17
- Work around CMake out-of-source builds on all branches (#1863427)
diff --git a/sources b/sources
index e6da1b6..28e688b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v0.7.3.tar.gz) = c62241d70d51f6445a2f6d0f08e099bbc1a4257ca98232471fc43ec63e69d62ae5f702c995ec00b7e1db7d33f4bb3a31ea05bc13862bf3b539feb301a0e034ff
+SHA512 (dislocker-0.7.3.tar.gz) = c62241d70d51f6445a2f6d0f08e099bbc1a4257ca98232471fc43ec63e69d62ae5f702c995ec00b7e1db7d33f4bb3a31ea05bc13862bf3b539feb301a0e034ff
https://src.fedoraproject.org/rpms/dislocker/c/916525aec8f13e49bf90f8fb8a...
2Â years, 4Â months
robert pushed to dislocker (epel9). "Upgrade to 0.7.3"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-02-01 00:04:19 UTC
From 816998b84cf350634e72502d04f58a4b5b969cfe Mon Sep 17 00:00:00 2001
From: Eshin Kunishima <ek(a)esh.ink>
Date: Dec 01 2020 14:50:59 +0000
Subject: Upgrade to 0.7.3
---
diff --git a/dislocker.spec b/dislocker.spec
index 3b0cd43..176504b 100644
--- a/dislocker.spec
+++ b/dislocker.spec
@@ -1,7 +1,7 @@
Summary: Utility to access BitLocker encrypted volumes
Name: dislocker
-Version: 0.7.1
-Release: 17%{?dist}
+Version: 0.7.3
+Release: 1%{?dist}
License: GPLv2+
URL: https://github.com/Aorimn/dislocker
Source0: https://github.com/Aorimn/dislocker/archive/v%{version}.tar.gz
@@ -129,6 +129,9 @@ fi
%{_mandir}/man1/%{name}-fuse.1*
%changelog
+* Tue 01 Dec 2020 Eshin Kunishima <ek(a)esh.ink> 0.7.3-1
+- Upgrade to 0.7.3
+
* Tue Aug 04 2020 Robert Scheck <robert(a)fedoraproject.org> 0.7.1-17
- Work around CMake out-of-source builds on all branches (#1863427)
- Add libdislocker.so symlink for dislocker-find (#1659733, #1583480)
diff --git a/sources b/sources
index 110ef05..e6da1b6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v0.7.1.tar.gz) = 8852ba3e363fdea992eebecfe1e4dad2b85404f57c57ce6b2937a9859d03cfa88d969926c9e11e6d22596c6d96805b7d1737893ae2c5a957448ab26708bce226
+SHA512 (v0.7.3.tar.gz) = c62241d70d51f6445a2f6d0f08e099bbc1a4257ca98232471fc43ec63e69d62ae5f702c995ec00b7e1db7d33f4bb3a31ea05bc13862bf3b539feb301a0e034ff
https://src.fedoraproject.org/rpms/dislocker/c/816998b84cf350634e72502d04...
2Â years, 4Â months
robert pushed to dislocker (epel9). "Remove obsolete Group tag
(..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-02-01 00:04:19 UTC
From 882c9dcf3eca15cb48431613d7c50831e63094ef Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Jan 28 2019 19:23:59 +0000
Subject: Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
---
diff --git a/dislocker.spec b/dislocker.spec
index d222fb9..b4a0713 100644
--- a/dislocker.spec
+++ b/dislocker.spec
@@ -3,7 +3,6 @@ Name: dislocker
Version: 0.7.1
Release: 11%{?dist}
License: GPLv2+
-Group: Applications/System
URL: https://github.com/Aorimn/dislocker
Source0: https://github.com/Aorimn/dislocker/archive/v%{version}.tar.gz
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@@ -35,7 +34,6 @@ NTFS partition and won't have any link to the original BitLocker partition.
%package libs
Summary: Libraries for applications using dislocker
-Group: System Environment/Libraries
%description libs
The dislocker-libs package provides the essential shared libraries for any
@@ -43,7 +41,6 @@ dislocker client program or interface.
%package -n fuse-dislocker
Summary: FUSE filesystem to access BitLocker encrypted volumes
-Group: Applications/System
Provides: %{_bindir}/%{name}
Provides: dislocker-fuse = %{version}-%{release}
Provides: dislocker-fuse%{?_isa} = %{version}-%{release}
https://src.fedoraproject.org/rpms/dislocker/c/882c9dcf3eca15cb48431613d7...
2Â years, 4Â months
robert pushed to dislocker (epel9). "- Work around CMake
out-of-source builds on all branches (#1863427) (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-02-01 00:04:19 UTC
From b4adcad9641c7e998f9552fc4e57f8e2c81fd73a Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert(a)fedoraproject.org>
Date: Aug 05 2020 00:03:24 +0000
Subject: - Work around CMake out-of-source builds on all branches (#1863427)
- Add libdislocker.so symlink for dislocker-find (#1659733, #1583480)
---
diff --git a/dislocker.spec b/dislocker.spec
index 840b278..3b0cd43 100644
--- a/dislocker.spec
+++ b/dislocker.spec
@@ -7,15 +7,22 @@ URL: https://github.com/Aorimn/dislocker
Source0: https://github.com/Aorimn/dislocker/archive/v%{version}.tar.gz
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%if 0%{?fedora} || 0%{?rhel} >= 7
-Requires: ruby(release), ruby(runtime_executable)
+Requires: ruby(release)
+Requires: ruby(runtime_executable)
%else
Requires: %{_bindir}/ruby
%endif
Requires(post): %{_sbindir}/update-alternatives
Requires(preun): %{_sbindir}/update-alternatives
Provides: %{_bindir}/%{name}
-BuildRequires: gcc
-BuildRequires: cmake, mbedtls-devel, ruby-devel, %{_bindir}/ruby
+BuildRequires: gcc
+BuildRequires: cmake
+%if 0%{?rhel} && 0%{?rhel} < 8
+BuildRequires: cmake3
+%endif
+BuildRequires: mbedtls-devel
+BuildRequires: ruby-devel
+BuildRequires: %{_bindir}/ruby
%description
Dislocker has been designed to read BitLocker encrypted partitions ("drives")
@@ -65,19 +72,21 @@ reading from it or writing to it is possible.
%setup -q
%build
+%if 0%{?rhel} && 0%{?rhel} < 8
+%global cmake %cmake3
+%global cmake_build %cmake3_build
+%global cmake_install %cmake3_install
+%endif
+
%cmake -D WARN_FLAGS="-Wall -Wno-error -Wextra" .
-make %{?_smp_mflags}
+%cmake_build
%install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+%cmake_install
# Remove standard symlinks due to alternatives
rm -f $RPM_BUILD_ROOT{%{_bindir}/%{name},%{_mandir}/man1/%{name}.1*}
-# Remove symlink, because of missing -devel package
-rm -f $RPM_BUILD_ROOT%{_libdir}/libdislocker.so
-
# Clean up files for later usage in documentation
for file in *.md; do mv -f $file ${file%.md}; done
for file in *.txt; do mv -f $file ${file%.txt}; done
@@ -109,19 +118,20 @@ fi
%{_mandir}/man1/%{name}-find.1*
%files libs
-%{!?_licensedir:%global license %%doc}
%license LICENSE
%doc CHANGELOG README
%{_libdir}/libdislocker.so.*
+# dislocker-find (ruby) fails without this symlink (#1583480)
+%{_libdir}/libdislocker.so
%files -n fuse-dislocker
%{_bindir}/%{name}-fuse
%{_mandir}/man1/%{name}-fuse.1*
%changelog
-* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.7.1-17
-- Second attempt - Rebuilt for
- https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+* Tue Aug 04 2020 Robert Scheck <robert(a)fedoraproject.org> 0.7.1-17
+- Work around CMake out-of-source builds on all branches (#1863427)
+- Add libdislocker.so symlink for dislocker-find (#1659733, #1583480)
* Mon Jul 27 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.7.1-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
https://src.fedoraproject.org/rpms/dislocker/c/b4adcad9641c7e998f9552fc4e...
2Â years, 4Â months