diff --git a/.gitignore b/.gitignore index 1839400..38759e9 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /deepin-terminal-2.7.tar.gz /deepin-terminal-2.9.2.tar.gz /deepin-terminal-3.0.1.tar.gz +/deepin-terminal-3.0.3.tar.gz diff --git a/deepin-terminal.spec b/deepin-terminal.spec index 3f1d124..7885231 100644 --- a/deepin-terminal.spec +++ b/deepin-terminal.spec @@ -1,7 +1,7 @@ %global _terminals gnome-terminal mate-terminal xfce4-terminal lxterminal qterminal qterminal-qt5 terminology yakuake fourterm roxterm lilyterm termit xterm mrxvt Name: deepin-terminal -Version: 3.0.1 +Version: 3.0.3 Release: 1%{?dist} Summary: Default terminal emulation application for Deepin License: GPLv3 @@ -46,14 +46,13 @@ The %{name}-data package provides shared data for Deepin Terminal. %patch0 -p1 -b .unbundle_vte sed -i 's|/usr/lib/%{name}/zssh|%{_bindir}/zssh|' ssh_login.sh sed -i '/ssh_login/s|lib|libexec|' lib/utils.vala -sed -i 's|2.7|3.0|' lib/constant.vala # remove es_419 locale rm -rf po/es_419/ sed -i '/es_419/d' deepin-terminal.desktop %build -%cmake -DCMAKE_BUILD_TYPE=Release +%cmake -DCMAKE_BUILD_TYPE=Release -DVERSION=%{version} %make_build %install @@ -103,6 +102,9 @@ fi %{_datadir}/applications/%{name}.desktop %changelog +* Sat Aug 25 2018 mosquito - 3.0.3-1 +- Update to 3.0.3 + * Fri Jul 27 2018 mosquito - 3.0.1-1 - Update to 3.0.1 diff --git a/deepin-terminal_unbundle_vte.patch b/deepin-terminal_unbundle_vte.patch index d50bd8f..5b06140 100644 --- a/deepin-terminal_unbundle_vte.patch +++ b/deepin-terminal_unbundle_vte.patch @@ -8,7 +8,7 @@ pkg_check_modules(GEE REQUIRED gee-0.8) pkg_check_modules(GIO REQUIRED gio-unix-2.0) pkg_check_modules(RSVG REQUIRED librsvg-2.0) -@@ -44,22 +45,6 @@ +@@ -59,22 +60,6 @@ ) endif() @@ -31,7 +31,7 @@ set(CFLAGS ${GIO_CFLAGS} ${GTK3_CFLAGS} ${GTK3_CFLAGS_OTHER} -@@ -79,9 +64,8 @@ +@@ -94,9 +79,8 @@ ${RSVG_INCLUDE_DIRS} ${JsonGlib_INCLUDE_DIRS} ${LIBSECRET_INCLUDE_DIRS} @@ -42,7 +42,7 @@ include_directories(${INCLUDE_PATHS}) set(LIBS ${GIO_LIBRARIES} -@@ -91,17 +75,12 @@ +@@ -106,17 +90,12 @@ ${RSVG_LIBRARIES} ${JsonGlib_LIBRARIES} ${LIBSECRET_LIBRARIES} @@ -61,7 +61,7 @@ ) SET(APP_SOURCES, "") FILE(GLOB valalist LIST_FILES true */*.vala) -@@ -137,8 +116,7 @@ +@@ -152,8 +131,7 @@ librsvg-2.0 ) add_executable(${target} ${VALA_C} ${CMAKE_SOURCE_DIR}/project_path.c ${CMAKE_SOURCE_DIR}/lib/font.c) @@ -71,7 +71,7 @@ FILE(GLOB children LIST_DIRECTORIES true po/*) SET(dirlist "") -@@ -170,7 +148,7 @@ +@@ -185,7 +163,7 @@ ENDFOREACH(lang) INSTALL (TARGETS ${target} DESTINATION bin) diff --git a/sources b/sources index 67d6ba7..cb01e11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (deepin-terminal-3.0.1.tar.gz) = ebe95993b98d87f74ea829932b3b9fe5eff5b6fd26f0553801481ee520b709c84c57e60ed3f6bb5b9b8a811f0557f52a5ad8f8bdbd4dc8b9d77249760fd4ba06 +SHA512 (deepin-terminal-3.0.3.tar.gz) = 396d0059a29acce42ecac9e33f3f96fd8b2fde3eb891df0d45764f875d710661183c3bac043cb429c0893f1fc459d8080af6100a7c7461cbc47fa51ac2bc7636