diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore index f1a52df4..243a54fe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,346 +1 @@ -/vim-7.4.tar.bz2 -/vim-7.4-2342.tar.bz2 -/vim-8.0-003.tar.bz2 -/vim-8.0-018.tar.bz2 -/vim-8.0-037.tar.bz2 -/vim-8.0-057.tar.bz2 -/vim-8.0-061.tar.bz2 -/vim-8.0-000.tar.bz2 -/vim-8.0-070.tar.bz2 -/vim-8.0-084.tar.bz2 -/vim-8.0-085.tar.bz2 -/vim-8.0-086.tar.bz2 -/vim-8.0-094.tar.bz2 -/vim-8.0-095.tar.bz2 -/vim-8.0-104.tar.bz2 -/vim-8.0-118.tar.bz2 -/vim-8.0-124.tar.bz2 -/vim-8.0-133.tar.bz2 -/vim-8.0-134.tar.bz2 -/vim-8.0-142.tar.bz2 -/vim-8.0-160.tar.bz2 -/vim-8.0-170.tar.bz2 -/vim-8.0-172.tar.bz2 -/vim-8.0-176.tar.bz2 -/vim-8.0-194.tar.bz2 -/vim-8.0-197.tar.bz2 -/vim-8.0-206.tar.bz2 -/vim-8.0-238.tar.bz2 -/vim-8.0-271.tar.bz2 -/vim-8.0-273.tar.bz2 -/vim-8.0-275.tar.bz2 -/vim-8.0-297.tar.bz2 -/vim-8.0-311.tar.bz2 -/vim-8.0-314.tar.bz2 -/vim-8.0-318.tar.bz2 -/vim-8.0-324.tar.bz2 -/vim-8.0-329.tar.bz2 -/vim-8.0-342.tar.bz2 -/vim-8.0-344.tar.bz2 -/vim-8.0-347.tar.bz2 -/vim-8.0-363.tar.bz2 -/vim-8.0-381.tar.bz2 -/vim-8.0-386.tar.bz2 -/vim-8.0-388.tar.bz2 -/vim-8.0-398.tar.bz2 -/vim-8.0-402.tar.bz2 -/vim-8.0-425.tar.bz2 -/vim-8.0-427.tar.bz2 -/vim-8.0-430.tar.bz2 -/vim-8.0-442.tar.bz2 -/vim-8.0-456.tar.bz2 -/vim-8.0-458.tar.bz2 -/vim-8.0-494.tar.bz2 -/vim-8.0-497.tar.bz2 -/vim-8.0-502.tar.bz2 -/vim-8.0-503.tar.bz2 -/vim-8.0-514.tar.bz2 -/vim-8.0-515.tar.bz2 -/vim-8.0-517.tar.bz2 -/vim-8.0-525.tar.bz2 -/vim-8.0-529.tar.bz2 -/vim-8.0-540.tar.bz2 -/vim-8.0-543.tar.bz2 -/vim-8.0-559.tar.bz2 -/vim-8.0-562.tar.bz2 -/vim-8.0-566.tar.bz2 -/vim-8.0-586.tar.bz2 -/vim-8.0-596.tar.bz2 -/vim-8.0-597.tar.bz2 -/vim-8.0-598.tar.bz2 -/vim-8.0-599.tar.bz2 -/vim-8.0-600.tar.bz2 -/vim-8.0-604.tar.bz2 -/vim-8.0-606.tar.bz2 -/vim-8.0-617.tar.bz2 -/vim-8.0-627.tar.bz2 -/vim-8.0-628.tar.bz2 -/vim-8.0-636.tar.bz2 -/vim-8.0-642.tar.bz2 -/vim-8.0-647.tar.bz2 -/vim-8.0-648.tar.bz2 -/vim-8.0-662.tar.bz2 -/vim-8.0-679.tar.bz2 -/vim-8.0-685.tar.bz2 -/vim-8.0-688.tar.bz2 -/vim-8.0-691.tar.bz2 -/vim-8.0-705.tar.bz2 -/vim-8.0-711.tar.bz2 -/vim-8.0-728.tar.bz2 -/vim-8.0-730.tar.bz2 -/vim-8.0-738.tar.bz2 -/vim-8.0-739.tar.bz2 -/vim-8.0-823.tar.bz2 -/vim-8.0-826.tar.bz2 -/vim-8.0-844.tar.bz2 -/vim-8.0-885.tar.bz2 -/vim-8.0-891.tar.bz2 -/vim-8.0-893.tar.bz2 -/vim-8.0-895.tar.bz2 -/vim-8.0-896.tar.bz2 -/vim-8.0-938.tar.bz2 -/vim-8.0-946.tar.bz2 -/vim-8.0-956.tar.bz2 -/vim-8.0-983.tar.bz2 -/vim-8.0-987.tar.bz2 -/vim-8.0-992.tar.bz2 -/vim-8.0-1030.tar.bz2 -/vim-8.0-1052.tar.bz2 -/vim-8.0-1056.tar.bz2 -/vim-8.0-1064.tar.bz2 -/vim-8.0-1067.tar.bz2 -/vim-8.0-1071.tar.bz2 -/vim-8.0-1092.tar.bz2 -/vim-8.0-1097.tar.bz2 -/vim-8.0-1098.tar.bz2 -/vim-8.0-1102.tar.bz2 -/vim-8.0-1123.tar.bz2 -/vim-8.0-1127.tar.bz2 -/vim-8.0-1129.tar.bz2 -/vim-8.0-1132.tar.bz2 -/vim-8.0-1144.tar.bz2 -/vim-8.0-1155.tar.bz2 -/vim-8.0-1171.tar.bz2 -/vim-8.0-1173.tar.bz2 -/vim-8.0-1175.tar.bz2 -/vim-8.0-1176.tar.bz2 -/vim-8.0-1184.tar.bz2 -/vim-8.0-1187.tar.bz2 -/vim-8.0-1203.tar.bz2 -/vim-8.0-1207.tar.bz2 -/vim-8.0-1213.tar.bz2 -/vim-8.0-1216.tar.bz2 -/vim-8.0-1226.tar.bz2 -/vim-8.0-1238.tar.bz2 -/vim-8.0-1240.tar.bz2 -/vim-8.0-1241.tar.bz2 -/vim-8.0-1257.tar.bz2 -/vim-8.0-1272.tar.bz2 -/vim-8.0-1274.tar.bz2 -/vim-8.0-1283.tar.bz2 -/vim-8.0-1322.tar.bz2 -/vim-8.0-1326.tar.bz2 -/vim-8.0-1330.tar.bz2 -/vim-8.0-1349.tar.bz2 -/vim-8.0-1351.tar.bz2 -/vim-8.0-1358.tar.bz2 -/vim-8.0-1359.tar.bz2 -/vim-8.0-1360.tar.bz2 -/vim-8.0-1367.tar.bz2 -/vim-8.0-1376.tar.bz2 -/vim-8.0-1379.tar.bz2 -/vim-8.0-1386.tar.bz2 -/vim-8.0-1387.tar.bz2 -/vim-8.0-1389.tar.bz2 -/vim-8.0-1390.tar.bz2 -/vim-8.0-1401.tar.bz2 -/vim-8.0-1406.tar.bz2 -/vim-8.0-1427.tar.bz2 -/vim-8.0-1428.tar.bz2 -/vim-8.0-1438.tar.bz2 -/vim-8.0-1451.tar.bz2 -/vim-8.0-1473.tar.bz2 -/vim-8.0-1475.tar.bz2 -/vim-8.0-1478.tar.bz2 -/vim-8.0-1505.tar.bz2 -/vim-8.0-1509.tar.bz2 -/vim-8.0-1520.tar.bz2 -/vim-8.0-1523.tar.bz2 -/vim-8.0-1527.tar.bz2 -/vim-8.0-1543.tar.bz2 -/vim-8.0-1553.tar.bz2 -/vim-8.0-1569.tar.bz2 -/vim-8.0-1573.tar.bz2 -/vim-8.0-1587.tar.bz2 -/vim-8.0-1589.tar.bz2 -/vim-8.0-1591.tar.bz2 -/vim-8.0-1599.tar.bz2 -/vim-8.0-1603.tar.bz2 -/vim-8.0-1605.tar.bz2 -/vim-8.0-1625.tar.bz2 -/vim-8.0-1630.tar.bz2 -/vim-8.0-1661.tar.bz2 -/vim-8.0-1666.tar.bz2 -/vim-8.0-1679.tar.bz2 -/vim-8.0-1704.tar.bz2 -/vim-8.0-1755.tar.bz2 -/vim-8.0-1763.tar.bz2 -/vim-8.0-1765.tar.bz2 -/vim-8.0-1766.tar.bz2 -/vim-8.0-1787.tar.bz2 -/vim-8.0-1788.tar.bz2 -/vim-8.0-1789.tar.bz2 -/vim-8.0-1806.tar.bz2 -/vim-8.0-1813.tar.bz2 -/vim-8.0-1842.tar.bz2 -/vim-8.0-1848.tar.bz2 -/vim-8.1-001.tar.bz2 -/vim-8.1-010.tar.bz2 -/vim-8.1-016.tar.bz2 -/vim-8.1-020.tar.bz2 -/vim-8.1-022.tar.bz2 -/vim-8.1-026.tar.bz2 -/vim-8.1-034.tar.bz2 -/vim-8.1-035.tar.bz2 -/vim-8.1-039.tar.bz2 -/vim-8.1-042.tar.bz2 -/vim-8.1-055.tar.bz2 -/vim-8.1-072.tar.bz2 -/vim-8.1-095.tar.bz2 -/vim-8.1-115.tar.bz2 -/vim-8.1-117.tar.bz2 -/vim-8.1-119.tar.bz2 -/vim-8.1-177.tar.bz2 -/vim-8.1-189.tar.bz2 -/vim-8.1-197.tar.bz2 -/vim-8.1-207.tar.bz2 -/vim-8.1-209.tar.bz2 -/vim-8.1-213.tar.bz2 -/vim-8.1-229.tar.bz2 -/vim-8.1-233.tar.bz2 -/vim-8.1-240.tar.bz2 -/vim-8.1-254.tar.bz2 -/vim-8.1-258.tar.bz2 -/vim-8.1-264.tar.bz2 -/vim-8.1-279.tar.bz2 -/vim-8.1-287.tar.bz2 -/vim-8.1-328.tar.bz2 -/vim-8.1-351.tar.bz2 -/vim-8.1-408.tar.bz2 -/vim-8.1-450.tar.bz2 -/vim-8.1-451.tar.bz2 -/vim-8.1-483.tar.bz2 -/vim-8.1-497.tar.bz2 -/vim-8.1-511.tar.bz2 -/vim-8.1-513.tar.bz2 -/vim-8.1-527.tar.bz2 -/vim-8.1-549.tar.bz2 -/vim-8.1-575.tar.bz2 -/vim-8.1-702.tar.bz2 -/vim-8.1-714.tar.bz2 -/vim-8.1-789.tar.bz2 -/vim-8.1-818.tar.bz2 -/vim-8.1-837.tar.bz2 -/vim-8.1-847.tar.bz2 -/vim-8.1-873.tar.bz2 -/vim-8.1-880.tar.bz2 -/vim-8.1-897.tar.bz2 -/vim-8.1-918.tar.bz2 -/vim-8.1-956.tar.bz2 -/vim-8.1-994.tar.bz2 -/vim-8.1-998.tar.bz2 -/vim-8.1-1048.tar.bz2 -/vim-8.1-1099.tar.bz2 -/vim-8.1-1137.tar.bz2 -/vim-8.1-1359.tar.bz2 -/vim-8.1-1413.tar.bz2 -/vim-8.1-1471.tar.bz2 -/vim-8.1-1517.tar.bz2 -/vim-8.1-1561.tar.bz2 -/vim-8.1-1602.tar.bz2 -/vim-8.1-1661.tar.bz2 -/vim-8.1-1713.tar.bz2 -/vim-8.1-1749.tar.bz2 -/vim-8.1-1790.tar.bz2 -/vim-8.1-1890.tar.bz2 -/vim-8.1-1912.tar.bz2 -/vim-8.1-1991.tar.bz2 -/vim-8.1-2019.tar.bz2 -/vim-8.1-2056.tar.bz2 -/vim-8.1-2102.tar.bz2 -/vim-8.1-2120.tar.bz2 -/vim-8.1-2168.tar.bz2 -/vim-8.1-2197.tar.bz2 -/vim-8.1-2198.tar.bz2 -/vim-8.1-2234.tar.bz2 -/vim-8.1-2267.tar.bz2 -/vim-8.1-2352.tar.bz2 -/vim-8.1-2424.tar.bz2 -/vim-8.2-012.tar.bz2 -/vim-8.2-019.tar.bz2 -/vim-8.2-076.tar.bz2 -/vim-8.2-109.tar.bz2 -/vim-8.2-158.tar.bz2 -/vim-8.2-236.tar.bz2 -/vim-8.2-348.tar.bz2 -/vim-8.2-356.tar.bz2 -/vim-8.2-357.tar.bz2 -/vim-8.2-390.tar.bz2 -/vim-8.2-444.tar.bz2 -/vim-8.2-448.tar.bz2 -/vim-8.2-480.tar.bz2 -/vim-8.2-520.tar.bz2 -/vim-8.2-525.tar.bz2 -/vim-8.2-534.tar.bz2 -/vim-8.2-587.tar.bz2 -/vim-8.2-613.tar.bz2 -/vim-8.2-628.tar.bz2 -/vim-8.2-694.tar.bz2 -/vim-8.2-735.tar.bz2 -/vim-8.2-752.tar.bz2 -/vim-8.2-789.tar.bz2 -/vim-8.2-806.tar.bz2 -/vim-8.2-834.tar.bz2 -/vim-8.2-869.tar.bz2 -/vim-8.2-905.tar.bz2 -/vim-8.2-987.tar.bz2 -/vim-8.2-993.tar.bz2 -/vim-8.2-1009.tar.bz2 -/vim-8.2-1052.tar.bz2 -/vim-8.2-1081.tar.bz2 -/vim-8.2-1199.tar.bz2 -/vim-8.2-1217.tar.bz2 -/vim-8.2-1224.tar.bz2 -/vim-8.2-1273.tar.bz2 -/vim-8.2-1307.tar.bz2 -/vim-8.2-1328.tar.bz2 -/vim-8.2-1359.tar.bz2 -/vim-8.2-1382.tar.bz2 -/vim-8.2-1412.tar.bz2 -/vim-8.2-1484.tar.bz2 -/vim-8.2-1520.tar.bz2 -/vim-8.2-1522.tar.bz2 -/vim-8.2-1551.tar.bz2 -/vim-8.2-1634.tar.bz2 -/vim-8.2-1651.tar.bz2 -/vim-8.2-1687.tar.bz2 -/vim-8.2-1770.tar.bz2 -/vim-8.2-1805.tar.bz2 -/vim-8.2-1815.tar.bz2 -/vim-8.2-1885.tar.bz2 -/vim-8.2-1941.tar.bz2 -/vim-8.2-1961.tar.bz2 -/vim-8.2-1971.tar.bz2 -/vim-8.2-2018.tar.bz2 -/vim-8.2-2072.tar.bz2 -/vim-8.2-2086.tar.bz2 -/vim-8.2-2108.tar.bz2 -/vim-8.2-2115.tar.bz2 -/vim-8.2-2143.tar.bz2 -/vim-8.2-2146.tar.bz2 -/vim-8.2-2311.tar.bz2 -/vim-8.2-2451.tar.bz2 -/vim-8.2-2465.tar.bz2 -/vim-8.2-2488.tar.bz2 -/vim-8.2-2529.tar.bz2 -/vim-8.2-2541.tar.bz2 +/vim-*.tar.bz2 diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 00000000..c5aa0e08 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 00000000..80852883 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,25 @@ +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_testing +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional} + +#Rawhide +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional} + +#gating rhel +--- !Policy +product_versions: + - rhel-* +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional} + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional} diff --git a/gvim.desktop b/gvim.desktop deleted file mode 100644 index 97bf6ac8..00000000 --- a/gvim.desktop +++ /dev/null @@ -1,64 +0,0 @@ -[Desktop Entry] -Name=Vi IMproved -Name[bg]=Vi Ðåäàêòîð -Name[ca]=Vi Millorat -Name[da]=Vi forbedret -Name[eo]=VIM -Name[et]=Täiustatud Vi (vim) -Name[fr]=Vi étendu (VIM) -Name[he]=רפושמ Vi -Name[hu]=Vi -Name[is]=Vi IMproved ritillinn -Name[it]=Vi iMproved -Name[no]=Vi IMproved (forbedret VI) -Name[pl]=Poprawiony VI (vim) -Name[ro]=VIM -Name[ru]=Улучшенный VI -Name[sk]=Vi IMpreved -Name[sl]=Izboljšani vi (vim) -Name[sv]=Förbättrad Vi -Name[zh_CN.GB2312]=改进的 Vi -Comment=Powerful text editor with scripting functions and macro recorder -Comment[bg]=Ðåäàêòîð ñ ìíîãî âúçìîæíîñòè -Comment[ca]=Editor vi potent -Comment[cs]=Mocný textový editor vi -Comment[da]=En kraftig vi tekstbehandler -Comment[de]=Ein leistungsfähiger vi-Editor -Comment[el]=Πανίσχυρος διορθωτής vi -Comment[eo]=VIM similas al redaktilo "vi", sed havas aldonajn ecojn -Comment[es]=Una versión mejorada del editor vi -Comment[et]=Võimas tekstiredaktor vi -Comment[fi]=Tehokas vi-tekstieditori -Comment[fr]=Éditeur vi puissant -Comment[gl]=Potente editor vi -Comment[he]=Vi המצועה בר ךרועה -Comment[hr]=Napredni vi uređivač -Comment[hu]=Vi szövegszerkesztő -Comment[is]=Öflug útgáfa vi ritilsins -Comment[it]=Un editor vi potenziato -Comment[ja]=強力なViエディタ -Comment[lt]=Galingas vi redaktorius -Comment[mk]=Моќен VI уредувач -Comment[nl]=Krachtige vi-editor -Comment[no]=En kraftig vi-redigerer -Comment[no_NY]=Kraftig vi-tekstredigeringsprogram -Comment[pl]=Edytor vi -Comment[pt]=Um poderoso editor de texto -Comment[ro]=Un editor de texte VI, puternic -Comment[ru]=Мощный текстовый редактор vi -Comment[sk]=Silný textový procesor vi -Comment[sl]=Zmogljivi urejevalnik vi -Comment[sr]=Moćni vi editor -Comment[sv]=En kraftfull texteditor -Comment[ta]=ºì¾¢Å¡öó¾ vi ¦¾¡ÌôÀ¡Ç÷ -Comment[tr]=Güçlü vi düzenleyicisi -Comment[uk]=Потужний редактор vi -Comment[zh_CN.GB2312]=功能强大的 vi 编辑器 -MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; -Exec=gvim -f %F -Icon=gvim -Type=Application -Terminal=false -X-XClassHintResName=VIM -MapNotify=false -Categories=Utility;TextEditor; diff --git a/plans.fmf b/plans.fmf new file mode 100644 index 00000000..0b2564f3 --- /dev/null +++ b/plans.fmf @@ -0,0 +1,35 @@ +/tier1-internal: + plan: + import: + url: https://gitlab.com/redhat/centos-stream/tests/vim.git + name: /plans/tier1/internal + +/tier1-public: + plan: + import: + url: https://gitlab.com/redhat/centos-stream/tests/vim.git + name: /plans/tier1/public + +/tier2-tier3-internal: + plan: + import: + url: https://gitlab.com/redhat/centos-stream/tests/vim.git + name: /plans/tier2-tier3/internal + +/tier2-tier3-public: + plan: + import: + url: https://gitlab.com/redhat/centos-stream/tests/vim.git + name: /plans/tier2-tier3/public + +/others-internal: + plan: + import: + url: https://gitlab.com/redhat/centos-stream/tests/vim.git + name: /plans/others/internal + +/others-public: + plan: + import: + url: https://gitlab.com/redhat/centos-stream/tests/vim.git + name: /plans/others/public \ No newline at end of file diff --git a/sources b/sources index f0aeecdd..14532821 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-2541.tar.bz2) = dbe254c609dac6fecd96ab8347f04bc6260efe0bf6703cc835dc46d952186db58508b5810adedc2e05ddccc663e67a14353f21ec8b712aded9921953af54be80 +SHA512 (vim-9.1-2068.tar.bz2) = f19ae5898f7c388f437fe03af23d956ef66706c2a629a3389622e0b583d9bd831dd4e250badb181fceacb2b52b1f8a6bda4f72fbece122b5f5097153daf774f3 diff --git a/vim-7.0-fixkeys.patch b/vim-7.0-fixkeys.patch index 1d5bc4ab..1b71d33e 100644 --- a/vim-7.0-fixkeys.patch +++ b/vim-7.0-fixkeys.patch @@ -1,26 +1,26 @@ -diff -up vim82/src/term.c.fixkeys vim82/src/term.c ---- vim82/src/term.c.fixkeys 2021-01-08 10:12:59.191309539 +0100 -+++ vim82/src/term.c 2021-01-08 10:18:05.410470981 +0100 -@@ -919,14 +919,14 @@ static struct builtin_term builtin_termc - {K_XRIGHT, IF_EB("\033[@;*C", ESC_STR "[@;*C")}, - {K_XLEFT, IF_EB("\033[@;*D", ESC_STR "[@;*D")}, +diff -up vim90/src/term.c.fixkeys vim90/src/term.c +--- vim90/src/term.c.fixkeys 2022-10-20 14:45:53.896659582 +0200 ++++ vim90/src/term.c 2022-10-20 14:48:28.958697659 +0200 +@@ -851,14 +851,14 @@ static struct builtin_term builtin_termc + {K_XRIGHT, "\033[@;*C"}, // Esc [ C or Esc [ 1 ; C + {K_XLEFT, "\033[@;*D"}, // Esc [ D or Esc [ 1 ; D // An extra set of function keys for vt100 mode -- {K_XF1, IF_EB("\033O*P", ESC_STR "O*P")}, -- {K_XF2, IF_EB("\033O*Q", ESC_STR "O*Q")}, -- {K_XF3, IF_EB("\033O*R", ESC_STR "O*R")}, -- {K_XF4, IF_EB("\033O*S", ESC_STR "O*S")}, -- {K_F1, IF_EB("\033[11;*~", ESC_STR "[11;*~")}, -- {K_F2, IF_EB("\033[12;*~", ESC_STR "[12;*~")}, -- {K_F3, IF_EB("\033[13;*~", ESC_STR "[13;*~")}, -- {K_F4, IF_EB("\033[14;*~", ESC_STR "[14;*~")}, -+ {K_XF1, IF_EB("\033[11~", ESC_STR "[11~")}, -+ {K_XF2, IF_EB("\033[12~", ESC_STR "[12~")}, -+ {K_XF3, IF_EB("\033[13~", ESC_STR "[13~")}, -+ {K_XF4, IF_EB("\033[14~", ESC_STR "[14~")}, -+ {K_F1, IF_EB("\033OP", ESC_STR "OP")}, -+ {K_F2, IF_EB("\033OQ", ESC_STR "OQ")}, -+ {K_F3, IF_EB("\033OR", ESC_STR "OR")}, -+ {K_F4, IF_EB("\033OS", ESC_STR "OS")}, - {K_F5, IF_EB("\033[15;*~", ESC_STR "[15;*~")}, - {K_F6, IF_EB("\033[17;*~", ESC_STR "[17;*~")}, - {K_F7, IF_EB("\033[18;*~", ESC_STR "[18;*~")}, +- {K_XF1, "\033O*P"}, +- {K_XF2, "\033O*Q"}, +- {K_XF3, "\033O*R"}, +- {K_XF4, "\033O*S"}, +- {K_F1, "\033[11;*~"}, +- {K_F2, "\033[12;*~"}, +- {K_F3, "\033[13;*~"}, +- {K_F4, "\033[14;*~"}, ++ {K_XF1, "\033[11~"}, ++ {K_XF2, "\033[12~"}, ++ {K_XF3, "\033[13~"}, ++ {K_XF4, "\033[14~"}, ++ {K_F1, "\033OP"}, ++ {K_F2, "\033OQ"}, ++ {K_F3, "\033OR"}, ++ {K_F4, "\033OS"}, + {K_F5, "\033[15;*~"}, + {K_F6, "\033[17;*~"}, + {K_F7, "\033[18;*~"}, diff --git a/vim-7.0-rclocation.patch b/vim-7.0-rclocation.patch deleted file mode 100644 index 840f53e8..00000000 --- a/vim-7.0-rclocation.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- vim62/src/os_unix.h.rcloc 2003-08-04 15:38:05.000000000 +0200 -+++ vim62/src/os_unix.h 2003-08-04 15:39:25.000000000 +0200 -@@ -230,10 +230,10 @@ - * Unix system-dependent file names - */ - #ifndef SYS_VIMRC_FILE --# define SYS_VIMRC_FILE "$VIM/vimrc" -+# define SYS_VIMRC_FILE "/etc/vimrc" - #endif - #ifndef SYS_GVIMRC_FILE --# define SYS_GVIMRC_FILE "$VIM/gvimrc" -+# define SYS_GVIMRC_FILE "/etc/gvimrc" - #endif - #ifndef DFLT_HELPFILE - # define DFLT_HELPFILE "$VIMRUNTIME/doc/help.txt" diff --git a/vim-7.4-fstabsyntax.patch b/vim-7.4-fstabsyntax.patch deleted file mode 100644 index 81d39da9..00000000 --- a/vim-7.4-fstabsyntax.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up vim82/runtime/syntax/fstab.vim.fstabsyntax vim82/runtime/syntax/fstab.vim ---- vim82/runtime/syntax/fstab.vim.fstabsyntax 2020-08-10 12:08:01.000000000 +0200 -+++ vim82/runtime/syntax/fstab.vim 2020-08-10 12:17:22.540855735 +0200 -@@ -56,7 +56,7 @@ syn keyword fsMountPointKeyword containe - " Type - syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeUnknown - syn match fsTypeUnknown /\s\+\zs\w\+/ contained --syn keyword fsTypeKeyword contained adfs ados affs anon_inodefs atfs audiofs auto autofs bdev befs bfs btrfs binfmt_misc cd9660 cfs cgroup cifs coda configfs cpuset cramfs devfs devpts devtmpfs e2compr efs ext2 ext2fs ext3 ext4 fdesc ffs filecore fuse fuseblk fusectl hfs hpfs hugetlbfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix mqueue msdos ncpfs nfs nfsd nilfs2 none ntfs null nwfs overlay ovlfs pipefs portal proc procfs pstore ptyfs qnx4 reiserfs ramfs romfs securityfs shm smbfs squashfs sockfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xenfs xfs zisofs -+syn keyword fsTypeKeyword contained adfs ados affs anon_inodefs atfs audiofs auto autofs bdev befs bfs btrfs binfmt_misc cd9660 cfs cgroup cifs coda configfs cpuset cramfs devfs devpts devtmpfs e2compr efs ext2 ext2fs ext3 ext4 fdesc ffs filecore fuse fuseblk fusectl hfs hpfs hugetlbfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix mqueue msdos ncpfs nfs nfsd nilfs2 none ntfs null nwfs overlay ovlfs pipefs portal proc procfs pstore ptyfs qnx4 reiserfs ramfs romfs rpc_pipefs securityfs shm smbfs squashfs sockfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xenfs xfs zisofs - - " Options - " ------- -@@ -68,7 +68,7 @@ syn match fsOptionsString /[a-zA-Z0-9_-] - syn keyword fsOptionsYesNo yes no - syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck - syn keyword fsOptionsSize 512 1024 2048 --syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand norelatime nosuid nosymfollow nouser owner rbind rdonly relatime remount ro rq rw suid suiddir supermount sw sync union update user users wxallowed xx nofail failok -+syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop managed mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand norelatime nosuid nosymfollow nouser owner pamconsole rbind rdonly relatime remount ro rq rw suid suiddir supermount sw sync union update user users wxallowed xx nofail - syn match fsOptionsGeneral /_netdev/ - - " Options: adfs diff --git a/vim-7.4-globalsyntax.patch b/vim-7.4-globalsyntax.patch index 4503f2d0..2f7fe16b 100644 --- a/vim-7.4-globalsyntax.patch +++ b/vim-7.4-globalsyntax.patch @@ -1,13 +1,12 @@ -diff --git a/runtime/syntax/spec.vim b/runtime/syntax/spec.vim -index 1a5a108..b709d20 100644 ---- a/runtime/syntax/spec.vim -+++ b/runtime/syntax/spec.vim -@@ -111,7 +111,7 @@ syn region specDescriptionArea matchgroup=specSection start='^%description' end= +diff -up vim91/runtime/syntax/spec.vim.globalsyntax vim91/runtime/syntax/spec.vim +--- vim91/runtime/syntax/spec.vim.globalsyntax 2024-09-20 22:29:01.858870640 +0200 ++++ vim91/runtime/syntax/spec.vim 2024-09-20 22:31:43.776217933 +0200 +@@ -112,7 +112,7 @@ syn region specDescriptionArea matchgrou syn region specPackageArea matchgroup=specSection start='^%package' end='^%'me=e-1 contains=specPackageOpts,specPreAmble,specComment "%% Scripts Section %% --syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|clean\|check\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|autosetup\|autopatch\|find_lang\|make_build\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2 -+syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|clean\|check\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|global\|patch\d*\|configure\|GNUconfigure\|setup\|autosetup\|autopatch\|find_lang\|make_build\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2 +-syn region specScriptArea matchgroup=specSection start='^%\(prep\|generate_buildrequires\|conf\|build\|install\|clean\|check\|pre\|postun\|preun\|post\|posttrans\|filetriggerin\|filetriggerun\|filetriggerpostun\|transfiletriggerin\|transfiletriggerun\|transfiletriggerpostun\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|autosetup\|autopatch\|find_lang\|make_build\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2 ++syn region specScriptArea matchgroup=specSection start='^%\(prep\|generate_buildrequires\|conf\|build\|install\|clean\|check\|pre\|postun\|preun\|post\|posttrans\|filetriggerin\|filetriggerun\|filetriggerpostun\|transfiletriggerin\|transfiletriggerun\|transfiletriggerpostun\)\>' skip='^%{\|^%\(define\|global\|patch\d*\|configure\|GNUconfigure\|setup\|autosetup\|autopatch\|find_lang\|make_build\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2 "%% Changelog Section %% syn region specChangelogArea matchgroup=specSection start='^%changelog' end='^%'me=e-1 contains=specEmail,specURL,specWeekday,specMonth,specNumber,specComment,specLicense diff --git a/vim-7.4-nowarnings.patch b/vim-7.4-nowarnings.patch deleted file mode 100644 index fc4315a7..00000000 --- a/vim-7.4-nowarnings.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up vim82/src/ex_docmd.c.nowarnings vim82/src/ex_docmd.c ---- vim82/src/ex_docmd.c.nowarnings 2020-07-28 11:42:07.437603829 +0200 -+++ vim82/src/ex_docmd.c 2020-07-28 11:44:25.432201129 +0200 -@@ -4020,6 +4020,7 @@ get_flags(exarg_T *eap) - void - ex_ni(exarg_T *eap) - { -+ return; - if (!eap->skip) - eap->errmsg = - _("E319: Sorry, the command is not available in this version"); diff --git a/vim-7.4-releasestring-1318991.patch b/vim-7.4-releasestring-1318991.patch deleted file mode 100644 index 291b957f..00000000 --- a/vim-7.4-releasestring-1318991.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up vim74/runtime/ftplugin/spec.vim.1318991 vim74/runtime/ftplugin/spec.vim ---- vim74/runtime/ftplugin/spec.vim.1318991 2016-08-04 15:29:42.423862424 +0200 -+++ vim74/runtime/ftplugin/spec.vim 2016-08-04 15:31:08.797299188 +0200 -@@ -41,8 +41,8 @@ else: - headers = spec.sourceHeader - version = headers["Version"] - release = headers["Release"] -- vim.command("let ver = " + version) -- vim.command("let rel = " + release) -+ vim.command("let ver = '" + version + "'") -+ vim.command("let rel = '" + release + "'") - PYEND - endif - endfunction diff --git a/vim-7.4-specsyntax.patch b/vim-7.4-specsyntax.patch index 3c028b56..ace7607f 100644 --- a/vim-7.4-specsyntax.patch +++ b/vim-7.4-specsyntax.patch @@ -1,6 +1,6 @@ -diff -up vim74/runtime/syntax/spec.vim.highlite vim74/runtime/syntax/spec.vim ---- vim74/runtime/syntax/spec.vim.highlite 2016-07-04 10:17:45.000000000 +0200 -+++ vim74/runtime/syntax/spec.vim 2016-08-04 15:20:26.116049343 +0200 +diff -up vim91/runtime/syntax/spec.vim.spec-syntax vim91/runtime/syntax/spec.vim +--- vim91/runtime/syntax/spec.vim.spec-syntax 2025-11-14 07:38:27.000000000 +0100 ++++ vim91/runtime/syntax/spec.vim 2025-11-14 07:52:56.081212607 +0100 @@ -38,7 +38,7 @@ syn match specNoNumberHilite 'X11\|X11R6 syn match specManpageFile '[a-zA-Z]\.1' @@ -10,24 +10,12 @@ diff -up vim74/runtime/syntax/spec.vim.highlite vim74/runtime/syntax/spec.vim syn keyword specWeekday contained Mon Tue Wed Thu Fri Sat Sun syn keyword specMonth contained Jan Feb Mar Apr Jun Jul Aug Sep Oct Nov Dec syn keyword specMonth contained January February March April May June July August September October November December -@@ -61,9 +61,9 @@ syn cluster specListedFiles contains=spe - - "specComands - syn match specConfigure contained '\./configure' --syn match specTarCommand contained '\". inoremap u @@ -20,3 +20,76 @@ diff -up vim82/runtime/defaults.vim.copypaste vim82/runtime/defaults.vim " Only do this part when Vim was compiled with the +eval feature. if 1 +diff -up vim91/src/testdir/test_balloon.vim.copypaste vim91/src/testdir/test_balloon.vim +--- vim91/src/testdir/test_balloon.vim.copypaste 2025-07-11 09:16:19.013500976 +0200 ++++ vim91/src/testdir/test_balloon.vim 2025-07-11 09:17:20.168187029 +0200 +@@ -7,6 +7,7 @@ CheckFeature balloon_eval_term + source util/screendump.vim + + let s:common_script =<< trim [CODE] ++ set mouse=a + call setline(1, ["one one one", "two tXo two", "three three three"]) + set balloonevalterm balloonexpr=MyBalloonExpr()..s:trailing balloondelay=100 + let s:trailing = '<' " check that script context is set +diff -up vim91/src/testdir/test_popup.vim.copypaste vim91/src/testdir/test_popup.vim +--- vim91/src/testdir/test_popup.vim.copypaste 2025-07-11 08:58:40.000000000 +0200 ++++ vim91/src/testdir/test_popup.vim 2025-07-11 09:16:19.013692144 +0200 +@@ -957,6 +957,7 @@ func Test_mouse_popup_position() + let script =<< trim END + set mousemodel=popup_setpos + source $VIMRUNTIME/menu.vim ++ set mouse=a + call setline(1, join(range(20))) + func Trigger(col) + call test_setmouse(1, a:col) +diff -up vim91/src/testdir/test_popupwin.vim.copypaste vim91/src/testdir/test_popupwin.vim +--- vim91/src/testdir/test_popupwin.vim.copypaste 2025-07-11 08:58:40.000000000 +0200 ++++ vim91/src/testdir/test_popupwin.vim 2025-07-11 09:16:19.013971633 +0200 +@@ -556,6 +556,7 @@ func Test_popup_drag() + " create a popup that covers the command line + let lines =<< trim END + call setline(1, range(1, 20)) ++ set mouse=a + split + vsplit + $wincmd w +@@ -623,6 +624,7 @@ func Test_popup_drag_minwidth() + + " create a popup that does not fit + let lines =<< trim END ++ set mouse=a + call range(40) + \ ->map({_,i -> string(i)}) + \ ->popup_create({ +@@ -670,6 +672,7 @@ func Test_popup_drag_termwin() + let lines =<< trim END + set foldmethod=marker + call setline(1, range(100)) ++ set mouse=a + for nr in range(7) + call setline(nr * 12 + 1, "fold {{{") + call setline(nr * 12 + 11, "end }}}") +@@ -722,6 +725,7 @@ func Test_popup_close_with_mouse() + + let lines =<< trim END + call setline(1, range(1, 20)) ++ set mouse=a + " With border, can click on X + let winid = popup_create('foobar', #{ + \ close: 'button', +@@ -1559,6 +1563,7 @@ func Test_popup_beval() + let lines =<< trim END + call setline(1, range(1, 20)) + call setline(5, 'here is some text to hover over') ++ set mouse=a + set balloonevalterm + set balloonexpr=BalloonExpr() + set balloondelay=100 +@@ -2269,6 +2274,7 @@ func Test_popup_scrollbar() + + let lines =<< trim END + call setline(1, range(1, 20)) ++ set mouse=a + hi ScrollThumb ctermbg=blue + hi ScrollBar ctermbg=red + let winid = popup_create(['one', 'two', 'three', 'four', 'five', diff --git a/vim-crypto-warning.patch b/vim-crypto-warning.patch index 6d5e6ac1..6f55807f 100644 --- a/vim-crypto-warning.patch +++ b/vim-crypto-warning.patch @@ -1,11 +1,10 @@ -diff -up vim81/src/config.h.in.crypto vim81/src/config.h.in ---- vim81/src/config.h.in.crypto 2019-07-26 07:58:51.000000000 +0200 -+++ vim81/src/config.h.in 2019-09-16 14:18:32.994110646 +0200 -@@ -490,3 +490,12 @@ +diff -up vim91/src/config.h.in.fips-warning vim91/src/config.h.in +--- vim91/src/config.h.in.fips-warning 2025-10-31 08:12:59.598267544 +0100 ++++ vim91/src/config.h.in 2025-10-31 08:14:45.661859595 +0100 +@@ -526,5 +526,14 @@ + /* Define if _SC_SIGSTKSZ is available via sysconf() */ + #undef HAVE_SYSCONF_SIGSTKSZ - /* Define to inline symbol or empty */ - #undef inline -+ +/* Do we need FIPS warning? */ +#undef HAVE_FIPS_WARNING + @@ -14,11 +13,14 @@ diff -up vim81/src/config.h.in.crypto vim81/src/config.h.in + +/* Link to fips_enabled file */ +#undef FIPS_ENABLED_FILE_LINK -diff -up vim81/src/configure.ac.crypto vim81/src/configure.ac ---- vim81/src/configure.ac.crypto 2019-09-16 14:18:32.990110675 +0200 -+++ vim81/src/configure.ac 2019-09-16 14:18:32.996110631 +0200 -@@ -534,6 +534,38 @@ else - AC_MSG_RESULT(yes) ++ + /* Define if you want to load libgpm dynamically */ + #undef DYNAMIC_GPM +diff -up vim91/src/configure.ac.fips-warning vim91/src/configure.ac +--- vim91/src/configure.ac.fips-warning 2025-10-31 08:12:59.596711911 +0100 ++++ vim91/src/configure.ac 2025-10-31 08:12:59.598566242 +0100 +@@ -631,6 +631,38 @@ else + AC_SUBST(XDIFF_OBJS_USED) fi +dnl Checking if we want FIPS warning @@ -56,17 +58,17 @@ diff -up vim81/src/configure.ac.crypto vim81/src/configure.ac dnl Check for Lua feature. AC_MSG_CHECKING(--enable-luainterp argument) AC_ARG_ENABLE(luainterp, -diff -up vim81/src/crypt.c.crypto vim81/src/crypt.c ---- vim81/src/crypt.c.crypto 2019-09-16 14:18:32.996110631 +0200 -+++ vim81/src/crypt.c 2019-09-16 14:19:48.953550617 +0200 -@@ -524,6 +524,21 @@ crypt_check_method(int method) +diff -up vim91/src/crypt.c.fips-warning vim91/src/crypt.c +--- vim91/src/crypt.c.fips-warning 2025-10-10 07:16:11.000000000 +0200 ++++ vim91/src/crypt.c 2025-10-31 08:12:59.598872032 +0100 +@@ -806,6 +806,21 @@ crypt_check_method(int method) msg_scroll = TRUE; msg(_("Warning: Using a weak encryption method; see :help 'cm'")); } +#ifdef HAVE_FIPS_WARNING + FILE *fips_enable_fd = fopen(FIPS_ENABLED_FILE_LINK, "r"); + if (fips_enable_fd == NULL) -+ return; ++ return; + + int enabled = fgetc(fips_enable_fd); + @@ -80,4 +82,4 @@ diff -up vim81/src/crypt.c.crypto vim81/src/crypt.c +#endif } - void + /* diff --git a/vim-manpagefixes-948566.patch b/vim-manpagefixes-948566.patch index 6f495600..c0806d65 100644 --- a/vim-manpagefixes-948566.patch +++ b/vim-manpagefixes-948566.patch @@ -1,38 +1,7 @@ -diff -up vim73/runtime/doc/vim.man.rh1 vim73/runtime/doc/vim.man ---- vim73/runtime/doc/vim.man.rh1 2013-07-26 11:26:20.566576864 +0200 -+++ vim73/runtime/doc/vim.man 2013-07-26 11:47:42.061351469 +0200 -@@ -11,9 +11,9 @@ SYNOPSIS - vim [options] -t tag - vim [options] -q [errorfile] - -- ex -+ ex gex - view -- gvim gview evim eview -+ gvim gview vimx evim eview - rvim rview rgvim rgview - - DESCRIPTION -@@ -79,8 +79,13 @@ DESCRIPTION - the files. Can also be done with the "-R" argument. - - gvim gview -- The GUI version. Starts a new window. Can also be done with -- the "-g" argument. -+ The GUI version. Starts a new window. -+ -+ gex Starts a new gvim window in Ex mode. Can also be done with -+ the "-e" argument to gvim. -+ -+ vimx Starts gvim in "Vi" mode similar to "vim", but with -+ additional features like xterm clipboard support. - - evim eview - The GUI version in easy mode. Starts a new window. Can also -diff -urN vim73/runtime/doc/vim.1 vim73_new/runtime/doc/vim.1 ---- vim73/runtime/doc/vim.1 2013-07-31 14:13:01.039765800 +0200 -+++ vim73_new/runtime/doc/vim.1 2013-07-31 13:57:59.861912768 +0200 -@@ -17,11 +17,13 @@ +diff -up vim91/runtime/doc/vim.1.manpagefixes vim91/runtime/doc/vim.1 +--- vim91/runtime/doc/vim.1.manpagefixes 2024-11-29 12:17:53.553382696 +0100 ++++ vim91/runtime/doc/vim.1 2024-11-29 12:17:53.556382667 +0100 +@@ -17,11 +17,13 @@ vim \- Vi IMproved, a programmer's text .PP .br .B ex @@ -46,7 +15,7 @@ diff -urN vim73/runtime/doc/vim.1 vim73_new/runtime/doc/vim.1 .B evim .B eview .br -@@ -114,7 +116,12 @@ +@@ -114,7 +116,12 @@ Can also be done with the "\-R" argument gvim gview The GUI version. Starts a new window. @@ -60,7 +29,7 @@ diff -urN vim73/runtime/doc/vim.1 vim73_new/runtime/doc/vim.1 .TP evim eview The GUI version in easy mode. -@@ -458,6 +458,12 @@ +@@ -491,6 +498,12 @@ As \-\-remote, but Vim does not exit unt \-\-remote\-wait\-silent As \-\-remote\-wait, but without the warning when no server is found. .TP @@ -73,10 +42,10 @@ diff -urN vim73/runtime/doc/vim.1 vim73_new/runtime/doc/vim.1 \-\-serverlist List the names of all Vim servers that can be found. .TP -diff -urN vim73/runtime/doc/vim-fr.1 vim73_new/runtime/doc/vim-fr.1 ---- vim73/runtime/doc/vim-fr.1 2010-05-15 13:04:00.000000000 +0200 -+++ vim73_new/runtime/doc/vim-fr.1 2013-07-31 13:59:10.587467916 +0200 -@@ -24,11 +24,13 @@ +diff -up vim91/runtime/doc/vim-fr.1.manpagefixes vim91/runtime/doc/vim-fr.1 +--- vim91/runtime/doc/vim-fr.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100 ++++ vim91/runtime/doc/vim-fr.1 2024-11-29 12:17:53.556382667 +0100 +@@ -24,11 +24,13 @@ vim \- Vi IMproved, diteur de texte pou .PP .br .B ex @@ -90,10 +59,10 @@ diff -urN vim73/runtime/doc/vim-fr.1 vim73_new/runtime/doc/vim-fr.1 .B evim .B eview .br -diff -urN vim73/runtime/doc/vim-fr.UTF-8.1 vim73_new/runtime/doc/vim-fr.UTF-8.1 ---- vim73/runtime/doc/vim-fr.UTF-8.1 2010-05-15 13:04:00.000000000 +0200 -+++ vim73_new/runtime/doc/vim-fr.UTF-8.1 2013-07-31 13:59:28.394852347 +0200 -@@ -24,11 +24,13 @@ +diff -up vim91/runtime/doc/vim-fr.UTF-8.1.manpagefixes vim91/runtime/doc/vim-fr.UTF-8.1 +--- vim91/runtime/doc/vim-fr.UTF-8.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100 ++++ vim91/runtime/doc/vim-fr.UTF-8.1 2024-11-29 12:17:53.556382667 +0100 +@@ -24,11 +24,13 @@ vim \- Vi IMproved, éditeur de texte po .PP .br .B ex @@ -107,10 +76,10 @@ diff -urN vim73/runtime/doc/vim-fr.UTF-8.1 vim73_new/runtime/doc/vim-fr.UTF-8.1 .B evim .B eview .br -diff -urN vim73/runtime/doc/vim-it.1 vim73_new/runtime/doc/vim-it.1 ---- vim73/runtime/doc/vim-it.1 2010-07-27 22:22:52.000000000 +0200 -+++ vim73_new/runtime/doc/vim-it.1 2013-07-31 13:59:43.474331077 +0200 -@@ -17,11 +17,13 @@ +diff -up vim91/runtime/doc/vim-it.1.manpagefixes vim91/runtime/doc/vim-it.1 +--- vim91/runtime/doc/vim-it.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100 ++++ vim91/runtime/doc/vim-it.1 2024-11-29 12:17:53.557382658 +0100 +@@ -17,11 +17,13 @@ vim \- VI Migliorato, un editor di testi .PP .br .B ex @@ -124,10 +93,10 @@ diff -urN vim73/runtime/doc/vim-it.1 vim73_new/runtime/doc/vim-it.1 .B evim .B eview .br -diff -urN vim73/runtime/doc/vim-it.UTF-8.1 vim73_new/runtime/doc/vim-it.UTF-8.1 ---- vim73/runtime/doc/vim-it.UTF-8.1 2010-07-30 20:53:57.000000000 +0200 -+++ vim73_new/runtime/doc/vim-it.UTF-8.1 2013-07-31 13:59:55.985898573 +0200 -@@ -17,11 +17,13 @@ +diff -up vim91/runtime/doc/vim-it.UTF-8.1.manpagefixes vim91/runtime/doc/vim-it.UTF-8.1 +--- vim91/runtime/doc/vim-it.UTF-8.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100 ++++ vim91/runtime/doc/vim-it.UTF-8.1 2024-11-29 12:17:53.557382658 +0100 +@@ -17,11 +17,13 @@ vim \- VI Migliorato, un editor di testi .PP .br .B ex @@ -141,26 +110,41 @@ diff -urN vim73/runtime/doc/vim-it.UTF-8.1 vim73_new/runtime/doc/vim-it.UTF-8.1 .B evim .B eview .br -diff -urN vim73/runtime/doc/vim.man vim73_new/runtime/doc/vim.man ---- vim73/runtime/doc/vim.man 2013-07-31 14:13:01.044765627 +0200 -+++ vim73_new/runtime/doc/vim.man 2013-07-31 13:53:35.107064804 +0200 -@@ -82,10 +82,10 @@ - The GUI version. Starts a new window. +diff -up vim91/runtime/doc/vim.man.manpagefixes vim91/runtime/doc/vim.man +--- vim91/runtime/doc/vim.man.manpagefixes 2024-11-15 06:32:23.000000000 +0100 ++++ vim91/runtime/doc/vim.man 2024-11-29 12:17:53.557382658 +0100 +@@ -9,9 +9,9 @@ SYNOPSIS + vim [options] -t tag + vim [options] -q [errorfile] - gex Starts a new gvim window in Ex mode. Can also be done with -- the "-e" argument to gvim. +- ex ++ ex gex + view +- gvim gview evim eview ++ gvim gview vimx evim eview + rvim rview rgvim rgview + + DESCRIPTION +@@ -77,8 +77,13 @@ DESCRIPTION + the files. Can also be done with the "-R" argument. + + gvim gview +- The GUI version. Starts a new window. Can also be done with +- the "-g" argument. ++ The GUI version. Starts a new window. ++ ++ gex Starts a new gvim window in Ex mode. Can also be done with + the "-e" argument to gvim - - vimx Starts gvim in "Vi" mode similar to "vim", but with -- additional features like xterm clipboard support. ++ ++ vimx Starts gvim in "Vi" mode similar to "vim", but with + additional features like xterm clipboard support evim eview The GUI version in easy mode. Starts a new window. Can also -diff -urN vim73/runtime/doc/vim-pl.1 vim73_new/runtime/doc/vim-pl.1 ---- vim73/runtime/doc/vim-pl.1 2010-05-15 13:04:01.000000000 +0200 -+++ vim73_new/runtime/doc/vim-pl.1 2013-07-31 14:00:21.282024131 +0200 -@@ -17,11 +17,13 @@ +diff -up vim91/runtime/doc/vim-pl.1.manpagefixes vim91/runtime/doc/vim-pl.1 +--- vim91/runtime/doc/vim-pl.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100 ++++ vim91/runtime/doc/vim-pl.1 2024-11-29 12:17:53.557382658 +0100 +@@ -17,11 +17,13 @@ vim \- Vi rozbudowany, edytor tekstu dla .PP .br .B ex @@ -174,10 +158,10 @@ diff -urN vim73/runtime/doc/vim-pl.1 vim73_new/runtime/doc/vim-pl.1 .B evim .B eview .br -diff -urN vim73/runtime/doc/vim-pl.UTF-8.1 vim73_new/runtime/doc/vim-pl.UTF-8.1 ---- vim73/runtime/doc/vim-pl.UTF-8.1 2010-05-15 13:37:38.000000000 +0200 -+++ vim73_new/runtime/doc/vim-pl.UTF-8.1 2013-07-31 14:00:36.056513402 +0200 -@@ -17,11 +17,13 @@ +diff -up vim91/runtime/doc/vim-pl.UTF-8.1.manpagefixes vim91/runtime/doc/vim-pl.UTF-8.1 +--- vim91/runtime/doc/vim-pl.UTF-8.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100 ++++ vim91/runtime/doc/vim-pl.UTF-8.1 2024-11-29 12:17:53.558382649 +0100 +@@ -17,11 +17,13 @@ vim \- Vi rozbudowany, edytor tekstu dla .PP .br .B ex @@ -191,10 +175,10 @@ diff -urN vim73/runtime/doc/vim-pl.UTF-8.1 vim73_new/runtime/doc/vim-pl.UTF-8.1 .B evim .B eview .br -diff -urN vim73/runtime/doc/vim-ru.1 vim73_new/runtime/doc/vim-ru.1 ---- vim73/runtime/doc/vim-ru.1 2010-05-15 13:04:00.000000000 +0200 -+++ vim73_new/runtime/doc/vim-ru.1 2013-07-31 14:01:10.071337568 +0200 -@@ -17,11 +17,15 @@ +diff -up vim91/runtime/doc/vim-ru.1.manpagefixes vim91/runtime/doc/vim-ru.1 +--- vim91/runtime/doc/vim-ru.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100 ++++ vim91/runtime/doc/vim-ru.1 2024-11-29 12:17:53.558382649 +0100 +@@ -18,11 +18,13 @@ .PP .br .B ex @@ -205,15 +189,13 @@ diff -urN vim73/runtime/doc/vim-ru.1 vim73_new/runtime/doc/vim-ru.1 .B gvim .B gview +.B vimx -+.B evim -+.B eview + .B evim + .B eview .br - .B rvim - .B rview -diff -urN vim73/runtime/doc/vim-ru.UTF-8.1 vim73_new/runtime/doc/vim-ru.UTF-8.1 ---- vim73/runtime/doc/vim-ru.UTF-8.1 2010-05-15 13:04:00.000000000 +0200 -+++ vim73_new/runtime/doc/vim-ru.UTF-8.1 2013-07-31 14:01:34.494493301 +0200 -@@ -17,11 +17,15 @@ +diff -up vim91/runtime/doc/vim-ru.UTF-8.1.manpagefixes vim91/runtime/doc/vim-ru.UTF-8.1 +--- vim91/runtime/doc/vim-ru.UTF-8.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100 ++++ vim91/runtime/doc/vim-ru.UTF-8.1 2024-11-29 12:17:53.558382649 +0100 +@@ -18,11 +18,13 @@ программистов. .PP .br .B ex @@ -224,62 +206,60 @@ diff -urN vim73/runtime/doc/vim-ru.UTF-8.1 vim73_new/runtime/doc/vim-ru.UTF-8.1 .B gvim .B gview +.B vimx -+.B evim -+.B eview + .B evim + .B eview .br - .B rvim - .B rview -diff -urN vim73/runtime/doc/vimtutor.1 vim73_new/runtime/doc/vimtutor.1 ---- vim73/runtime/doc/vimtutor.1 2010-05-15 13:04:00.000000000 +0200 -+++ vim73_new/runtime/doc/vimtutor.1 2013-07-31 14:10:10.093671964 +0200 -@@ -4,6 +4,8 @@ - .SH SYNOPSIS +diff -up vim91/runtime/doc/vimtutor.1.manpagefixes vim91/runtime/doc/vimtutor.1 +--- vim91/runtime/doc/vimtutor.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100 ++++ vim91/runtime/doc/vimtutor.1 2024-11-29 12:17:53.559382639 +0100 +@@ -8,6 +8,8 @@ vimtutor \- the Vim tutor + .B vimtutor [\-h | \-\-help] .br - .B vimtutor [\-g] [language] + .B vimtutor [\-\-list] +.br +.B gvimtutor .SH DESCRIPTION .B Vimtutor starts the -diff -urN vim73/runtime/doc/vimtutor-it.1 vim73_new/runtime/doc/vimtutor-it.1 ---- vim73/runtime/doc/vimtutor-it.1 2010-07-27 22:35:32.000000000 +0200 -+++ vim73_new/runtime/doc/vimtutor-it.1 2013-07-31 14:10:33.564861055 +0200 -@@ -4,6 +4,8 @@ - .SH SINTASSI +diff -up vim91/runtime/doc/vimtutor-it.1.manpagefixes vim91/runtime/doc/vimtutor-it.1 +--- vim91/runtime/doc/vimtutor-it.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100 ++++ vim91/runtime/doc/vimtutor-it.1 2024-11-29 12:17:53.559382639 +0100 +@@ -8,6 +8,8 @@ vimtutor \- Un breve corso introduttivo + .B vimtutor [\-h | \-\-help] .br - .B vimtutor [\-g] [lingua] + .B vimtutor [\-\-list] +.br +.B gvimtutor .SH DESCRIZIONE .B Vimtutor inizia il -diff -urN vim73/runtime/doc/vimtutor-it.UTF-8.1 vim73_new/runtime/doc/vimtutor-it.UTF-8.1 ---- vim73/runtime/doc/vimtutor-it.UTF-8.1 2010-07-30 20:53:57.000000000 +0200 -+++ vim73_new/runtime/doc/vimtutor-it.UTF-8.1 2013-07-31 14:10:40.483622016 +0200 -@@ -4,6 +4,8 @@ - .SH SINTASSI +diff -up vim91/runtime/doc/vimtutor-it.UTF-8.1.manpagefixes vim91/runtime/doc/vimtutor-it.UTF-8.1 +--- vim91/runtime/doc/vimtutor-it.UTF-8.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100 ++++ vim91/runtime/doc/vimtutor-it.UTF-8.1 2024-11-29 12:17:53.559382639 +0100 +@@ -8,6 +8,8 @@ vimtutor \- Un breve corso introduttivo + .B vimtutor [\-h | \-\-help] .br - .B vimtutor [\-g] [lingua] + .B vimtutor [\-\-list] +.br +.B gvimtutor .SH DESCRIZIONE .B Vimtutor inizia il -diff -urN vim73/runtime/doc/vimtutor.man vim73_new/runtime/doc/vimtutor.man ---- vim73/runtime/doc/vimtutor.man 2010-05-15 13:04:00.000000000 +0200 -+++ vim73_new/runtime/doc/vimtutor.man 2013-07-31 14:11:04.786782356 +0200 -@@ -7,6 +7,7 @@ - - SYNOPSIS - vimtutor [-g] [language] +diff -up vim91/runtime/doc/vimtutor.man.manpagefixes vim91/runtime/doc/vimtutor.man +--- vim91/runtime/doc/vimtutor.man.manpagefixes 2024-11-15 06:32:23.000000000 +0100 ++++ vim91/runtime/doc/vimtutor.man 2024-11-29 12:17:53.559382639 +0100 +@@ -8,6 +8,7 @@ SYNOPSIS + [ISO639] + vimtutor [-h | --help] + vimtutor [--list] + gvimtutor DESCRIPTION - Vimtutor starts the Vim tutor. It copies the tutor file first, so that -diff -urN vim73/runtime/doc/vimtutor-pl.1 vim73_new/runtime/doc/vimtutor-pl.1 ---- vim73/runtime/doc/vimtutor-pl.1 2010-05-15 13:04:00.000000000 +0200 -+++ vim73_new/runtime/doc/vimtutor-pl.1 2013-07-31 14:11:13.602477777 +0200 -@@ -4,6 +4,8 @@ + Vimtutor starts the Vim tutor. +diff -up vim91/runtime/doc/vimtutor-pl.1.manpagefixes vim91/runtime/doc/vimtutor-pl.1 +--- vim91/runtime/doc/vimtutor-pl.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100 ++++ vim91/runtime/doc/vimtutor-pl.1 2024-11-29 12:17:53.559382639 +0100 +@@ -4,6 +4,8 @@ vimtutor \- nauczyciel Vima .SH SYNOPSIS .br .B vimtutor -g [jzyk] @@ -288,10 +268,10 @@ diff -urN vim73/runtime/doc/vimtutor-pl.1 vim73_new/runtime/doc/vimtutor-pl.1 .SH OPIS .B Vimtutor uruchamia nauczyciela -diff -urN vim73/runtime/doc/vimtutor-pl.UTF-8.1 vim73_new/runtime/doc/vimtutor-pl.UTF-8.1 ---- vim73/runtime/doc/vimtutor-pl.UTF-8.1 2010-05-15 13:04:00.000000000 +0200 -+++ vim73_new/runtime/doc/vimtutor-pl.UTF-8.1 2013-07-31 14:11:20.571237009 +0200 -@@ -4,6 +4,8 @@ +diff -up vim91/runtime/doc/vimtutor-pl.UTF-8.1.manpagefixes vim91/runtime/doc/vimtutor-pl.UTF-8.1 +--- vim91/runtime/doc/vimtutor-pl.UTF-8.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100 ++++ vim91/runtime/doc/vimtutor-pl.UTF-8.1 2024-11-29 12:17:53.560382630 +0100 +@@ -4,6 +4,8 @@ vimtutor \- nauczyciel Vima .SH SYNOPSIS .br .B vimtutor -g [język] @@ -300,27 +280,27 @@ diff -urN vim73/runtime/doc/vimtutor-pl.UTF-8.1 vim73_new/runtime/doc/vimtutor-p .SH OPIS .B Vimtutor uruchamia nauczyciela -diff -urN vim73/runtime/doc/vimtutor-ru.1 vim73_new/runtime/doc/vimtutor-ru.1 ---- vim73/runtime/doc/vimtutor-ru.1 2010-05-15 13:04:00.000000000 +0200 -+++ vim73_new/runtime/doc/vimtutor-ru.1 2013-07-31 14:11:35.673715221 +0200 -@@ -4,6 +4,8 @@ - .SH +diff -up vim91/runtime/doc/vimtutor-ru.1.manpagefixes vim91/runtime/doc/vimtutor-ru.1 +--- vim91/runtime/doc/vimtutor-ru.1.manpagefixes 2024-11-29 12:17:53.560382630 +0100 ++++ vim91/runtime/doc/vimtutor-ru.1 2024-11-29 12:20:14.883047832 +0100 +@@ -8,6 +8,8 @@ + .B vimtutor [\-h | \-\-help] .br - .B vimtutor [] + .B vimtutor [\-\-list] +.br +.B gvimtutor .SH - + .B vimtutor -diff -urN vim73/runtime/doc/vimtutor-ru.UTF-8.1 vim73_new/runtime/doc/vimtutor-ru.UTF-8.1 ---- vim73/runtime/doc/vimtutor-ru.UTF-8.1 2010-05-15 13:04:00.000000000 +0200 -+++ vim73_new/runtime/doc/vimtutor-ru.UTF-8.1 2013-07-31 14:11:46.649335999 +0200 -@@ -7,6 +7,8 @@ +diff -up vim91/runtime/doc/vimtutor-ru.UTF-8.1.manpagefixes vim91/runtime/doc/vimtutor-ru.UTF-8.1 +--- vim91/runtime/doc/vimtutor-ru.UTF-8.1.manpagefixes 2024-11-29 12:17:53.560382630 +0100 ++++ vim91/runtime/doc/vimtutor-ru.UTF-8.1 2024-11-29 12:19:27.318497067 +0100 +@@ -11,6 +11,8 @@ Программа vimtutor \[em] вып .SH ОПИСАНИЕ - Команда + По команде .B vimtutor +.br +.B gvimtutor - запускает учебник по + выполняется запуск редактора .B Vim. - При этом сначала происходит создание копии файла учебника, + с загруженным файлом, содержащем текст учебника. diff --git a/vim-update.sh b/vim-update.sh index 34184df8..fc37e160 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -1,10 +1,13 @@ #!/bin/bash debug="" #debug="echo " -branches=( "rawhide" "f34" "f33" "f32" ) -releases=( "fc35" "fc34" "fc33" "fc32" ) -regexps=( "fc35" "\|fc34" "\|fc33" "\|fc32" ) -bodhi_enabled=( "0" "0" "1" "1" ) +branches=( "rawhide" "f43" "f42" ) +releases=( "fc44" "fc43" "fc42" ) +# the first bodhi enabled release is the last without \| - all +# others need to have \| +regexps=( "fc44" "fc43" "\|fc42" ) +bodhi_enabled=( "0" "1" "1" ) +needs_update=() #releases_regexp=fc28\\\|fc27\\\|fc28 branches_index=0 @@ -12,7 +15,7 @@ release_index=0 regexp_index=0 bodhi_enabled_index=0 done_build=0 -releases_regexp="${regexps[@]: regexp_index: 1}" +releases_regexp="" let "regexp_index+=1" cd `dirname $0` @@ -103,23 +106,12 @@ if [ $CHANGES -ne 0 ]; then exit 1 fi - # Check if release has pending or testing update - if not, build package - # and submit update for testing - pending_update=`bodhi updates query --packages vim --status pending \ - | grep $releases_regexp` - testing_update=`bodhi updates query --packages vim --status testing \ - | grep $releases_regexp` - - if [ "$pending_update" == "" ] && [ "$testing_update" == "" ]; then - $debug fedpkg build - if [ $? -eq 0 ]; then - done_build=1 - else - echo "Error when building package in $branch" - exit 1 - fi + $debug fedpkg build + if [ $? -eq 0 ]; then + done_build=1 else - echo "There are pending/testing updates, do not build package." + echo "Error when building package in $branch" + exit 1 fi let "release_index+=1" @@ -131,9 +123,9 @@ if [ $CHANGES -ne 0 ]; then $debug fedpkg switch-branch $branch # merge with previous branch - $debug bash -c "git merge ${branches[@]: $branches_index: 1} <<<':x'" + $debug bash -c "git merge rawhide <<<':x'" if [ $? -ne 0 ]; then - echo "Error: git merge ${branches[@]: $branches_index: 1}" + echo "Error: git merge rawhide" exit 1 fi @@ -151,24 +143,27 @@ if [ $CHANGES -ne 0 ]; then exit 1 fi - # append next release to regexp - because we need to check if there aren't - # any testing updates from higher branches (lower branch cannot have - # bigger NVR than higher branch) in next iteration - releases_regexp="$releases_regexp${regexps[@]: regexp_index: 1}" + # append next release to regexp if the branch is enabled in bodhi - because we + # need to check if there aren't any testing updates from higher enabled branches + # (lower branch cannot have bigger NVR than higher branch) in next iteration + if [ ${bodhi_enabled[@]: $bodhi_enabled_index: 1} -eq 1 ] + then + releases_regexp="$releases_regexp${regexps[@]: regexp_index: 1}" + fi - # Check if release has pending or testing update - if not, build package + # Check if release has an update in testing - if not, build package # and submit update for testing - # | grep $releases_regexp` - # done_build is checking, if previous branch did build - lower branch can do + # done_build is a check, if previous branch did build - lower branch can do # a build only when higher branch build was ok. testing_update=`bodhi updates query --packages vim --status testing \ | grep $releases_regexp` if [ "$testing_update" == "" ] && [ $done_build -eq 1 ]; then $debug fedpkg build if [ $? -eq 0 ]; then - # if branch isn't rawhide or branch is enabled in bodhi, create update + # if branch isn't rawhide or branch is enabled in bodhi, create the update if newer branch does + # not have an update in testing if [ $branch != "rawhide" ] || [ ${bodhi_enabled[@]: $bodhi_enabled_index: 1} -eq 1 ]; then - $debug bodhi updates new --user zdohnal --type enhancement --notes "The newest upstream commit" --request testing --autotime --autokarma --stable-karma 3 --unstable-karma -3 vim-${UPSTREAMMAJOR}.${LASTPLFILLED}-1.${releases[@]: $release_index: 1} + $debug bodhi updates new --type enhancement --notes "The newest upstream commit" --request testing --autotime --autokarma --stable-karma 3 --unstable-karma -3 vim-${UPSTREAMMAJOR}.${LASTPLFILLED}-1.${releases[@]: $release_index: 1} fi else echo "Error when building package for $branch" diff --git a/vim.spec b/vim.spec index f4df9d40..b2c29f97 100644 --- a/vim.spec +++ b/vim.spec @@ -1,28 +1,70 @@ -%define patchlevel 2541 +%bcond_without gui + + +%if 0%{?fedora} +%bcond_without default_editor +%bcond_without gpm +%bcond_without libsodium_crypt +%else +%bcond_with default_editor +%bcond_with gpm +%bcond_with libsodium_crypt +%endif + + +%define patchlevel 2068 +%define withnetbeans 1 + +%define withhunspell 0 +%define withlua 1 +%define withperl 1 + +# VIm upstream wants to build with FORTIFY_SOURCE=1, +# because higher levels causes crashes of valid code constructs +# and their reimplementation would cost unnecessary maintenance +# https://github.com/vim/vim/pull/3507 +%define _fortify_level 1 + +%define baseversion 9.1 +%define vimdir vim91 + + %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif + +%if %{with gui} %define desktop_file 1 +%else +%define desktop_file 0 +%endif + %if %{desktop_file} %define desktop_file_utils_version 0.2.93 %endif -%define withnetbeans 1 - -%define withvimspell 0 -%define withhunspell 0 +%if 0%{?flatpak} +%define withruby 0 +%else %define withruby 1 -%define withlua 1 +%endif -%define baseversion 8.2 -%define vimdir vim82 Summary: The VIM editor -URL: http://www.vim.org/ +URL: https://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} Release: 1%{?dist} -License: Vim and MIT +Epoch: 2 +# swift.vim contains Apache 2.0 with runtime library exception: +# which is taken as Apache-2.0 WITH Swift-exception - reported to legal as https://gitlab.com/fedora/legal/fedora-license-data/-/issues/188 +# resolution: the license is good for Fedora, but the file does not have a creativity from +# +# Open Publication License 1.0 or later for Vim documentation - reported to legal for adding to the allowed licenses list +# response here: https://lists.fedoraproject.org/archives/list/legal@lists.fedoraproject.org/message/4UTW5GFDELGMG6K3NQ7NBU42LC2FJOB5/ +# resolution: take it as OPUBL-1.0, the license won't be added to allowed license list, but if a project uses it for documentation +# and don't use license options mentioned in the OPUBL 1.0 license text (which both are the case for Vim), the license is allowed +License: Vim AND LGPL-2.1-or-later AND MIT AND GPL-1.0-only AND (GPL-2.0-only OR Vim) AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND GPL-2.0-or-later AND GPL-3.0-or-later AND OPUBL-1.0 AND Apache-2.0 WITH Swift-exception Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: virc Source2: vimrc @@ -38,57 +80,100 @@ Source11: vim-default-editor.fish Source12: view_wrapper Source13: vi_wrapper -%if %{withvimspell} -Source100: vim-spell-files.tar.bz2 -%endif - -Patch2002: vim-7.0-fixkeys.patch -Patch2003: vim-7.4-specsyntax.patch -%if %{withhunspell} -Patch2011: vim-7.0-hunspell.patch -BuildRequires: hunspell-devel -%endif - -Patch3000: vim-7.4-syntax.patch -Patch3002: vim-7.4-nowarnings.patch -Patch3004: vim-7.0-rclocation.patch -Patch3007: vim-7.4-fstabsyntax.patch -Patch3008: vim-7.4-syncolor.patch -Patch3010: vim-7.3-manpage-typo-668894-675480.patch -Patch3011: vim-manpagefixes-948566.patch -Patch3013: vim-7.4-globalsyntax.patch -Patch3014: vim-7.4-releasestring-1318991.patch -Patch3016: vim-8.0-copy-paste.patch +Patch1: vim-7.0-fixkeys.patch +Patch2: vim-7.4-specsyntax.patch +Patch3: vim-7.3-manpage-typo-668894-675480.patch +Patch4: vim-manpagefixes-948566.patch +Patch5: vim-7.4-globalsyntax.patch # migrate shebangs in script to /usr/bin/python3 and use python2 when necessary -Patch3017: vim-python3-tests.patch -# fips warning -Patch3018: vim-crypto-warning.patch +Patch6: vim-python3-tests.patch +# fips warning (Fedora downstream patch) +Patch7: vim-crypto-warning.patch +# don't ever set mouse (Fedora downstream patch) +Patch8: vim-8.0-copy-paste.patch + + +# patch only when hunspell is enabled +Patch10000: vim-7.0-hunspell.patch + + +# uses autoconf in spec file +BuildRequires: autoconf # gcc is no longer in buildroot by default BuildRequires: gcc +# for translations +BuildRequires: gettext + +# glibc in F35 bootstraped several conversion formats from +# iconv into a separate package. Vim needs those additional +# formats during compilation. +BuildRequires: glibc-gconv-extra + +# for setting ACL on created files +BuildRequires: libacl-devel + +# uses libtool for linking +BuildRequires: libtool + # uses make BuildRequires: make +# screen handling library +BuildRequires: ncurses-devel -BuildRequires: python3-devel ncurses-devel gettext perl-devel -BuildRequires: perl-generators -BuildRequires: perl(ExtUtils::Embed) perl(ExtUtils::ParseXS) -BuildRequires: libacl-devel gpm-devel autoconf file -%if %{WITH_SELINUX} -BuildRequires: libselinux-devel +# for building function prototypes +BuildRequires: python3 +BuildRequires: python3-clang + +# for python plugin +BuildRequires: python3-devel + + +%if %{desktop_file} +# for /usr/bin/desktop-file-install +BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} +Requires: desktop-file-utils %endif -%if "%{withruby}" == "1" -BuildRequires: ruby-devel ruby + +%if %{with gpm} +# for mouse support in console +BuildRequires: gpm-devel %endif + +%if %{withhunspell} +BuildRequires: hunspell-devel +%endif + +# for xchacha20 encryption +%if %{with libsodium_crypt} +BuildRequires: libsodium-devel +%endif + +# for lua plugin %if "%{withlua}" == "1" BuildRequires: lua-devel %endif -%if %{desktop_file} -# for /usr/bin/desktop-file-install -Requires: desktop-file-utils -BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} + +# for perl plugin +%if "%{withperl}" == "1" +BuildRequires: perl-devel +BuildRequires: perl-generators +BuildRequires: perl(ExtUtils::Embed) +BuildRequires: perl(ExtUtils::ParseXS) %endif -Epoch: 2 + +# for ruby plugin +%if "%{withruby}" == "1" +BuildRequires: ruby +BuildRequires: ruby-devel +%endif + +# selinux support +%if %{WITH_SELINUX} +BuildRequires: libselinux-devel +%endif + %description VIM (VIsual editor iMproved) is an updated and improved version of the @@ -96,11 +181,17 @@ vi editor. Vi was the first real screen-based editor for UNIX, and is still very popular. VIM improves on vi by adding new features: multiple windows, multi-level undo, block highlighting and more. + %package common Summary: The common files needed by any version of the VIM editor -# remove when a new RHEL is released (current 8) -Conflicts: %{name}-minimal < %{epoch}:8.1.1-1 +# move evim manpage to common - remove the conflict after C11S is branched +Conflicts: %{name}-X11 < 2:9.1.1706-2 +# shared files between common and minimal +Requires: %{name}-data = %{epoch}:%{version}-%{release} Requires: %{name}-filesystem +# the hexdump binary was part of the package for long time, ship it with it +# still for convenience +Requires: xxd %description common VIM (VIsual editor iMproved) is an updated and improved version of the @@ -113,23 +204,13 @@ order to run. If you are installing vim-enhanced or vim-X11, you'll also need to install the vim-common package. -%package spell -Summary: The dictionaries for spell checking. This package is optional -Requires: vim-common = %{epoch}:%{version}-%{release} - -%description spell -This subpackage contains dictionaries for vim spell checking in -many different languages. %package minimal Summary: A minimal version of the VIM editor -# conflicts in package because of manpage move (bug #1599663) -# remove when a new RHEL is released (current 8) -Conflicts: %{name}-common < %{epoch}:8.1.1-1 -Conflicts: vim-wrappers < 2:8.2.2488-1 -Obsoletes: vim-wrappers < 2:8.2.2488-1 Provides: vi Provides: %{_bindir}/vi +# shared files between common and minimal +Requires: %{name}-data = %{epoch}:%{version}-%{release} %description minimal VIM (VIsual editor iMproved) is an updated and improved version of the @@ -140,28 +221,37 @@ vim-minimal package includes a minimal version of VIM, providing the commands vi, view, ex, rvi, and rview. NOTE: The online help is only available when the vim-common package is installed. + %package enhanced Summary: A version of the VIM editor which includes recent enhancements -Conflicts: vim-wrappers < 2:8.2.2488-1 -Obsoletes: vim-wrappers < 2:8.2.2488-1 # vim bundles libvterm, which is used during build - so we need to provide # bundled libvterm for catching possible libvterm CVEs Provides: bundled(libvterm) Provides: vim +Provides: vim(plugins-supported) Provides: %{_bindir}/mergetool Provides: %{_bindir}/vim -Requires: vim-common = %{epoch}:%{version}-%{release} which +Requires: vim-common = %{epoch}:%{version}-%{release} +# required for vimtutor (#395371) +Requires: which +Suggests: python3 +Suggests: python3-libs + # suggest python3, python2, lua, ruby and perl packages because of their # embedded functionality in Vim/GVim -Suggests: python3 python3-libs -Suggests: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) perl-devel -%if "%{withruby}" == "1" -Suggests: ruby-libs ruby -%endif %if "%{withlua}" == "1" Suggests: lua-libs %endif +%if "%{withperl}" == "1" +Suggests: perl-devel +%endif + +%if "%{withruby}" == "1" +Suggests: ruby +Suggests: ruby-libs +%endif + %description enhanced VIM (VIsual editor iMproved) is an updated and improved version of the vi editor. Vi was the first real screen-based editor for UNIX, and is @@ -175,6 +265,7 @@ VIM editor which includes recently added enhancements like interpreters for the Python and Perl scripting languages. You'll also need to install the vim-common package. + %package filesystem Summary: VIM filesystem layout BuildArch: noarch @@ -183,34 +274,93 @@ BuildArch: noarch This package provides some directories which are required by other packages that add vim files, p.e. additional syntax files or filetypes. + +%package data +Summary: Shared data for Vi and Vim +BuildArch: noarch + +%description data +The subpackage is used for shipping files and directories, which need to be +shared between vim-minimal and vim-common packages. + + +%package -n xxd +Summary: A hex dump utility + +%description -n xxd +xxd creates a hex dump of a given file or standard input. It can also convert +a hex dump back to its original binary form. + + +%if %{with default_editor} +%package default-editor +Summary: Set vim as the default editor +BuildArch: noarch +Conflicts: system-default-editor +Provides: system-default-editor +Requires: vim-enhanced + +%description default-editor +This subpackage contains files needed to set Vim as the default editor. +%endif + +%if %{with gui} %package X11 Summary: The VIM version of the vi editor for the X Window System - GVim -# needed in configure script to have correct macros enabled for GUI (#1603272) +# move evim manpage to common - remove the conflict after C11S is branched +Conflicts: %{name}-common < 2:9.1.1706-2 +# devel of libICE, gtk3, libSM, libX11, libXpm and libXt are needed in buildroot +# so configure script can have correct macros enabled for GUI (#1603272) +# generic gnome toolkit for graphical support BuildRequires: gtk3-devel +# inter-client exchange library - for X session management protocol +BuildRequires: libICE-devel +# X session management library +BuildRequires: libSM-devel +# core X11 protocol client library +BuildRequires: libX11-devel +# X Toolkit Intrinsics library - working with widgets? +BuildRequires: libXt-devel +# for testing validity of appdata file BuildRequires: libappstream-glib # for sound support BuildRequires: libcanberra-devel -BuildRequires: libX11-devel -BuildRequires: libSM-devel -BuildRequires: libXt-devel -BuildRequires: libXpm-devel -BuildRequires: libICE-devel Provides: gvim +Provides: vim(plugins-supported) Provides: %{_bindir}/mergetool Provides: %{_bindir}/gvim + +# glib2 in Fedora 40 introduced a new function, which is not used in GVim, but it is present +# in compiled gvim binary as symbol when Vim is compiled with glib2-2.79.1 +# there does not seem to be a better solution than version based requires on glib2... +# https://bugzilla.redhat.com/show_bug.cgi?id=2262371 +Requires: glib2 >= 2.79.1 +# GVIM graphics are based on GTK3 +Requires: gtk3 +# needed for icons (#226526) Requires: hicolor-icon-theme -Requires: vim-common = %{epoch}:%{version}-%{release} libattr >= 2.4 gtk3 +# for getting/setting extended attributes - they are pairs (name:value) +# from inodes (files, dirs etc.) +Requires: libattr >= 2.4 +Requires: vim-common = %{epoch}:%{version}-%{release} +Suggests: python3 +Suggests: python3-libs + # suggest python3, python2, lua, ruby and perl packages because of their # embedded functionality in Vim/GVim -Suggests: python3 python3-libs -Suggests: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) perl-devel -%if "%{withruby}" == "1" -Suggests: ruby-libs ruby -%endif -%if "%{withlua}" == "1" + %if "%{withlua}" == "1" Suggests: lua-libs -%endif + %endif + + %if "%{withperl}" == "1" +Suggests: perl-devel + %endif + + %if "%{withruby}" == "1" +Suggests: ruby +Suggests: ruby-libs + %endif %description X11 VIM (VIsual editor iMproved) is an updated and improved version of the @@ -224,65 +374,46 @@ application with a full GUI interface and mouse support by command gvim. Install the vim-X11 package if you'd like to try out a version of vi with graphics and mouse capabilities. You'll also need to install the vim-common package. - -%package default-editor -Summary: Set vim as the default editor -BuildArch: noarch -Conflicts: system-default-editor -# conflict with nano-default-editor which doesn't provide system-default-editor -Conflicts: nano-default-editor < 5.3-3 -Provides: system-default-editor -Requires: vim-enhanced - -%description default-editor -This subpackage contains files needed to set Vim as the default editor. +%endif %prep %setup -q -b 0 -n %{vimdir} # use %%{__python3} macro for defining shebangs in python3 tests -sed -i -e 's,/usr/bin/python3,%{__python3},' %{PATCH3017} +sed -i -e 's,/usr/bin/python3,%{__python3},' %{PATCH6} # fix rogue dependencies from sample code chmod -x runtime/tools/mve.awk -%patch2002 -p1 -b .fixkeys -%patch2003 -p1 -%if %{withhunspell} -%patch2011 -p1 -%endif +%patch -P 1 -p1 -b .fixkeys +%patch -P 2 -p1 -b .spec-syntax + perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk -# install spell files -%if %{withvimspell} -%{__tar} xjf %{SOURCE100} +%patch -P 3 -p1 -b .mantypo +%patch -P 4 -p1 -b .manpagefixes +%patch -P 5 -p1 -b .globalsyntax +%patch -P 6 -p1 -b .python-tests +%patch -P 7 -p1 -b .fips-warning +%patch -P 8 -p1 -b .copypaste + +%if %{withhunspell} +%patch -P 10000 -p1 %endif -%patch3000 -p1 -%patch3002 -p1 -b .nowarnings -%patch3004 -p1 -%patch3007 -p1 -b .fstabsyntax -%patch3008 -p1 -b .syncolor -%patch3010 -p1 -%patch3011 -p1 -%patch3013 -p1 -%patch3014 -p1 -%patch3016 -p1 -b .copypaste -%patch3017 -p1 -b .python-tests -%patch3018 -p1 %build cd src autoconf -sed -e "s+VIMRCLOC = \$(VIMLOC)+VIMRCLOC = /etc+" Makefile > Makefile.tmp -mv -f Makefile.tmp Makefile - -export CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2" -export CXXFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2" +# added -std=c17 because F42 uses c23 by default and dynamically loaded Ruby plugin fails to build +# with c23 due using `()` for callback arguments to be able to use callbacks with different number +# of arguments in one function +# reported upstream as https://github.com/vim/vim/issues/16575 +export CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2 -std=c17" +export CXXFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2 -std=c17" cp -f os_unix.h os_unix.h.save -cp -f ex_cmds.c ex_cmds.c.save # Configure options: # --enable-fail-if-missing - we need to fail if configure options aren't satisfied @@ -297,7 +428,8 @@ cp -f ex_cmds.c ex_cmds.c.save # --disable-gpm - disabling support for General Purpose Mouse - Linux mouse daemon perl -pi -e "s/vimrc/virc/" os_unix.h -%configure --prefix=%{_prefix} --with-features=small --with-x=no \ +%configure CFLAGS="${CFLAGS} -DSYS_VIMRC_FILE='\"/etc/virc\"'" \ + --prefix=%{_prefix} --with-features=tiny --with-x=no \ --enable-multibyte \ --disable-netbeans \ %if %{WITH_SELINUX} @@ -311,60 +443,22 @@ perl -pi -e "s/vimrc/virc/" os_unix.h --with-modified-by="" \ --enable-fips-warning \ --enable-fail-if-missing \ - --disable-canberra + --disable-canberra \ + --without-wayland \ + --enable-year2038 \ + --disable-libsodium -%make_build VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} +%make_build cp vim minimal-vim make clean + mv -f os_unix.h.save os_unix.h -mv -f ex_cmds.c.save ex_cmds.c -# More configure options: -# --enable-xim - enabling X Input Method - international input module for X, -# it is for multibyte languages in Vim with X -# --enable-termtruecolor - use terminal with true colors - -%configure --with-features=huge \ - --enable-python3interp=dynamic \ - --enable-perlinterp=dynamic \ - --disable-tclinterp --with-x=yes \ - --enable-xim --enable-multibyte \ - --with-tlib=ncurses \ - --enable-gtk3-check --enable-gui=gtk3 \ - --enable-fips-warning \ - --with-compiledby="" --enable-cscope \ - --with-modified-by="" \ -%if "%{withnetbeans}" == "1" - --enable-netbeans \ -%else - --disable-netbeans \ -%endif -%if %{WITH_SELINUX} - --enable-selinux \ -%else - --disable-selinux \ -%endif -%if "%{withruby}" == "1" - --enable-rubyinterp=dynamic \ -%else - --disable-rubyinterp \ -%endif -%if "%{withlua}" == "1" - --enable-luainterp=dynamic \ -%else - --disable-luainterp \ -%endif - --enable-fail-if-missing \ - --enable-canberra - -%make_build VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} -cp vim gvim -make clean - -%configure --prefix=%{_prefix} --with-features=huge \ +%configure CFLAGS="${CFLAGS} -DSYS_VIMRC_FILE='\"/etc/vimrc\"'" \ + --prefix=%{_prefix} --with-features=huge \ --enable-python3interp=dynamic \ - --enable-perlinterp=dynamic \ + --with-python3-stable-abi \ --disable-tclinterp \ --with-x=no \ --enable-gui=no --exec-prefix=%{_prefix} --enable-multibyte \ @@ -372,6 +466,11 @@ make clean --with-tlib=ncurses \ --enable-fips-warning \ --with-compiledby="" \ +%if %{with gpm} + --enable-gpm \ +%else + --disable-gpm \ +%endif %if "%{withnetbeans}" == "1" --enable-netbeans \ %else @@ -382,6 +481,12 @@ make clean %else --disable-selinux \ %endif +%if "%{withperl}" == "1" + --enable-perlinterp=dynamic \ + --with-xsubpp=$(which xsubpp) \ +%else + --disable-perlinterp \ +%endif %if "%{withruby}" == "1" --enable-rubyinterp=dynamic \ %else @@ -391,39 +496,116 @@ make clean --enable-luainterp=dynamic \ %else --disable-luainterp \ +%endif +%if %{with libsodium_crypt} + --enable-libsodium \ +%else + --disable-libsodium \ %endif --enable-fail-if-missing \ + --without-wayland \ + --enable-year2038 \ --disable-canberra -%make_build VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} +%make_build cp vim enhanced-vim + +%if %{with gui} +# More configure options: +# --enable-xim - enabling X Input Method - international input module for X, +# it is for multibyte languages in Vim with X +# --enable-termtruecolor - use terminal with true colors + +%configure CFLAGS="${CFLAGS} -DSYS_VIMRC_FILE='\"/etc/vimrc\"'" \ + --with-features=huge \ + --enable-python3interp=dynamic \ + --with-python3-stable-abi \ + --disable-tclinterp --with-x=yes \ + --enable-xim --enable-multibyte \ + --with-tlib=ncurses \ + --enable-gtk3-check --enable-gui=gtk3 \ + --enable-fips-warning \ + --with-compiledby="" --enable-cscope \ + --with-modified-by="" \ + %if %{with gpm} + --enable-gpm \ + %else + --disable-gpm \ + %endif + %if "%{withnetbeans}" == "1" + --enable-netbeans \ + %else + --disable-netbeans \ + %endif + %if %{WITH_SELINUX} + --enable-selinux \ + %else + --disable-selinux \ + %endif + %if "%{withperl}" == "1" + --enable-perlinterp=dynamic \ + --with-xsubpp=$(which xsubpp) \ + %else + --disable-perlinterp \ + %endif + %if "%{withruby}" == "1" + --enable-rubyinterp=dynamic \ + %else + --disable-rubyinterp \ + %endif + %if "%{withlua}" == "1" + --enable-luainterp=dynamic \ + %else + --disable-luainterp \ + %endif + %if %{with libsodium_crypt} + --enable-libsodium \ + %else + --disable-libsodium \ + %endif + --enable-fail-if-missing \ + --with-wayland \ + --enable-year2038 \ + --enable-socketserver \ + --enable-canberra + +%make_build +cp vim gvim +make clean +%endif + + %install mkdir -p %{buildroot}/%{_bindir} mkdir -p %{buildroot}/%{_datadir}/%{name}/vimfiles/{after,autoload,colors,compiler,doc,ftdetect,ftplugin,indent,keymap,lang,plugin,print,spell,syntax,tutor} mkdir -p %{buildroot}/%{_datadir}/%{name}/vimfiles/after/{autoload,colors,compiler,doc,ftdetect,ftplugin,indent,keymap,lang,plugin,print,spell,syntax,tutor} cp -f %{SOURCE7} %{buildroot}/%{_datadir}/%{name}/vimfiles/template.spec -cp runtime/doc/uganda.txt LICENSE # Those aren't Linux info files but some binary files for Amiga: rm -f README*.info - cd src +# related to the issue with `make depend`, auto/osdef.h +# has to be generated +make auto/osdef.h auto/gui_gtk_gresources.h auto/wayland/wlr-data-control-unstable-v1.h # Adding STRIP=/bin/true, because Vim wants to strip the binaries by himself # and put the stripped files into correct dirs. Build system (koji/brew) # does it for us, so there is no need to do it in Vim -%make_install BINDIR=%{_bindir} VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} STRIP=/bin/true +%make_install BINDIR=%{_bindir} STRIP=/bin/true + # make install creates vim binary and view symlink, they will be wrappers # so remove them here -%{_bindir}/rm -f %{buildroot}%{_bindir}/{vim,view} -make installgtutorbin DESTDIR=%{buildroot} BINDIR=%{_bindir} VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} +rm -f %{buildroot}%{_bindir}/{vim,view} mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64}/apps mkdir -p %{buildroot}%{_libexecdir} install -m755 minimal-vim %{buildroot}%{_libexecdir}/vi install -m755 enhanced-vim %{buildroot}%{_bindir}/vim -install -m755 gvim %{buildroot}%{_bindir}/gvim install -m755 %{SOURCE12} %{buildroot}%{_bindir}/view install -m755 %{SOURCE13} %{buildroot}%{_bindir}/vi + +%if %{with gui} +make installgtutorbin DESTDIR=%{buildroot} BINDIR=%{_bindir} +install -m755 gvim %{buildroot}%{_bindir}/gvim install -p -m644 %{SOURCE3} \ %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/gvim.png install -p -m644 %{SOURCE4} \ @@ -441,17 +623,19 @@ install -p -m644 %{SOURCE6} \ # See http://www.freedesktop.org/software/appstream/docs/ for more details. # mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo -cat > $RPM_BUILD_ROOT%{_datadir}/metainfo/gvim.appdata.xml < $RPM_BUILD_ROOT%{_datadir}/metainfo/gvim.appdata.xml <<"EOF" - - gvim.desktop + + org.vim.Vim + GVim CC0-1.0 Vim + The VIM version of the vi editor for the X Window System

Vim is an advanced text editor that seeks to provide the power of the @@ -466,22 +650,55 @@ SentUpstream: 2014-05-22 Vim is perfect for all kinds of text editing, from composing email to editing configuration files.

+

+ We ship the current Vim stable release - %{baseversion} - with the upstream + patchlevel %{patchlevel} applied, which is combined into version %{version} + used during packaging. +

+ + + https://raw.githubusercontent.com/zdohnal/vim/zdohnal-screenshot/gvim16_9.png http://www.vim.org/ - + + + gvim.desktop + EOF +appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdata.xml + +# do not put gvim.1, gview.1, eview.1, rgvim and rgview here - they already contains the link, +# and changing it here will rewrite original vim.1 - bz#2392178 +for i in gex.1 vimx.1 evim.1; do + echo ".so man1/vim.1" > %{buildroot}/%{_mandir}/man1/$i +done + +echo ".so man1/vimtutor.1" > %{buildroot}/%{_mandir}/man1/gvimtutor.1 +%else +# Remove files included in X11 subpackage, but built by default: +rm %{buildroot}/%{_mandir}/man1/evim.* +rm %{buildroot}/%{_datadir}/applications/{vim,gvim}.desktop +rm %{buildroot}/%{_datadir}/icons/{hicolor,locolor}/*/apps/gvim.png +%endif + ( cd %{buildroot} - ln -sf %{_libexecdir}/vi .%{_bindir}/rvi - ln -sf %{_libexecdir}/vi .%{_bindir}/rview - ln -sf %{_libexecdir}/vi .%{_bindir}/ex - ln -sf %{_bindir}/vim .%{_bindir}/rvim - ln -sf %{_bindir}/vim .%{_bindir}/vimdiff + ln -sf ../..%{_libexecdir}/vi .%{_bindir}/rvi + ln -sf ../..%{_libexecdir}/vi .%{_bindir}/rview + ln -sf ../..%{_libexecdir}/vi .%{_bindir}/ex + ln -sf vim .%{_bindir}/rvim + ln -sf vim .%{_bindir}/vimdiff perl -pi -e "s,%{buildroot},," .%{_mandir}/man1/vim.1 .%{_mandir}/man1/vimtutor.1 rm -f .%{_mandir}/man1/rvim.1 cp -p .%{_mandir}/man1/vim.1 .%{_mandir}/man1/vi.1 @@ -490,11 +707,17 @@ EOF ln -sf vi.1.gz .%{_mandir}/man1/view.1 ln -sf vi.1.gz .%{_mandir}/man1/rview.1 ln -sf vim.1.gz .%{_mandir}/man1/vimdiff.1.gz + +%if %{with gui} + ln -sf gvim ./%{_bindir}/evim + ln -sf gvim ./%{_bindir}/eview ln -sf gvim ./%{_bindir}/gview ln -sf gvim ./%{_bindir}/gex - ln -sf gvim ./%{_bindir}/evim ln -sf gvim ./%{_bindir}/gvimdiff + ln -sf gvim ./%{_bindir}/rgvim + ln -sf gvim ./%{_bindir}/rgview ln -sf gvim ./%{_bindir}/vimx + %if "%{desktop_file}" == "1" desktop-file-install \ --dir %{buildroot}/%{_datadir}/applications \ @@ -504,57 +727,23 @@ EOF mkdir -p ./%{_sysconfdir}/X11/applnk/Applications cp %{buildroot}/%{_datadir}/applications/gvim.desktop ./%{_sysconfdir}/X11/applnk/Applications/gvim.desktop %endif + +%endif + # ja_JP.ujis is obsolete, ja_JP.eucJP is recommended. ( cd ./%{_datadir}/%{name}/%{vimdir}/lang; \ ln -sf menu_ja_jp.ujis.vim menu_ja_jp.eucjp.vim ) ) -appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdata.xml - -pushd %{buildroot}/%{_datadir}/%{name}/%{vimdir}/tutor -mkdir conv - iconv -f CP1252 -t UTF8 tutor.ca > conv/tutor.ca - iconv -f CP1252 -t UTF8 tutor.it > conv/tutor.it - #iconv -f CP1253 -t UTF8 tutor.gr > conv/tutor.gr - iconv -f CP1252 -t UTF8 tutor.fr > conv/tutor.fr - iconv -f CP1252 -t UTF8 tutor.es > conv/tutor.es - iconv -f CP1252 -t UTF8 tutor.de > conv/tutor.de - #iconv -f CP737 -t UTF8 tutor.gr.cp737 > conv/tutor.gr.cp737 - #iconv -f EUC-JP -t UTF8 tutor.ja.euc > conv/tutor.ja.euc - #iconv -f SJIS -t UTF8 tutor.ja.sjis > conv/tutor.ja.sjis - iconv -f UTF8 -t UTF8 tutor.ja.utf-8 > conv/tutor.ja.utf-8 - iconv -f UTF8 -t UTF8 tutor.ko.utf-8 > conv/tutor.ko.utf-8 - iconv -f CP1252 -t UTF8 tutor.no > conv/tutor.no - iconv -f ISO-8859-2 -t UTF8 tutor.pl > conv/tutor.pl - iconv -f ISO-8859-2 -t UTF8 tutor.sk > conv/tutor.sk - iconv -f KOI8R -t UTF8 tutor.ru > conv/tutor.ru - iconv -f CP1252 -t UTF8 tutor.sv > conv/tutor.sv - mv -f tutor.ja.euc tutor.ja.sjis tutor.ko.euc tutor.pl.cp1250 tutor.zh.big5 tutor.ru.cp1251 tutor.zh.euc tutor.sr.cp1250 tutor.sr.utf-8 conv/ - rm -f tutor.ca tutor.de tutor.es tutor.fr tutor.gr tutor.it tutor.ja.utf-8 tutor.ko.utf-8 tutor.no tutor.pl tutor.sk tutor.ru tutor.sv -mv -f conv/* . -rmdir conv -popd - # Dependency cleanups chmod 644 %{buildroot}/%{_datadir}/%{name}/%{vimdir}/doc/vim2html.pl \ %{buildroot}/%{_datadir}/%{name}/%{vimdir}/tools/*.pl \ %{buildroot}/%{_datadir}/%{name}/%{vimdir}/tools/vim132 chmod 644 ../runtime/doc/vim2html.pl -mkdir -p %{buildroot}/%{_sysconfdir}/profile.d -install -p -m644 %{SOURCE9} %{buildroot}/%{_sysconfdir}/profile.d/vim-default-editor.sh -install -p -m644 %{SOURCE10} %{buildroot}/%{_sysconfdir}/profile.d/vim-default-editor.csh -mkdir -p %{buildroot}/%{_datadir}/fish/vendor_conf.d/ -install -p -m644 %{SOURCE11} %{buildroot}/%{_datadir}/fish/vendor_conf.d/vim-default-editor.fish -mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/ -install -p -m644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/virc -install -p -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/vimrc - -# if Vim isn't built for Fedora, use redhat augroup -%if 0%{?rhel} >= 7 -sed -i -e "s/augroup fedora/augroup redhat/" %{buildroot}/%{_sysconfdir}/vimrc -sed -i -e "s/augroup fedora/augroup redhat/" %{buildroot}/%{_sysconfdir}/virc -%endif +mkdir -p %{buildroot}%{_sysconfdir} +install -p -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/virc +install -p -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/vimrc mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d/ install -p -m644 %{SOURCE8} %{buildroot}%{_rpmconfigdir}/macros.d/ @@ -578,16 +767,35 @@ for i in fr.UTF-8 it.UTF-8 pl.UTF-8 da.UTF-8 de.UTF-8 tr.UTF-8; do rm -rf %{buildroot}/%{_mandir}/$i done -for i in rvim.1 gvim.1 gex.1 gview.1 vimx.1; do - echo ".so man1/vim.1" > %{buildroot}/%{_mandir}/man1/$i -done -echo ".so man1/vimdiff.1" > %{buildroot}/%{_mandir}/man1/gvimdiff.1 -echo ".so man1/vimtutor.1" > %{buildroot}/%{_mandir}/man1/gvimtutor.1 +# Install symlink for rvim man page +echo ".so man1/vim.1" > %{buildroot}/%{_mandir}/man1/rvim.1 + mkdir -p %{buildroot}/%{_mandir}/man5 echo ".so man1/vim.1" > %{buildroot}/%{_mandir}/man5/vimrc.5 echo ".so man1/vi.1" > %{buildroot}/%{_mandir}/man5/virc.5 touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags +# upstream now tries to install LICENSE and README into VIMDIR +# but we ship them in licensedir and docdir, so we remove the dupes +# from VIMDIR +rm %{buildroot}%{_datadir}/%{name}/%{vimdir}/LICENSE +rm %{buildroot}%{_datadir}/%{name}/%{vimdir}/README.txt + +# if Vim isn't built for Fedora, use redhat augroup +%if 0%{?rhel} >= 7 +sed -i -e "s/augroup fedora/augroup redhat/" %{buildroot}/%{_sysconfdir}/vimrc +sed -i -e "s/augroup fedora/augroup redhat/" %{buildroot}/%{_sysconfdir}/virc +%endif + +%if %{with default_editor} +mkdir -p %{buildroot}/%{_sysconfdir}/profile.d +install -p -m644 %{SOURCE9} %{buildroot}/%{_sysconfdir}/profile.d/vim-default-editor.sh +install -p -m644 %{SOURCE10} %{buildroot}/%{_sysconfdir}/profile.d/vim-default-editor.csh +mkdir -p %{buildroot}/%{_datadir}/fish/vendor_conf.d/ +install -p -m644 %{SOURCE11} %{buildroot}/%{_datadir}/fish/vendor_conf.d/vim-default-editor.fish +mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/ +%endif + # Refresh documentation helptags %transfiletriggerin common -- %{_datadir}/%{name}/vimfiles/doc @@ -600,20 +808,18 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %files common %config(noreplace) %{_sysconfdir}/vimrc %{!?_licensedir:%global license %%doc} -%license LICENSE %doc README* %doc runtime/docs -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/vimfiles/template.spec -%dir %{_datadir}/%{name}/%{vimdir} -%{_datadir}/%{name}/%{vimdir}/rgb.txt %{_datadir}/%{name}/%{vimdir}/autoload %{_datadir}/%{name}/%{vimdir}/colors %{_datadir}/%{name}/%{vimdir}/compiler %{_datadir}/%{name}/%{vimdir}/pack %{_datadir}/%{name}/%{vimdir}/doc %{_datadir}/%{name}/%{vimdir}/*.vim +%exclude %{_datadir}/%{name}/%{vimdir}/defaults.vim %{_datadir}/%{name}/%{vimdir}/ftplugin +%{_datadir}/%{name}/%{vimdir}/import/dist/vimhelp.vim +%{_datadir}/%{name}/%{vimdir}/import/dist/vimhighlight.vim %{_datadir}/%{name}/%{vimdir}/indent %{_datadir}/%{name}/%{vimdir}/keymap %{_datadir}/%{name}/%{vimdir}/lang/*.vim @@ -624,9 +830,7 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/%{name}/%{vimdir}/print %{_datadir}/%{name}/%{vimdir}/syntax %{_datadir}/%{name}/%{vimdir}/tutor -%if ! %{withvimspell} %{_datadir}/%{name}/%{vimdir}/spell -%endif %lang(af) %{_datadir}/%{name}/%{vimdir}/lang/af %lang(ca) %{_datadir}/%{name}/%{vimdir}/lang/ca %lang(cs) %{_datadir}/%{name}/%{vimdir}/lang/cs @@ -639,6 +843,8 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %lang(fi) %{_datadir}/%{name}/%{vimdir}/lang/fi %lang(fr) %{_datadir}/%{name}/%{vimdir}/lang/fr %lang(ga) %{_datadir}/%{name}/%{vimdir}/lang/ga +%lang(hu) %{_datadir}/%{name}/%{vimdir}/lang/hu +%lang(hy) %{_datadir}/%{name}/%{vimdir}/lang/hy %lang(it) %{_datadir}/%{name}/%{vimdir}/lang/it %lang(ja) %{_datadir}/%{name}/%{vimdir}/lang/ja %lang(ja.euc-jp) %{_datadir}/%{name}/%{vimdir}/lang/ja.euc-jp @@ -668,17 +874,23 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %lang(zh_TW) %{_datadir}/%{name}/%{vimdir}/lang/zh_TW %lang(zh_CN.UTF-8) %{_datadir}/%{name}/%{vimdir}/lang/zh_CN.UTF-8 %lang(zh_TW.UTF-8) %{_datadir}/%{name}/%{vimdir}/lang/zh_TW.UTF-8 -/%{_bindir}/xxd -%{_mandir}/man1/gex.* -%{_mandir}/man1/gview.* -%{_mandir}/man1/gvim* %{_mandir}/man1/rvim.* %{_mandir}/man1/vim.* %{_mandir}/man1/vimdiff.* %{_mandir}/man1/vimtutor.* -%{_mandir}/man1/vimx.* -%{_mandir}/man1/xxd.* %{_mandir}/man5/vimrc.* + +%if %{with gui} +%{_mandir}/man1/eview.* +%{_mandir}/man1/evim.* +%{_mandir}/man1/gex.* +%{_mandir}/man1/gview.* +%{_mandir}/man1/gvim* +%{_mandir}/man1/rgvim.* +%{_mandir}/man1/rgview.* +%{_mandir}/man1/vimx.* +%endif + %lang(fr) %{_mandir}/fr/man1/* %lang(da) %{_mandir}/da/man1/* %lang(de) %{_mandir}/de/man1/* @@ -688,63 +900,6 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %lang(ru) %{_mandir}/ru/man1/* %lang(tr) %{_mandir}/tr/man1/* -%if %{withvimspell} -%files spell -%dir %{_datadir}/%{name}/%{vimdir}/spell -%{_datadir}/%{name}/vim70/spell/cleanadd.vim -%lang(af) %{_datadir}/%{name}/%{vimdir}/spell/af.* -%lang(am) %{_datadir}/%{name}/%{vimdir}/spell/am.* -%lang(bg) %{_datadir}/%{name}/%{vimdir}/spell/bg.* -%lang(ca) %{_datadir}/%{name}/%{vimdir}/spell/ca.* -%lang(cs) %{_datadir}/%{name}/%{vimdir}/spell/cs.* -%lang(cy) %{_datadir}/%{name}/%{vimdir}/spell/cy.* -%lang(da) %{_datadir}/%{name}/%{vimdir}/spell/da.* -%lang(de) %{_datadir}/%{name}/%{vimdir}/spell/de.* -%lang(el) %{_datadir}/%{name}/%{vimdir}/spell/el.* -%lang(en) %{_datadir}/%{name}/%{vimdir}/spell/en.* -%lang(eo) %{_datadir}/%{name}/%{vimdir}/spell/eo.* -%lang(es) %{_datadir}/%{name}/%{vimdir}/spell/es.* -%lang(fo) %{_datadir}/%{name}/%{vimdir}/spell/fo.* -%lang(fr) %{_datadir}/%{name}/%{vimdir}/spell/fr.* -%lang(ga) %{_datadir}/%{name}/%{vimdir}/spell/ga.* -%lang(gd) %{_datadir}/%{name}/%{vimdir}/spell/gd.* -%lang(gl) %{_datadir}/%{name}/%{vimdir}/spell/gl.* -%lang(he) %{_datadir}/%{name}/%{vimdir}/spell/he.* -%lang(hr) %{_datadir}/%{name}/%{vimdir}/spell/hr.* -%lang(hu) %{_datadir}/%{name}/%{vimdir}/spell/hu.* -%lang(id) %{_datadir}/%{name}/%{vimdir}/spell/id.* -%lang(it) %{_datadir}/%{name}/%{vimdir}/spell/it.* -%lang(ku) %{_datadir}/%{name}/%{vimdir}/spell/ku.* -%lang(la) %{_datadir}/%{name}/%{vimdir}/spell/la.* -%lang(lt) %{_datadir}/%{name}/%{vimdir}/spell/lt.* -%lang(lv) %{_datadir}/%{name}/%{vimdir}/spell/lv.* -%lang(mg) %{_datadir}/%{name}/%{vimdir}/spell/mg.* -%lang(mi) %{_datadir}/%{name}/%{vimdir}/spell/mi.* -%lang(ms) %{_datadir}/%{name}/%{vimdir}/spell/ms.* -%lang(nb) %{_datadir}/%{name}/%{vimdir}/spell/nb.* -%lang(nl) %{_datadir}/%{name}/%{vimdir}/spell/nl.* -%lang(nn) %{_datadir}/%{name}/%{vimdir}/spell/nn.* -%lang(ny) %{_datadir}/%{name}/%{vimdir}/spell/ny.* -%lang(pl) %{_datadir}/%{name}/%{vimdir}/spell/pl.* -%lang(pt) %{_datadir}/%{name}/%{vimdir}/spell/pt.* -%lang(ro) %{_datadir}/%{name}/%{vimdir}/spell/ro.* -%lang(ru) %{_datadir}/%{name}/%{vimdir}/spell/ru.* -%lang(rw) %{_datadir}/%{name}/%{vimdir}/spell/rw.* -%lang(sk) %{_datadir}/%{name}/%{vimdir}/spell/sk.* -%lang(sl) %{_datadir}/%{name}/%{vimdir}/spell/sl.* -%lang(sr) %{_datadir}/%{name}/%{vimdir}/spell/sr.* -%lang(sv) %{_datadir}/%{name}/%{vimdir}/spell/sv.* -%lang(sw) %{_datadir}/%{name}/%{vimdir}/spell/sw.* -%lang(tet) %{_datadir}/%{name}/%{vimdir}/spell/tet.* -%lang(th) %{_datadir}/%{name}/%{vimdir}/spell/th.* -%lang(tl) %{_datadir}/%{name}/%{vimdir}/spell/tl.* -%lang(tn) %{_datadir}/%{name}/%{vimdir}/spell/tn.* -%lang(uk) %{_datadir}/%{name}/%{vimdir}/spell/uk.* -%lang(yi) %{_datadir}/%{name}/%{vimdir}/spell/yi.* -%lang(yi-tr) %{_datadir}/%{name}/%{vimdir}/spell/yi-tr.* -%lang(zu) %{_datadir}/%{name}/%{vimdir}/spell/zu.* -%endif - %files minimal %config(noreplace) %{_sysconfdir}/virc %{_bindir}/ex @@ -768,7 +923,6 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %files filesystem %{_rpmconfigdir}/macros.d/macros.vim -%dir %{_datadir}/%{name}/vimfiles %dir %{_datadir}/%{name}/vimfiles/after %dir %{_datadir}/%{name}/vimfiles/after/* %dir %{_datadir}/%{name}/vimfiles/autoload @@ -778,6 +932,8 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %ghost %{_datadir}/%{name}/vimfiles/doc/tags %dir %{_datadir}/%{name}/vimfiles/ftdetect %dir %{_datadir}/%{name}/vimfiles/ftplugin +%dir %{_datadir}/%{name}/%{vimdir}/import +%dir %{_datadir}/%{name}/%{vimdir}/import/dist %dir %{_datadir}/%{name}/vimfiles/indent %dir %{_datadir}/%{name}/vimfiles/keymap %dir %{_datadir}/%{name}/vimfiles/lang @@ -787,14 +943,15 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %dir %{_datadir}/%{name}/vimfiles/syntax %dir %{_datadir}/%{name}/vimfiles/tutor +%if %{with gui} %files X11 -%if "%{desktop_file}" == "1" + %if "%{desktop_file}" == "1" %{_datadir}/metainfo/*.appdata.xml /%{_datadir}/applications/* %exclude /%{_datadir}/applications/vim.desktop -%else + %else /%{_sysconfdir}/X11/applnk/*/gvim.desktop -%endif + %endif %{_bindir}/gvimtutor %{_bindir}/gvim %{_bindir}/gvimdiff @@ -803,7 +960,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_bindir}/vimtutor %{_bindir}/vimx %{_bindir}/evim -%{_mandir}/man1/evim.* +%{_bindir}/eview +%{_bindir}/rgvim +%{_bindir}/rgview %dir %{_datadir}/icons/hicolor %dir %{_datadir}/icons/hicolor/* %dir %{_datadir}/icons/hicolor/*/apps @@ -812,14 +971,683 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %dir %{_datadir}/icons/locolor/* %dir %{_datadir}/icons/locolor/*/apps %{_datadir}/icons/locolor/*/apps/* +%endif +%files data +%license LICENSE +%dir %{_datadir}/%{name} +%dir %{_datadir}/%{name}/%{vimdir} +%{_datadir}/%{name}/%{vimdir}/defaults.vim +%dir %{_datadir}/%{name}/vimfiles +%{_datadir}/%{name}/vimfiles/template.spec + +%if %{with default_editor} %files default-editor %dir %{_datadir}/fish/vendor_conf.d %{_datadir}/fish/vendor_conf.d/vim-default-editor.fish -%dir %{_sysconfdir}/profile.d %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.* +%endif + +%files -n xxd +%license LICENSE +%{_bindir}/xxd +%{_mandir}/man1/xxd.* + %changelog +* Fri Jan 09 2026 Zdenek Dohnal - 2:9.1.2068-1 +- patchlevel 2068 + +* Fri Dec 19 2025 Zdenek Dohnal - 2:9.1.1999-1 +- patchlevel 1999 + +* Fri Dec 12 2025 Zdenek Dohnal - 2:9.1.1972-1 +- patchlevel 1972 + +* Fri Dec 05 2025 Zdenek Dohnal - 2:9.1.1952-1 +- patchlevel 1952 + +* Fri Nov 14 2025 Zdenek Dohnal - 2:9.1.1914-1 +- patchlevel 1914 + +* Fri Oct 31 2025 Zdenek Dohnal - 2:9.1.1888-1 +- patchlevel 1888 + +* Fri Oct 17 2025 Zdenek Dohnal - 2:9.1.1863-1 +- patchlevel 1863 + +* Fri Oct 10 2025 Zdenek Dohnal - 2:9.1.1845-1 +- patchlevel 1845 + +* Fri Oct 03 2025 Zdenek Dohnal - 2:9.1.1818-1 +- patchlevel 1818 + +* Mon Sep 29 2025 Zdenek Dohnal - 2:9.1.1775-2 +- remove XPM support - GVim icons work without it + +* Fri Sep 19 2025 Zdenek Dohnal - 2:9.1.1775-1 +- patchlevel 1775 + +* Wed Sep 10 2025 Zdenek Dohnal - 2:9.1.1723-2 +- Restore lost --remote-tab... functionality on wayland (fedora#2393716) + +* Mon Sep 01 2025 Zdenek Dohnal - 2:9.1.1723-1 +- patchlevel 1723 + +* Mon Sep 01 2025 Zdenek Dohnal - 2:9.1.1706-2 +- broken /usr/bin/ex symlink in vim-9.1.1706-1.fc42 (fedora#2392249) +- vim-common has broken manpages (fedora#2392178) + +* Fri Aug 29 2025 Zdenek Dohnal - 2:9.1.1706-1 +- patchlevel 1706 + +* Mon Aug 11 2025 Zdenek Dohnal - 2:9.1.1623-1 +- patchlevel 1623 + +* Fri Aug 01 2025 Zdenek Dohnal - 2:9.1.1591-1 +- patchlevel 1591 + +* Fri Jul 25 2025 Fedora Release Engineering - 2:9.1.1552-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Wed Jul 16 2025 Zdenek Dohnal - 2:9.1.1552-1 +- patchlevel 1552 + +* Mon Jul 14 2025 Zdenek Dohnal - 2:9.1.1537-2 +- 2379759 - remove wayland-libs from vim and vi (fedora#2379759) + +* Fri Jul 11 2025 Zdenek Dohnal - 2:9.1.1537-1 +- patchlevel 1537 + +* Fri Jun 27 2025 Zdenek Dohnal - 2:9.1.1484-1 +- patchlevel 1484 + +* Thu Jun 19 2025 Zdenek Dohnal - 2:9.1.1435-2 +- FTBFS with Python 3.14 (fedora#2373314) + +* Fri Jun 06 2025 Zdenek Dohnal - 2:9.1.1435-1 +- patchlevel 1435 + +* Fri May 30 2025 Zdenek Dohnal - 2:9.1.1418-1 +- patchlevel 1418 + +* Fri Apr 11 2025 Zdenek Dohnal - 2:9.1.1291-1 +- patchlevel 1291 + +* Fri Apr 04 2025 Zdenek Dohnal - 2:9.1.1275-1 +- patchlevel 1275 + +* Fri Mar 21 2025 Zdenek Dohnal - 2:9.1.1227-1 +- patchlevel 1227 + +* Fri Mar 14 2025 Zdenek Dohnal - 2:9.1.1202-1 +- patchlevel 1202 + +* Fri Mar 07 2025 Zdenek Dohnal - 2:9.1.1179-1 +- patchlevel 1179 + +* Tue Mar 04 2025 Zdenek Dohnal - 2:9.1.1169-1 +- patchlevel 1169 + +* Wed Feb 19 2025 Zdenek Dohnal - 2:9.1.1122-1 +- patchlevel 1122 + +* Fri Feb 07 2025 Zdenek Dohnal - 2:9.1.1081-1 +- patchlevel 1081 + +* Mon Feb 03 2025 Zdenek Dohnal - 2:9.1.1000-2 +- Fix FTBFS (fedora#2341508) + +* Sun Jan 19 2025 Fedora Release Engineering - 2:9.1.1000-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Jan 10 2025 Zdenek Dohnal - 2:9.1.1000-1 +- patchlevel 1000 + +* Fri Jan 03 2025 Zdenek Dohnal - 2:9.1.984-1 +- patchlevel 984 + +* Fri Dec 13 2024 Zdenek Dohnal - 2:9.1.919-1 +- patchlevel 919 + +* Fri Dec 06 2024 Zdenek Dohnal - 2:9.1.906-1 +- patchlevel 906 + +* Fri Nov 29 2024 Zdenek Dohnal - 2:9.1.895-1 +- patchlevel 895 + +* Fri Nov 15 2024 Zdenek Dohnal - 2:9.1.866-1 +- patchlevel 866 + +* Fri Nov 01 2024 Zdenek Dohnal - 2:9.1.825-1 +- patchlevel 825 + +* Tue Oct 15 2024 Zdenek Dohnal - 2:9.1.785-1 +- patchlevel 785 + +* Fri Sep 20 2024 Zdenek Dohnal - 2:9.1.737-1 +- patchlevel 737 (fedora#2311860) + +* Fri Sep 06 2024 Zdenek Dohnal - 2:9.1.719-1 +- patchlevel 719 + +* Fri Aug 30 2024 Zdenek Dohnal - 2:9.1.703-1 +- patchlevel 703 + +* Mon Aug 12 2024 Zdenek Dohnal - 2:9.1.672-1 +- patchlevel 672 + +* Fri Aug 09 2024 Zdenek Dohnal - 2:9.1.660-2 +- 2303669 - vim in rawhide (41) can't load python library + +* Mon Aug 05 2024 Zdenek Dohnal - 2:9.1.660-1 +- patchlevel 660 + +* Fri Jul 26 2024 Benjamin Gilbert - 2:9.1.571-3 +- Require gdk-pixbuf2-modules-extra on F41+ -X11 for XPM loading (rhbz#2277751) + +* Sat Jul 20 2024 Fedora Release Engineering - 2:9.1.571-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jul 12 2024 Zdenek Dohnal - 2:9.1.571-1 +- patchlevel 571 + +* Fri Jul 12 2024 Zdenek Dohnal - 2:9.1.544-2 +- fix upstream-scripttests in CI - new test needs our downstream 'set mouse=a' to pass + +* Mon Jul 08 2024 Zdenek Dohnal - 2:9.1.544-1 +- patchlevel 544 + +* Fri May 31 2024 Zdenek Dohnal - 2:9.1.452-1 +- patchlevel 452 + +* Mon May 06 2024 Zdenek Dohnal - 2:9.1.393-1 +- patchlevel 393 + +* Fri Apr 19 2024 Zdenek Dohnal - 2:9.1.354-1 +- patchlevel 354 + +* Fri Apr 12 2024 Zdenek Dohnal - 2:9.1.309-1 +- patchlevel 309 + +* Fri Apr 05 2024 Zdenek Dohnal - 2:9.1.264-1 +- patchlevel 264 + +* Tue Apr 02 2024 Zdenek Dohnal - 2:9.1.252-1 +- patchlevel 252 + +* Fri Mar 15 2024 Zdenek Dohnal - 2:9.1.181-1 +- patchlevel 181 + +* Fri Mar 08 2024 Zdenek Dohnal - 2:9.1.158-1 +- patchlevel 158 + +* Fri Feb 16 2024 Zdenek Dohnal - 2:9.1.113-1 +- patchlevel 113 + +* Fri Feb 09 2024 Zdenek Dohnal - 2:9.1.083-1 +- patchlevel 083 + +* Mon Feb 05 2024 Zdenek Dohnal - 2:9.1.076-2 +- enable building without GPM support - build with GPM in Fedora +- 2262371 - gvim: symbol lookup error: gvim: undefined symbol: g_once_init_enter_pointer + +* Mon Feb 05 2024 Zdenek Dohnal - 2:9.1.076-1 +- patchlevel 076 + +* Sat Jan 27 2024 Fedora Release Engineering - 2:9.1.031-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Jan 16 2024 Zdenek Dohnal - 2:9.1.031-1 +- patchlevel 031 + +* Mon Jan 08 2024 Zdenek Dohnal - 2:9.1.016-1 +- patchlevel 016 + +* Tue Jan 02 2024 Zdenek Dohnal - 2:9.0.2190-1 +- patchlevel 2190 + +* Fri Dec 15 2023 Zdenek Dohnal - 2:9.0.2167-1 +- patchlevel 2167 + +* Fri Dec 08 2023 Zdenek Dohnal - 2:9.0.2153-1 +- patchlevel 2153 + +* Wed Nov 22 2023 Zdenek Dohnal - 2:9.0.2120-1 +- patchlevel 2120 + +* Thu Nov 16 2023 Zdenek Dohnal - 2:9.0.2105-1 +- patchlevel 2105 + +* Wed Nov 01 2023 Zdenek Dohnal - 2:9.0.2081-1 +- patchlevel 2081 + +* Wed Oct 18 2023 Zdenek Dohnal - 2:9.0.2048-1 +- patchlevel 2048 + +* Thu Oct 05 2023 Remi Collet - 2:9.0.1984-2 +- rebuild for new libsodium + +* Thu Oct 05 2023 Zdenek Dohnal - 2:9.0.1984-1 +- patchlevel 1984 + +* Mon Oct 02 2023 Zdenek Dohnal - 2:9.0.1968-1 +- patchlevel 1968 + +* Fri Sep 22 2023 Zdenek Dohnal - 2:9.0.1927-1 +- patchlevel 1927 + +* Thu Sep 07 2023 Zdenek Dohnal - 2:9.0.1882-1 +- patchlevel 1882 + +* Wed Sep 06 2023 Zdenek Dohnal - 2:9.0.1872-2 +- test_xxd_color2 is flaky + +* Tue Sep 05 2023 Zdenek Dohnal - 2:9.0.1872-1 +- patchlevel 1872 + +* Wed Aug 30 2023 Zdenek Dohnal - 2:9.0.1822-1 +- patchlevel 1822 + +* Mon Aug 14 2023 Zdenek Dohnal - 2:9.0.1712-1 +- patchlevel 1712 + +* Fri Aug 11 2023 Zdenek Dohnal - 2:9.0.1677-4 +- fix test suite from python3 syntax warnings + +* Sat Jul 22 2023 Fedora Release Engineering - 2:9.0.1677-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jul 13 2023 Zdenek Dohnal - 2:9.0.1677-2 +- 2222671 - fix FTBFS due Python3 rebase +- 2222648 - fix FailToInstall due Perl rebase + +* Tue Jul 11 2023 Zdenek Dohnal - 2:9.0.1677-2 +- patchlevel 1677 + +* Tue Jul 11 2023 Jitka Plesnikova - 2:9.0.1671-2 +- Perl 5.38 rebuild + +* Fri Jun 30 2023 Zdenek Dohnal - 2:9.0.1671-1 +- patchlevel 1671 + +* Fri Jun 23 2023 Zdenek Dohnal - 2:9.0.1649-1 +- patchlevel 1649 + +* Tue Jun 13 2023 Zdenek Dohnal - 2:9.0.1627-1 +- patchlevel 1627 + +* Mon Jun 05 2023 Zdenek Dohnal - 2:9.0.1607-1 +- patchlevel 1607 + +* Wed May 31 2023 Zdenek Dohnal - 2:9.0.1592-1 +- patchlevel 1592 + +* Mon May 29 2023 Zdenek Dohnal - 2:9.0.1587-1 +- patchlevel 1587 + +* Wed May 24 2023 Zdenek Dohnal - 2:9.0.1575-1 +- patchlevel 1575 + +* Thu May 18 2023 Zdenek Dohnal - 2:9.0.1562-1 +- patchlevel 1562 + +* Thu Apr 27 2023 Zdenek Dohnal - 2:9.0.1491-1 +- patchlevel 1491 + +* Tue Apr 25 2023 Zdenek Dohnal - 2:9.0.1486-1 +- patchlevel 1486 + +* Fri Apr 21 2023 Zdenek Dohnal - 2:9.0.1472-1 +- patchlevel 1472 + +* Tue Apr 11 2023 Zdenek Dohnal - 2:9.0.1443-1 +- patchlevel 1443 + +* Tue Apr 11 2023 Zdenek Dohnal - 2:9.0.1440-2 +- incorporate License tag changes based on legal team response + +* Wed Apr 05 2023 Andreas Schneider - 2:9.0.1440-2 +- create xxd package, because it is used by hex.nvim + +* Wed Apr 05 2023 Zdenek Dohnal - 2:9.0.1440-2 +- list most licenses available in binary rpms and migrate them into SPDX syntax + +* Wed Apr 05 2023 Zdenek Dohnal - 2:9.0.1440-1 +- patchlevel 1440 + +* Mon Mar 27 2023 Zdenek Dohnal - 2:9.0.1429-1 +- patchlevel 1429 + +* Wed Mar 22 2023 Zdenek Dohnal - 2:9.0.1423-1 +- patchlevel 1423 + +* Thu Mar 16 2023 Zdenek Dohnal - 2:9.0.1407-1 +- patchlevel 1407 + +* Tue Mar 14 2023 Zdenek Dohnal - 2:9.0.1403-1 +- patchlevel 1403 + +* Thu Mar 02 2023 Zdenek Dohnal - 2:9.0.1367-1 +- patchlevel 1367 + +* Fri Feb 17 2023 Zdenek Dohnal - 2:9.0.1314-1 +- patchlevel 1314 + +* Tue Feb 14 2023 Zdenek Dohnal - 2:9.0.1307-1 +- patchlevel 1307 + +* Tue Feb 14 2023 Zdenek Dohnal - 2:9.0.1293-2 +- 2169641 - Syntax highlight for sh files broken + +* Thu Feb 09 2023 Zdenek Dohnal - 2:9.0.1293-1 +- patchlevel 1293 + +* Mon Jan 30 2023 Zdenek Dohnal - 2:9.0.1262-1 +- patchlevel 1262 + +* Thu Jan 19 2023 Zdenek Dohnal - 2:9.0.1221-1 +- patchlevel 1221 + +* Thu Jan 12 2023 Zdenek Dohnal - 2:9.0.1182-1 +- patchlevel 1182 + +* Mon Jan 09 2023 Zdenek Dohnal - 2:9.0.1160-1 +- patchlevel 1160 + +* Mon Jan 09 2023 Zdenek Dohnal - 2:9.0.1054-2 +- FTBFS with new FORTIFY_SOURCE=3 - remove it since Vim wants level 1 + +* Wed Dec 14 2022 Zdenek Dohnal - 2:9.0.1054-1 +- patchlevel 1054 + +* Mon Dec 05 2022 Zdenek Dohnal - 2:9.0.1006-1 +- patchlevel 1006 + +* Mon Nov 28 2022 Zdenek Dohnal - 2:9.0.963-1 +- patchlevel 963 + +* Mon Nov 21 2022 Zdenek Dohnal - 2:9.0.915-1 +- patchlevel 915 + +* Thu Nov 03 2022 Zdenek Dohnal - 2:9.0.828-1 +- patchlevel 828 + +* Thu Oct 20 2022 Zdenek Dohnal - 2:9.0.803-1 +- patchlevel 803 + +* Mon Oct 17 2022 Zdenek Dohnal - 2:9.0.777-1 +- patchlevel 777 + +* Wed Oct 12 2022 Zdenek Dohnal - 2:9.0.720-2 +- the current configure option for Vi is 'tiny' + +* Tue Oct 11 2022 Zdenek Dohnal - 2:9.0.720-1 +- patchlevel 720 + +* Wed Sep 28 2022 Carl George - 2:9.0.475-2 +- Obsolete vim-toml since the runtime files are now part of vim-common + +* Fri Sep 16 2022 Zdenek Dohnal - 2:9.0.475-1 +- patchlevel 475 + +* Fri Sep 16 2022 Zdenek Dohnal - 2:9.0.412-2 +- provide 'vim(plugins-supported)' for plugins to require Vim/GVim + +* Thu Sep 08 2022 Zdenek Dohnal - 2:9.0.412-1 +- patchlevel 412 + +* Thu Sep 01 2022 Zdenek Dohnal - 2:9.0.348-1 +- patchlevel 348 + +* Tue Aug 30 2022 Zdenek Dohnal - 2:9.0.327-1 +- patchlevel 327 + +* Tue Aug 23 2022 Zdenek Dohnal - 2:9.0.246-1 +- patchlevel 246 + +* Mon Aug 15 2022 Zdenek Dohnal - 2:9.0.213-1 +- patchlevel 213 + +* Thu Aug 11 2022 Zdenek Dohnal - 2:9.0.189-1 +- patchlevel 189 + +* Thu Aug 04 2022 Zdenek Dohnal - 2:9.0.137-1 +- patchlevel 137 + +* Tue Jul 26 2022 Zdenek Dohnal - 2:9.0.077-1 +- patchlevel 077 + +* Sat Jul 23 2022 Fedora Release Engineering - 2:9.0.049-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jul 11 2022 Zdenek Dohnal - 2:9.0.049-1 +- patchlevel 049 + +* Tue Jun 28 2022 Zdenek Dohnal - 2:8.2.5172-1 +- patchlevel 5172 + +* Tue Jun 21 2022 Zdenek Dohnal - 2:8.2.5141-1 +- patchlevel 5141 + +* Tue Jun 14 2022 Zdenek Dohnal - 2:8.2.5085-1 +- patchlevel 5085 + +* Fri Jun 03 2022 Zdenek Dohnal - 2:8.2.5052-1 +- patchlevel 5052 + +* Tue May 31 2022 Zdenek Dohnal - 2:8.2.5046-1 +- patchlevel 5046 + +* Wed May 18 2022 Zdenek Dohnal - 2:8.2.4975-1 +- patchlevel 4975 + +* Tue May 17 2022 Zdenek Dohnal - 2:8.2.4969-1 +- patchlevel 4969 + +* Mon May 09 2022 Zdenek Dohnal - 2:8.2.4927-1 +- patchlevel 4927 + +* Mon May 09 2022 Zdenek Dohnal - 2:8.2.4877-2 +- add new file vimhelp.vim + +* Fri May 06 2022 Zdenek Dohnal - 2:8.2.4877-1 +- patchlevel 4877 + +* Mon May 02 2022 Zdenek Dohnal - 2:8.2.4857-1 +- patchlevel 4857 + +* Fri Apr 29 2022 Zdenek Dohnal - 2:8.2.4845-1 +- patchlevel 4845 + +* Fri Apr 22 2022 Zdenek Dohnal - 2:8.2.4804-1 +- patchlevel 4804 + +* Fri Apr 08 2022 Zdenek Dohnal - 2:8.2.4701-2 +- fix the upstream testsuite failure due downstream patch + +* Thu Apr 07 2022 Zdenek Dohnal - 2:8.2.4701-1 +- patchlevel 4701 + +* Fri Mar 25 2022 Zdenek Dohnal - 2:8.2.4621-1 +- patchlevel 4621 + +* Wed Mar 16 2022 Zdenek Dohnal - 2:8.2.4579-1 +- patchlevel 4579 + +* Wed Mar 09 2022 Zdenek Dohnal - 2:8.2.4529-1 +- patchlevel 4529 + +* Tue Mar 01 2022 Zdenek Dohnal - 2:8.2.4485-1 +- patchlevel 4485 + +* Thu Feb 24 2022 Zdenek Dohnal - 2:8.2.4460-1 +- patchlevel 4460 + +* Mon Feb 21 2022 Zdenek Dohnal - 2:8.2.4428-1 +- patchlevel 4428 + +* Tue Feb 15 2022 Zdenek Dohnal - 2:8.2.4386-1 +- patchlevel 4386 + +* Mon Feb 07 2022 Zdenek Dohnal - 2:8.2.4314-1 +- patchlevel 4314 + +* Thu Jan 27 2022 Zdenek Dohnal - 2:8.2.4232-1 +- patchlevel 4232 + +* Mon Jan 24 2022 Zdenek Dohnal - 2:8.2.4198-1 +- patchlevel 4198 + +* Sat Jan 22 2022 Fedora Release Engineering - 2:8.2.4068-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jan 12 2022 Zdenek Dohnal - 2:8.2.4068-1 +- patchlevel 4068 + +* Mon Jan 10 2022 Zdenek Dohnal - 2:8.2.4051-1 +- patchlevel 4051 + +* Fri Jan 07 2022 Malcolm Inglis - 2:8.2.4006-2 +- add 'gui' build condition for vim-X11 + +* Wed Jan 05 2022 Zdenek Dohnal - 2:8.2.4006-1 +- patchlevel 4006 + +* Wed Dec 15 2021 Zdenek Dohnal - 2:8.2.3811-1 +- patchlevel 3811 + +* Tue Dec 07 2021 Zdenek Dohnal - 2:8.2.3755-1 +- patchlevel 3755 + +* Thu Dec 02 2021 Zdenek Dohnal - 2:8.2.3717-1 +- patchlevel 3717 + +* Thu Nov 25 2021 Zdenek Dohnal - 2:8.2.3642-2 +- 2026651 - defaults.vim changes create conflicts between vim-minimal and vim-common + +* Mon Nov 22 2021 Zdenek Dohnal - 2:8.2.3642-1 +- patchlevel 3642 + +* Mon Nov 08 2021 Zdenek Dohnal - 2:8.2.3582-1 +- patchlevel 3582 + +* Mon Nov 01 2021 Zdenek Dohnal - 2:8.2.3568-1 +- patchlevel 3568 + +* Fri Oct 15 2021 Zdenek Dohnal - 2:8.2.3512-1 +- patchlevel 3512 + +* Thu Oct 14 2021 Zdenek Dohnal - 2:8.2.3404-2 +- adjust test suite to Python 3.10 + +* Thu Oct 14 2021 Zdenek Dohnal - 2:8.2.3404-2 +- remove filetype plugin from virc - it doesn't work with vi + +* Mon Oct 11 2021 Zdenek Dohnal - 2:8.2.3404-2 +- set system vimrc via compiler macros + +* Thu Sep 23 2021 Zdenek Dohnal - 2:8.2.3404-2 +- remove downstream patch vim-8.0-copypaste.patch - put mouse settings into defaults.vim again + +* Mon Sep 06 2021 Zdenek Dohnal - 2:8.2.3404-1 +- patchlevel 3404 + +* Wed Sep 01 2021 Zdenek Dohnal - 2:8.2.3391-1 +- patchlevel 3391 + +* Mon Aug 23 2021 Zdenek Dohnal - 2:8.2.3367-1 +- patchlevel 3367 + +* Mon Aug 16 2021 Zdenek Dohnal - 2:8.2.3354-1 +- patchlevel 3354 + +* Mon Aug 09 2021 Zdenek Dohnal - 2:8.2.3318-1 +- patchlevel 3318 + +* Thu Aug 05 2021 Zdenek Dohnal - 2:8.2.3290-1 +- patchlevel 3290 + +* Mon Aug 02 2021 Zdenek Dohnal - 2:8.2.3273-1 +- patchlevel 3273 + +* Mon Jul 26 2021 Zdenek Dohnal - 2:8.2.3223-1 +- patchlevel 3223 + +* Fri Jul 23 2021 Fedora Release Engineering - 2:8.2.3182-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jul 19 2021 Zdenek Dohnal - 2:8.2.3182-1 +- patchlevel 3182 + +* Mon Jul 12 2021 Zdenek Dohnal - 2:8.2.3154-1 +- patchlevel 3154 + +* Mon Jun 28 2021 Zdenek Dohnal - 2:8.2.3070-1 +- patchlevel 3070 + +* Fri Jun 25 2021 Zdenek Dohnal - 2:8.2.3046-1 +- patchlevel 3046 + +* Thu Jun 24 2021 Zdenek Dohnal - 2:8.2.3043-1 +- patchlevel 3043 +- enable libsodium encryption in Fedora +- require glibc-gconv-extra on F35 and later + +* Wed Jun 16 2021 Zdenek Dohnal - 2:8.2.3009-1 +- patchlevel 3009 + +* Thu Jun 10 2021 Zdenek Dohnal - 2:8.2.2956-2 +- 1969936 - Failed to source defaults.vim + +* Mon Jun 07 2021 Zdenek Dohnal - 2:8.2.2956-1 +- patchlevel 2956 + +* Fri Jun 04 2021 Zdenek Dohnal - 2:8.2.2932-1 +- patchlevel 2932 + +* Mon May 24 2021 Zdenek Dohnal - 2:8.2.2879-1 +- patchlevel 2879 + +* Fri May 21 2021 Zdenek Dohnal - 2:8.2.2875-1 +- patchlevel 2875 + +* Mon May 10 2021 Zdenek Dohnal - 2:8.2.2846-1 +- patchlevel 2846 + +* Wed May 05 2021 Zdenek Dohnal - 2:8.2.2825-2 +- make default-editor built only on Fedora + +* Mon May 03 2021 Zdenek Dohnal - 2:8.2.2825-1 +- patchlevel 2825 + +* Mon Apr 26 2021 Zdenek Dohnal - 2:8.2.2811-1 +- patchlevel 2811 + +* Tue Apr 20 2021 Zdenek Dohnal - 2:8.2.2787-1 +- patchlevel 2787 + +* Mon Apr 12 2021 Zdenek Dohnal - 2:8.2.2756-1 +- patchlevel 2756 + +* Thu Apr 08 2021 Zdenek Dohnal - 2:8.2.2735-1 +- patchlevel 2735 + +* Mon Mar 22 2021 Zdenek Dohnal - 2:8.2.2637-1 +- patchlevel 2637 + +* Mon Mar 15 2021 Zdenek Dohnal - 2:8.2.2607-1 +- patchlevel 2607 + +* Mon Mar 08 2021 Zdenek Dohnal - 2:8.2.2576-1 +- patchlevel 2576 + +* Mon Mar 01 2021 Zdenek Dohnal - 2:8.2.2559-1 +- patchlevel 2559 + +* Mon Mar 01 2021 Zdenek Dohnal - 2:8.2.2541-2 +- 1928442 - vim-enhanced is replacing vim-wrappers-8.2.2465-1 + * Mon Feb 22 2021 Zdenek Dohnal - 2:8.2.2541-1 - patchlevel 2541 - 1931099 - Build version numbers don't match the actual build patchlevel diff --git a/vimrc b/vimrc index 4842faf2..4ef9d92d 100644 --- a/vimrc +++ b/vimrc @@ -54,10 +54,14 @@ if has("autocmd") " In text files, always limit the width of text to 78 characters " autocmd BufRead *.txt set tw=78 " When editing a file, always jump to the last cursor position + " (taken from Vim's defaults.vim) autocmd BufReadPost * - \ if line("'\"") > 0 && line ("'\"") <= line("$") | - \ exe "normal! g'\"" | - \ endif + \ let line = line("'\"") + \ | if line >= 1 && line <= line("$") && &filetype !~# 'commit' + \ && index(['xxd', 'gitrebase', 'tutor'], &filetype) == -1 + \ && !&diff + \ | execute "normal! g`\"" + \ | endif " don't write swapfile on most commonly used directories for NFS mounts or USB sticks autocmd BufNewFile,BufReadPre /media/*,/run/media/*,/mnt/* set directory=~/tmp,/var/tmp,/tmp " start with spec file template diff --git a/virc b/virc index 808e7d61..6d779826 100644 --- a/virc +++ b/virc @@ -27,9 +27,6 @@ if has("autocmd") augroup END endif - -filetype plugin on - if &term=="xterm" set t_Co=8 set t_Sb=[4%dm