Fix merge conflicts

CHANGELOG.md

@@ -1,6 +1,29 @@
 cookbook-rb-dswatcher CHANGELOG
 ===============
 
+## 0.0.7
+
+  - Miguel Negrón
+    - [e21c03f] Add pre and postun to clean the cookbook
+    - [762cf62] Improvement/fix lint (#6)
+    - [cddfd05] Merge pull request #3 from redBorder/bugfix/#15368_fix_register_and_deregister
+    - [0f218f6] Merge with development
+    - [28826a5] Update README.md
+    - [bd97889] Update rpm.yml
+    - [f86e4da] Update metadata.rb
+  - nilsver
+    - [9741b93] Release 0.0.6
+  - Miguel Negrón
+    - [762cf62] Improvement/fix lint (#6)
+    - [cddfd05] Merge pull request #3 from redBorder/bugfix/#15368_fix_register_and_deregister
+    - [28826a5] Update README.md
+    - [bd97889] Update rpm.yml
+    - [f86e4da] Update metadata.rb
+  - Miguel Negrón
+    - [0f218f6] Merge with development
+  - Luis Blanco
+    - [a465447] fix curl
+
 ## 0.0.6
 
   - Miguel Negrón

packaging/rpm/cookbook-rb-dswatcher.spec

@@ -25,6 +25,9 @@ chmod -R 0755 %{buildroot}%{cookbook_path}
 install -D -m 0644 README.md %{buildroot}%{cookbook_path}/README.md
 
 %pre
+if [ -d /var/chef/cookbooks/rb-dswatcher ]; then
+    rm -rf /var/chef/cookbooks/rb-dswatcher
+fi
 
 %post
 case "$1" in
@@ -38,6 +41,12 @@ case "$1" in
   ;;
 esac
 
+%postun
+# Deletes directory when uninstall the package
+if [ "$1" = 0 ] && [ -d /var/chef/cookbooks/rb-dswatcher ]; then
+  rm -rf /var/chef/cookbooks/rb-dswatcher
+fi
+
 %files
 %defattr(0755,root,root)
 %{cookbook_path}
@@ -47,5 +56,8 @@ esac
 %doc
 
 %changelog
-* Tue Oct 5 2021 David Vanhoucke <dvanhoucke@redborder.com> - 1.0.0-1
+* Thu Oct 10 2024 Miguel Negrón <manegron@redborder.com>
+- Add pre and postun
+
+* Tue Oct 5 2021 David Vanhoucke <dvanhoucke@redborder.com>
 - first spec version

resources/metadata.rb

@@ -3,4 +3,4 @@
 maintainer_email 'git@redborder.com'
 license          'AGPL-3.0'
 description      'Installs/Configures cookbook-dswatcher'
-version          '0.0.6'
+version          '0.0.7'