gammu: 1.40.0 -> 1.42.0
This commit is contained in:
parent
af4f49d372
commit
026ab5c82d
|
@ -8,13 +8,13 @@ with lib;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "gammu";
|
pname = "gammu";
|
||||||
version = "1.40.0";
|
version = "1.42.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "gammu";
|
owner = "gammu";
|
||||||
repo = "gammu";
|
repo = "gammu";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "1jjaa9r3x6i8gv3yn1ngg815s6gsxblsw4wb5ddm77kamn2qyvpf";
|
sha256 = "sha256-aeaGHVxOMiXRU6RHws+oAnzdO9RY1jw/X/xuGfSt76I=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./bashcomp-dir.patch ./systemd.patch ];
|
patches = [ ./bashcomp-dir.patch ./systemd.patch ];
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
diff --git a/cmake/templates/gammu.spec.in b/cmake/templates/gammu.spec.in
|
diff --git a/cmake/templates/gammu.spec.in b/cmake/templates/gammu.spec.in
|
||||||
index 8302353..e3ca59a 100644
|
index 25c08b3d6..86f72d8c7 100644
|
||||||
--- a/cmake/templates/gammu.spec.in
|
--- a/cmake/templates/gammu.spec.in
|
||||||
+++ b/cmake/templates/gammu.spec.in
|
+++ b/cmake/templates/gammu.spec.in
|
||||||
@@ -387,9 +387,9 @@ fi
|
@@ -386,9 +386,9 @@ fi
|
||||||
%doc %{_mandir}/man7/gammu-smsd-run.7*
|
%doc %{_mandir}/man7/gammu-smsd-run.7*
|
||||||
%doc %{_mandir}/man7/gammu-smsd-sql.7*
|
%doc %{_mandir}/man7/gammu-smsd-sql.7*
|
||||||
%doc %{_mandir}/man7/gammu-smsd-tables.7*
|
%doc %{_mandir}/man7/gammu-smsd-tables.7*
|
||||||
|
@ -16,13 +16,13 @@ index 8302353..e3ca59a 100644
|
||||||
%files -n libGammu%{so_ver} -f libgammu.lang
|
%files -n libGammu%{so_ver} -f libgammu.lang
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
|
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
|
||||||
index 78cc7fc..d674c36 100644
|
index 378411086..b871e6525 100644
|
||||||
--- a/contrib/CMakeLists.txt
|
--- a/contrib/CMakeLists.txt
|
||||||
+++ b/contrib/CMakeLists.txt
|
+++ b/contrib/CMakeLists.txt
|
||||||
@@ -97,7 +97,7 @@ endif (INSTALL_BASH_COMPLETION)
|
@@ -100,7 +100,7 @@ if (WITH_SYSTEMD)
|
||||||
if (WITH_SYSTEMD)
|
configure_file( init/gammu-smsd.service init/gammu-smsd.service )
|
||||||
install (
|
install (
|
||||||
FILES init/gammu-smsd.service
|
FILES ${CMAKE_CURRENT_BINARY_DIR}/init/gammu-smsd.service
|
||||||
- DESTINATION "${SYSTEMD_SERVICES_INSTALL_DIR}"
|
- DESTINATION "${SYSTEMD_SERVICES_INSTALL_DIR}"
|
||||||
+ DESTINATION "${CMAKE_INSTALL_PREFIX}/systemd"
|
+ DESTINATION "${CMAKE_INSTALL_PREFIX}/systemd"
|
||||||
COMPONENT "systemd"
|
COMPONENT "systemd"
|
||||||
|
|
Loading…
Reference in a new issue